收费、pacs检查类型、同步数据

src/Shentun.Peis.Application.Contracts/RegisterChecks/RegisterCheckDto.cs

@@ -78,6 +78,11 @@ namespace Shentun.Peis.RegisterChecks
         public DateTime? AuditTime { get; set; }
 
 
+        /// <summary>
+        /// 是否收费
+        /// </summary>
+        public char IsCharge { get; set; }
+
         ///// <summary>
         ///// 检查组合项目记录ID
         ///// </summary>

src/Shentun.Peis.Application/RegisterChecks/RegisterCheckAppService.cs

@@ -97,9 +97,9 @@ namespace Shentun.Peis.RegisterChecks
         [HttpGet("api/app/registercheck/getregistercheck")]
         public async Task<RegisterCheckDto> GetRegisterCheckAsync(Guid id)
         {
-            var registerCheckEntity = await _registerCheckRepository.GetAsync(id);
-
-            var userList = await _userRepository.GetListAsync();
+            var registerCheckEntity = (await _registerCheckRepository.GetQueryableAsync())
+                .Include(x => x.RegisterCheckAsbitems)
+                .FirstOrDefault(f => f.Id == id);
 
             var registerCheckDto = new RegisterCheckDto
             {
@@ -125,8 +125,9 @@ namespace Shentun.Peis.RegisterChecks
                 LastModificationTime = registerCheckEntity.LastModificationTime,
                 LastModifierId = registerCheckEntity.LastModifierId,
                 ThirdInfo = registerCheckEntity.ThirdInfo,
-                LastModifierName = EntityHelper.GetSurnameNoSql(userList, registerCheckEntity.LastModifierId),
-                CreatorName = EntityHelper.GetSurnameNoSql(userList, registerCheckEntity.CreatorId),
+                LastModifierName = _cacheService.GetSurnameAsync(registerCheckEntity.LastModifierId).Result,
+                CreatorName = _cacheService.GetSurnameAsync(registerCheckEntity.CreatorId).Result,
+                IsCharge = registerCheckEntity.RegisterCheckAsbitems.Where(m => m.PayTypeFlag == PayTypeFlag.PersonPay && m.IsCharge == 'N').Count() > 0 ? 'N' : 'Y'
             };
 
             return registerCheckDto;

src/Shentun.Peis.Application/ThirdPartyPublicInterfaces/ThirdPartyPublicInterfaceAppService.cs

@@ -366,23 +366,23 @@ namespace Shentun.Peis.ThirdPartyPublicInterfaces
                          });
 
 
-            //var NoSetupDeviceType = query.Where(m => m.asbitem.DeviceTypeId == null || m.asbitem.DeviceTypeId == Guid.Empty).Select(s => s.asbitem.DisplayName).ToList();
+            var NoSetupDeviceType = query.Where(m => m.asbitem.DeviceTypeId == null || m.asbitem.DeviceTypeId == Guid.Empty).Select(s => s.asbitem.DisplayName).ToList();
 
-            //if (NoSetupDeviceType.Any())
-            //    throw new UserFriendlyException($"检查项目{string.Join(',', NoSetupDeviceType)}未设置仪器类别");
+            if (NoSetupDeviceType.Any())
+                throw new UserFriendlyException($"检查项目{string.Join(',', NoSetupDeviceType)}未设置仪器类别");
 
             if (!string.IsNullOrEmpty(input.xmlx))
             {
                 //检查类型检索
 
-                ////仪器类别ID
-                //var deviceTypeId = (from columnReference in await _columnReferenceRepository.GetQueryableAsync()
-                //                    join columnReferenceCode in await _columnReferenceCodeRepository.GetQueryableAsync() on columnReference.Id equals columnReferenceCode.ColumnReferenceId
-                //                    join columnReferenceInterface in await _columnReferenceInterfaceRepository.GetQueryableAsync() on columnReferenceCode.Id equals columnReferenceInterface.ColumnReferenceCodeId
-                //                    where columnReference.DisplayName == "仪器类别" && columnReferenceInterface.InterfaceCodeValue == input.xmlx
-                //                    select columnReferenceCode.CodeValue).FirstOrDefault();
+                //仪器类别ID
+                var deviceTypeId = (from columnReference in await _columnReferenceRepository.GetQueryableAsync()
+                                    join columnReferenceCode in await _columnReferenceCodeRepository.GetQueryableAsync() on columnReference.Id equals columnReferenceCode.ColumnReferenceId
+                                    join columnReferenceInterface in await _columnReferenceInterfaceRepository.GetQueryableAsync() on columnReferenceCode.Id equals columnReferenceInterface.ColumnReferenceCodeId
+                                    where columnReference.DisplayName == "仪器类别" && columnReferenceInterface.InterfaceCodeValue == input.xmlx
+                                    select columnReferenceCode.CodeValue).FirstOrDefault();
 
-                //query = query.Where(m => m.asbitem.DeviceTypeId == Guid.Parse(deviceTypeId));
+                query = query.Where(m => m.asbitem.DeviceTypeId == Guid.Parse(deviceTypeId));
             }
 
             var queryList = query.ToList();