Commit 5ad91fa2305efc2b9b1d4d412d708be856b0fecb

Authored by jiangjiazhi

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 5ad91fa
... ... @@ -299,13 +299,13 @@
299 299 patients1.setFmHospital(deliverAddRequest.getFmHospital());
300 300 patients1.setFmType(MapUtils.isNotEmpty(deliverAddRequest.getDeliveryMode())?null:deliverAddRequest.getDeliveryMode().toString());
301 301 try {
302   - patients1.setFmAge(DateUtil.getAge(patients1.getBirth(), fmDate));
  302 + patients1.setFmAge(DateUtil.getAge(patients.getBirth(), fmDate));
303 303 } catch (Exception e) {
304 304 System.out.println(patients1.getId() + ":这条数据的生日和分娩时间异常");
305 305 // 跳过
306 306 }
307 307 try {
308   - patients1.setFmWeek(DateUtil.getDays(patients1.getLastMenses(), fmDate));
  308 + patients1.setFmWeek(DateUtil.getDays(patients.getLastMenses(), fmDate));
309 309 } catch (Exception e) {
310 310 System.out.println(patients1.getId() + ":这条数据的末日月经和分娩时间异常");
311 311 // 跳过