|
|
|
@ -638,7 +638,7 @@ namespace Shentun.Peis.OccupationalDiseaseReports |
|
|
|
IdNo = s.FirstOrDefault().idNo, |
|
|
|
PatientName = s.Key.PatientName, |
|
|
|
PatientRegisterNo = s.Key.PatientRegisterNo, |
|
|
|
UnCheckAsbitemName = string.Join("、", s.Select(ss => ss.asbitemName)), |
|
|
|
UnCheckAsbitemName = string.Join("、", s.Select(ss => ss.asbitemName).Distinct()), |
|
|
|
Age = s.Key.Age == null ? "" : s.Key.Age.ToString(), |
|
|
|
JobType = s.FirstOrDefault().jobType, |
|
|
|
MedicalStartDate = DataHelper.ConversionDateShortToString(s.Key.MedicalStartDate), |
|
|
|
@ -661,7 +661,7 @@ namespace Shentun.Peis.OccupationalDiseaseReports |
|
|
|
IdNo = s.FirstOrDefault().idNo, |
|
|
|
PatientName = s.Key.PatientName, |
|
|
|
PatientRegisterNo = s.Key.PatientRegisterNo, |
|
|
|
UnCheckAsbitemName = string.Join("、", s.Select(ss => ss.asbitemName)), |
|
|
|
UnCheckAsbitemName = string.Join("、", s.Select(ss => ss.asbitemName).Distinct()), |
|
|
|
Age = s.Key.Age == null ? "" : s.Key.Age.ToString(), |
|
|
|
JobType = s.FirstOrDefault().jobType, |
|
|
|
MedicalStartDate = DataHelper.ConversionDateShortToString(s.Key.MedicalStartDate), |
|
|
|
|