危急值函数修改

src/Shentun.Peis.Application.Contracts/DiagnosisFunctions/GetCriticalResultDto.cs

@@ -5,6 +5,12 @@ using System.Text;
 namespace Shentun.Peis.DiagnosisFunctions
 {
     public class GetCriticalResultDto
+    {
+        public List<GetAsbitemCriticalResultDto> AsbitemDetails { get; set; } = new List<GetAsbitemCriticalResultDto>();
+        public List<GetItemCriticalResultDto> ItemDetails { get; set; } = new List<GetItemCriticalResultDto>();
+    }
+
+    public class GetAsbitemCriticalResultDto
     {
         public Guid RegisterCheckId { get; set; }
 
@@ -13,8 +19,6 @@ namespace Shentun.Peis.DiagnosisFunctions
         public char? IsFollowUp { get; set; }
 
         public string CriticalRangeValue { get; set; }
-
-        public List<GetItemCriticalResultDto> ItemDetails { get; set; } = new List<GetItemCriticalResultDto>();
     }
 
     public class GetItemCriticalResultDto

src/Shentun.Peis.Application/OccupationalDiseaseReports/OccupationalDiseaseReportAppService.cs

@@ -444,7 +444,7 @@ namespace Shentun.Peis.OccupationalDiseaseReports
                 #endregion
 
                 #region 体检结果一览表
-                var medicalResultDetails = patientRegisterList.GroupBy(g => g.patientOccupationalDisease).OrderBy(o=>o.Key.OccupationalAbnormal)
+                var medicalResultDetails = patientRegisterList.GroupBy(g => g.patientOccupationalDisease).OrderBy(o => o.Key.OccupationalAbnormal)
                     .Select((s, index) => new GetCompanyOccupationalDiseaseDetailReportMedicalResultDetailDto
                     {
                         //AnomalyIndex = !string.IsNullOrWhiteSpace(s.Key.OccupationalAbnormal)
@@ -476,10 +476,11 @@ namespace Shentun.Peis.OccupationalDiseaseReports
                                             join registerCheckAsbitem in await _registerCheckAsbitemRepository.GetQueryableAsync() on registerCheck.Id equals registerCheckAsbitem.RegisterCheckId
                                             join asbitem in await _asbitemRepository.GetQueryableAsync() on registerCheckAsbitem.AsbitemId equals asbitem.Id into asbitemTemp
                                             from asbitemHaveEmpty in asbitemTemp.DefaultIfEmpty()
-                                            join registerCheckSummary in await _registerCheckSummaryRepository.GetQueryableAsync() on registerCheck.Id equals registerCheckSummary.RegisterCheckId
+                                            join registerCheckSummary in await _registerCheckSummaryRepository.GetQueryableAsync() on registerCheck.Id equals registerCheckSummary.RegisterCheckId into registerCheckSummaryTemp
+                                            from registerCheckSummaryEmpty in registerCheckSummaryTemp.DefaultIfEmpty()
                                             join patientOccupationalDisease in await _patientOccupationalDiseaseRepository.GetQueryableAsync() on patientRegister.Id equals patientOccupationalDisease.PatientRegisterId
                                             where patientRegister.CustomerOrgRegisterId == customerOrgPara.CustomerOrgRegisterId
-                                            && !registerCheckSummary.Summary.Contains("未见异常")
+                                            && !registerCheckSummaryEmpty.Summary.Contains("未见异常")
                                             && patientRegister.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration
                                             select new
                                             {
@@ -534,7 +535,7 @@ namespace Shentun.Peis.OccupationalDiseaseReports
                 msg.MedicalResultAbnormalRateDetails = medicalResultAbnormalRateDetails;
                 #endregion
 
-                #region 职业健康检查缺项情况表明细
+                #region 职业健康检查缺项情况表明细   <已经开始检查了，但是未检查完的>
                 var listOfMissingItemsDetails = asbitemAbnormalList.Where(m => m.registerCheckCompleteFlag == RegisterCheckCompleteFlag.UnChecked)
                            .GroupBy(g => g.patientRegister)
                           .Select((s, index) => new GetCompanyOccupationalDiseaseDetailReportListOfMissingItemsDetailDto
@@ -548,6 +549,10 @@ namespace Shentun.Peis.OccupationalDiseaseReports
                 msg.ListOfMissingItemsDetails = listOfMissingItemsDetails;
                 #endregion
 
+                #region 职业病未检人员一览表  <还没开始检查的>
+
+                #endregion
+
                 #region 职业病专科复查人员一览表明细
 
                 //复查结论ID