shiyang / regional-platform

Download as
Browse Code »

Commit bfce6acbd35ae85c1bfcca3ba6f48ca699665e81

Authored by jiangjiazhi
2 parents c7fa086671 1233a24af1
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyCheckService.java View file @ bfce6ac
... ... @@ -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 @ bfce6ac
... ... @@ -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 @ bfce6ac
... ... @@ -113,9 +113,10 @@
113 113 }
114 114  
115 115 Integer type = 1; //1孕妇 2儿童 3产妇
  116 + Date date = null;
116 117 if (yunRequest.getLastMenstrualPeriod() != null)
117 118 {
118   - Date date = DateUtil.addWeek(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()),42);
  119 + date = DateUtil.addWeek(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()),42);
119 120 Date currentDate = DateUtil.formatDate(new Date());
120 121 if (date.getTime() <= currentDate.getTime())
121 122 {
122 123  
... ... @@ -163,7 +164,15 @@
163 164 }
164 165  
165 166 Patients patient = getPatientsData(yunRequest);
  167 +
  168 + patient.setDueStatus(0);
  169 + //1孕妇 3 产妇
166 170 patient.setType(type);
  171 + patient.setBuildType(0);
  172 + if (type == 3 && date != null)
  173 + {
  174 + patient.setFmDate(date);
  175 + }
167 176 if (resperson != null)
168 177 {
169 178 patient.setPid(resperson.getId());
... ... @@ -333,7 +342,6 @@
333 342 pmodel.setBirth(DateUtil.parseYMD(yunRequest.getBirthday()));
334 343 pmodel.setPhone(yunRequest.getPregnantPhone());
335 344 pmodel.setCardNo(yunRequest.getPregnantCertificateNum());
336   - pmodel.setType(1);
337 345 pmodel.setYn(YnEnums.YES.getId());
338 346 pmodel.setModified(new Date());
339 347 personService.updatePerson(pmodel, yunRequest.getPid());
... ... @@ -580,13 +588,6 @@
580 588 patient.setHospitalId(yunRequest.getHospitalId());
581 589 patient.setYn(YnEnums.YES.getId());
582 590  
583   -
584   -
585   - patient.setBuildType(0);
586   -
587   - patient.setDueStatus(0);
588   - //1孕妇 3 产妇
589   - patient.setType(1);
590 591 return patient;
591 592 }
592 593