From a8e5f30bc4db255abd86c8db8de6a35ec1401193 Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Thu, 5 Jan 2017 11:13:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E6=8E=A5=E5=8F=A3=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/MatDeliverFacade.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 1b9b10e..d08228a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -192,18 +192,18 @@ public class MatDeliverFacade { patientsLocal.setFmDate(fmDate); // HuJiaqi添加开始，这里冗余了分娩分娩医院，分娩年龄，分娩孕周，分娩方式，并将状态更改为产妇 patientsLocal.setType(3); - patientsLocal.setFmHospital(maternalDeliverModel.getFmHospital()); - patientsLocal.setFmType(maternalDeliverModel.getDeliveryMode()); + patientsLocal.setFmHospital(deliverAddRequest.getFmHospital()); + patientsLocal.setFmType(MapUtils.isNotEmpty(deliverAddRequest.getDeliveryMode())?null:deliverAddRequest.getDeliveryMode().toString()); try { - patientsLocal.setFmAge(DateUtil.getAge(patientsLocal.getBirth(), patientsLocal.getFmDate())); + patientsLocal.setFmAge(DateUtil.getAge(patients1.getBirth(), fmDate)); } catch (Exception e) { - System.out.println(patientsLocal.getId() + "：这条数据的生日和分娩时间异常"); + System.out.println(patients1.getId() + "：这条数据的生日和分娩时间异常"); // 跳过 } try { - patientsLocal.setFmWeek(DateUtil.getDays(patientsLocal.getLastMenses(), patientsLocal.getFmDate())); + patientsLocal.setFmWeek(DateUtil.getDays(patients1.getLastMenses(), fmDate)); } catch (Exception e) { - System.out.println(patientsLocal.getId() + "：这条数据的末日月经和分娩时间异常"); + System.out.println(patients1.getId() + "：这条数据的末日月经和分娩时间异常"); // 跳过 } // HuJiaqi添加结束 @@ -315,16 +315,16 @@ public class MatDeliverFacade { patients1.setFmDate(fmDate); // HuJiaqi添加开始，这里冗余了分娩分娩医院，分娩年龄，分娩孕周，分娩方式，并将状态更改为产妇 patients1.setType(3); - patients1.setFmHospital(maternalDeliverModel.getFmHospital()); - patients1.setFmType(maternalDeliverModel.getDeliveryMode()); + patients1.setFmHospital(deliverAddRequest.getFmHospital()); + patients1.setFmType(MapUtils.isNotEmpty(deliverAddRequest.getDeliveryMode())?null:deliverAddRequest.getDeliveryMode().toString()); try { - patients1.setFmAge(DateUtil.getAge(patients1.getBirth(), patients1.getFmDate())); + patients1.setFmAge(DateUtil.getAge(patients1.getBirth(), fmDate)); } catch (Exception e) { System.out.println(patients1.getId() + "：这条数据的生日和分娩时间异常"); // 跳过 } try { - patients1.setFmWeek(DateUtil.getDays(patients1.getLastMenses(), patients1.getFmDate())); + patients1.setFmWeek(DateUtil.getDays(patients1.getLastMenses(), fmDate)); } catch (Exception e) { System.out.println(patients1.getId() + "：这条数据的末日月经和分娩时间异常"); // 跳过 -- 1.8.3.1