Commit 4878d58624a509f6b8b1c908541e3bf8d6c3d472
1 parent
774ec54c81
Exists in
master
and in
8 other branches
孕妇修改
Showing 3 changed files with 21 additions and 23 deletions
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyCheckService.java
View file @
4878d58
| ... | ... | @@ -47,7 +47,7 @@ |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | public List<BabyCheckModel> queryBabyCheckRecord(BabyCheckModelQuery query) { |
| 50 | - return babyCheckDao.queryBabyCheckRecord(query.convertToQuery().addOrder(Sort.Direction.DESC,"desc")); | |
| 50 | + return babyCheckDao.queryBabyCheckRecord(query.convertToQuery().addOrder(Sort.Direction.DESC,"created")); | |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | public List<HwModel> queryHWByHeight(Double height, Integer sex) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
4878d58
| ... | ... | @@ -232,23 +232,25 @@ |
| 232 | 232 | //查询儿童的检查记录 |
| 233 | 233 | checkModels = babyCheckService.queryBabyCheckRecord(query); |
| 234 | 234 | Date babyBirth = model.getBirth(); |
| 235 | + if (CollectionUtils.isNotEmpty(checkModels)) | |
| 236 | + { | |
| 235 | 237 | |
| 238 | + for (BabyCheckModel cmodel : checkModels) { | |
| 239 | + Map<String, String> checkRecord = new HashMap<>(); | |
| 240 | + Date checkDate = cmodel.getCheckDate(); | |
| 241 | + String monthAge = ""; | |
| 242 | + if(babyBirth != null && checkDate != null) | |
| 243 | + { | |
| 244 | + monthAge = DateUtil.getBabyMonthAge(babyBirth, checkDate); | |
| 245 | + } | |
| 236 | 246 | |
| 237 | - for (BabyCheckModel cmodel : checkModels) { | |
| 238 | - Map<String, String> checkRecord = new HashMap<>(); | |
| 239 | - Date checkDate = cmodel.getCheckDate(); | |
| 240 | - String monthAge = ""; | |
| 241 | - if(babyBirth != null && checkDate != null) | |
| 242 | - { | |
| 243 | - monthAge = DateUtil.getBabyMonthAge(babyBirth, checkDate); | |
| 247 | + checkRecord.put("id", cmodel.getId()); | |
| 248 | + checkRecord.put("checkDate", DateUtil.getyyyy_MM_dd(checkDate)); | |
| 249 | + checkRecord.put("monthAge", monthAge); | |
| 250 | + checkRecord.put("buildId", cmodel.getBuildId()); | |
| 251 | + checkRecord.put("type","2"); | |
| 252 | + list.add(checkRecord); | |
| 244 | 253 | } |
| 245 | - | |
| 246 | - checkRecord.put("id", cmodel.getId()); | |
| 247 | - checkRecord.put("checkDate", DateUtil.getyyyy_MM_dd(checkDate)); | |
| 248 | - checkRecord.put("monthAge", monthAge); | |
| 249 | - checkRecord.put("buildId", cmodel.getBuildId()); | |
| 250 | - checkRecord.put("type","2"); | |
| 251 | - list.add(checkRecord); | |
| 252 | 254 | } |
| 253 | 255 | } |
| 254 | 256 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
4878d58
| ... | ... | @@ -163,7 +163,11 @@ |
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | Patients patient = getPatientsData(yunRequest); |
| 166 | + | |
| 167 | + patient.setDueStatus(0); | |
| 168 | + //1孕妇 3 产妇 | |
| 166 | 169 | patient.setType(type); |
| 170 | + patient.setBuildType(0); | |
| 167 | 171 | if (resperson != null) |
| 168 | 172 | { |
| 169 | 173 | patient.setPid(resperson.getId()); |
| ... | ... | @@ -333,7 +337,6 @@ |
| 333 | 337 | pmodel.setBirth(DateUtil.parseYMD(yunRequest.getBirthday())); |
| 334 | 338 | pmodel.setPhone(yunRequest.getPregnantPhone()); |
| 335 | 339 | pmodel.setCardNo(yunRequest.getPregnantCertificateNum()); |
| 336 | - pmodel.setType(1); | |
| 337 | 340 | pmodel.setYn(YnEnums.YES.getId()); |
| 338 | 341 | pmodel.setModified(new Date()); |
| 339 | 342 | personService.updatePerson(pmodel, yunRequest.getPid()); |
| ... | ... | @@ -580,13 +583,6 @@ |
| 580 | 583 | patient.setHospitalId(yunRequest.getHospitalId()); |
| 581 | 584 | patient.setYn(YnEnums.YES.getId()); |
| 582 | 585 | |
| 583 | - | |
| 584 | - | |
| 585 | - patient.setBuildType(0); | |
| 586 | - | |
| 587 | - patient.setDueStatus(0); | |
| 588 | - //1孕妇 3 产妇 | |
| 589 | - patient.setType(1); | |
| 590 | 586 | return patient; |
| 591 | 587 | } |
| 592 | 588 |