1

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

@@ -123,7 +123,7 @@ namespace Shentun.Peis.RegisterChecks
                 CompleteFlag = registerCheckEntity.CompleteFlag,
                 CreationTime = registerCheckEntity.CreationTime,
                 CreatorId = registerCheckEntity.CreatorId,
-                CriticalValue = registerCheckEntity.CriticalRangeValue,
+                CriticalValue = registerCheckEntity.CriticalValue,
                 //CriticalValueCreateDate = DataHelper.ConversionDateToString(registerCheckEntity.CriticalValueCreateDate),
                 //CriticalValueFlag = registerCheckEntity.IsCriticalValue,
                 //CriticalValueProcessContent = registerCheckEntity.CriticalValueContent,
@@ -211,13 +211,29 @@ namespace Shentun.Peis.RegisterChecks
                 CompleteFlag = s.CompleteFlag,
                 CreationTime = s.CreationTime,
                 CreatorId = s.CreatorId,
-                CriticalValue = s.CriticalRangeValue,
+                CriticalValue = s.CriticalValue,
+                CriticalValueContent = s.CriticalValueContent,
+                CriticalValueCreationTime = DataHelper.ConversionDateToString(s.CriticalValueCreationTime),
+                CriticalValueCreatorId = s.CriticalValueCreatorId,
+                CriticalValuePhoneCreatorId = s.CriticalValuePhoneCreatorId,
+                FollowUpCreationTime = DataHelper.ConversionDateToString(s.FollowUpCreationTime),
+                FollowUpCreatorId = s.FollowUpCreatorId,
+                FollowUpFlag = s.FollowUpFlag,
+                IsCriticalValue = s.IsCriticalValue,
+                IsCriticalValueAudit = s.IsCriticalValueAudit,
+                IsCriticalValuePhoneComplete = s.IsCriticalValuePhoneComplete,
+                IsCriticalValueSmsComplete = s.IsCriticalValueSmsComplete,
+                IsReview = s.IsReview,
+                CriticalRangeValue = s.CriticalRangeValue,
+                IsPacsCheck = s.IsPacsCheck,
+                PacsUploadDate = DataHelper.ConversionDateToString(s.PacsUploadDate),
+                PacsCheckDate = DataHelper.ConversionDateToString(s.PacsCheckDate),
                 //CriticalValueCreateDate = DataHelper.ConversionDateToString(s.CriticalValueCreateDate),
-                CriticalValueFlag = s.IsCriticalValue,
-                CriticalValueProcessContent = s.CriticalValueContent,
+                //CriticalValueFlag = s.IsCriticalValue,
+                //CriticalValueProcessContent = s.CriticalValueContent,
                 // CriticalValueProcessDate = DataHelper.ConversionDateToString(s.CriticalValueProcessDate),
                 // CriticalValueProcessDoctor = s.CriticalValueProcessDoctor,
-                // CriticalValueProcessFlag = s.CriticalValueProcessFlag,
+                // CriticalValueProcessFlag = s.CriticalValueProcessFlag, 
                 Id = s.Id,
                 IsAudit = s.IsAudit,
                 IsCharge = s.RegisterCheckAsbitems.Where(m => m.IsCharge == 'Y').Count() > 0 ? 'Y' : 'N',