diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyCheckService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyCheckService.java index 04e0ae7..39cb0ab 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyCheckService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyCheckService.java @@ -47,7 +47,7 @@ public class BabyCheckService { } public List queryBabyCheckRecord(BabyCheckModelQuery query) { - return babyCheckDao.queryBabyCheckRecord(query.convertToQuery().addOrder(Sort.Direction.DESC,"desc")); + return babyCheckDao.queryBabyCheckRecord(query.convertToQuery().addOrder(Sort.Direction.DESC,"created")); } public List queryHWByHeight(Double height, Integer sex) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index c5c3022..07e651a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -232,23 +232,25 @@ public class BabyCheckFacade { //查询儿童的检查记录 checkModels = babyCheckService.queryBabyCheckRecord(query); Date babyBirth = model.getBirth(); + if (CollectionUtils.isNotEmpty(checkModels)) + { + for (BabyCheckModel cmodel : checkModels) { + Map checkRecord = new HashMap<>(); + Date checkDate = cmodel.getCheckDate(); + String monthAge = ""; + if(babyBirth != null && checkDate != null) + { + monthAge = DateUtil.getBabyMonthAge(babyBirth, checkDate); + } - for (BabyCheckModel cmodel : checkModels) { - Map checkRecord = new HashMap<>(); - Date checkDate = cmodel.getCheckDate(); - String monthAge = ""; - if(babyBirth != null && checkDate != null) - { - monthAge = DateUtil.getBabyMonthAge(babyBirth, checkDate); + checkRecord.put("id", cmodel.getId()); + checkRecord.put("checkDate", DateUtil.getyyyy_MM_dd(checkDate)); + checkRecord.put("monthAge", monthAge); + checkRecord.put("buildId", cmodel.getBuildId()); + checkRecord.put("type","2"); + list.add(checkRecord); } - - checkRecord.put("id", cmodel.getId()); - checkRecord.put("checkDate", DateUtil.getyyyy_MM_dd(checkDate)); - checkRecord.put("monthAge", monthAge); - checkRecord.put("buildId", cmodel.getBuildId()); - checkRecord.put("type","2"); - list.add(checkRecord); } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 3ac7dcf..795f378 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -163,7 +163,11 @@ public class BookbuildingFacade { } Patients patient = getPatientsData(yunRequest); + + patient.setDueStatus(0); + //1孕妇 3 产妇 patient.setType(type); + patient.setBuildType(0); if (resperson != null) { patient.setPid(resperson.getId()); @@ -333,7 +337,6 @@ public class BookbuildingFacade { pmodel.setBirth(DateUtil.parseYMD(yunRequest.getBirthday())); pmodel.setPhone(yunRequest.getPregnantPhone()); pmodel.setCardNo(yunRequest.getPregnantCertificateNum()); - pmodel.setType(1); pmodel.setYn(YnEnums.YES.getId()); pmodel.setModified(new Date()); personService.updatePerson(pmodel, yunRequest.getPid()); @@ -580,13 +583,6 @@ public class BookbuildingFacade { patient.setHospitalId(yunRequest.getHospitalId()); patient.setYn(YnEnums.YES.getId()); - - - patient.setBuildType(0); - - patient.setDueStatus(0); - //1孕妇 3 产妇 - patient.setType(1); return patient; }