diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 033233b..5749620 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -67,7 +67,7 @@ public class AntenatalExaminationFacade { */ private void setLashCTimes(String hospitalId, String id, int type) { - Patients patients = patientsService.findOnePatientById(id); + /* Patients patients = patientsService.findOnePatientById(id); List list = new ArrayList<>(); if (type == 2) { AntExQuery antExQuery = new AntExQuery(); @@ -91,24 +91,28 @@ public class AntenatalExaminationFacade { list.add(antEx.getCheckTime()); } } - } - - if (CollectionUtils.isNotEmpty(list)) { - Collections.sort(list, new Comparator() { - @Override - public int compare(Date o1, Date o2) { - if (o1 != null && o1.after(o2)) { - return -1; - } - if (o1 != null && o1.before(o2)) { - return 1; - } - return 0; + }*/ + AntExQuery antExQuery = new AntExQuery(); + antExQuery.setParentId(id); + antExQuery.setYn(YnEnums.YES.getId()); + Date date=null; + List antEx = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "checkDate")); + if (CollectionUtils.isNotEmpty(antEx)) { + date= antEx.get(0).getCheckDate(); + } else { + AntExChuQuery antExChuQuery = new AntExChuQuery(); + antExChuQuery.setParentId(id); + antExChuQuery.setYn(YnEnums.YES.getId()); + List antExChu = antenatalExaminationService.queryAntExChu(antExChuQuery); + if (CollectionUtils.isNotEmpty(antExChu)) { + date= antExChu.get(0).getCheckTime(); } - }); + } + + if (null!=date) { Patients patients1 = new Patients(); - patients1.setLastCTime(list.get(0)); - patients1.setId(patients.getId()); + patients1.setLastCTime(date); + patients1.setId(id); patientsService.updatePatient(patients1); } }