diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index 5d39e9d..47d548c 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -322,14 +322,18 @@ public class PatientsService { public void handSieveTrack() { //添加产后追访信息 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); - downRecordQuery.setTrackType(TrackDownDateEnums.C.getId()); + downRecordQuery.setTrackTypes(Arrays.asList(TrackDownDateEnums.C.getId(),TrackDownDateEnums.H.getId())); List records = trackDownRecordService.queryTrackDown(downRecordQuery); for (TrackDownRecord tr : records) { Patients patients = iPatientDao.getPatient(tr.getParentId()); int week = DateUtil.getWeek2(patients.getLastMenses(), new Date()); if (week > 20) {//不能做产前筛查追访,显示产前检查追访 - tr.setTrackType(TrackDownDateEnums.I.getId()); + if (tr.getTrackType()== TrackDownDateEnums.C.getId()) { + tr.setTrackType(TrackDownDateEnums.I.getId()); + }else if(tr.getTrackType()== TrackDownDateEnums.H.getId()){ + tr.setTrackType(TrackDownDateEnums.E.getId()); + } } trackDownRecordService.updateTrackDown(tr, tr.getId()); }