From d2d0ae7d09a3d42b10bb34a7e5845a73a754d1ee Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Thu, 5 Jan 2017 13:56:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=87=AA=E5=8A=A8=E5=88=86?= =?UTF-8?q?=E5=A8=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/biz/service/PatientsService.java | 3 +++ .../src/main/java/com/lyms/platform/pojo/Patients.java | 10 ++++++++++ .../src/main/java/com/lyms/platform/query/PatientsQuery.java | 12 ++++++++++++ .../lyms/platform/operate/web/controller/TestController.java | 6 +++++- .../lyms/platform/operate/web/facade/MatDeliverFacade.java | 2 ++ 5 files changed, 32 insertions(+), 1 deletion(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index 90eb858..e4473f8 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -220,6 +220,9 @@ public class PatientsService { patients.setBuildType(2); patients.setFmDate(DateUtil.addDay(patients.getLastMenses(), 294)); patients.setModified(new Date()); + // hujiaqi添加，是否自动分娩 + patients.setIsAutoFm(YnEnums.YES.getId()); + // hujiaqi添加结束 updatePatient(patients); PersonModelQuery personYunModelQuery = new PersonModelQuery(); personYunModelQuery.setYn(YnEnums.YES.getId()); diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 0ed9f61..eb3df80 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -245,6 +245,16 @@ public class Patients extends BaseModel { // 分娩方式 private String fmType; + private Integer isAutoFm; + + public Integer getIsAutoFm() { + return isAutoFm; + } + + public void setIsAutoFm(Integer isAutoFm) { + this.isAutoFm = isAutoFm; + } + public String getFmHospital() { return fmHospital; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 0e1480d..4ccb6fb 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -382,7 +382,16 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private Integer fmWeekEnd; // 分娩方式 private String fmType; + // 是否自动分娩 + private Integer isAutoFm = -1; + public Integer getIsAutoFm() { + return isAutoFm; + } + + public void setIsAutoFm(Integer isAutoFm) { + this.isAutoFm = isAutoFm; + } public String getFileCode() { return fileCode; @@ -1041,6 +1050,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (-1 != yn) { condition = condition.and("yn", yn, MongoOper.IS); } + if (-1 != isAutoFm) { + condition = condition.and("isAutoFm", isAutoFm, MongoOper.IS); + } if (null != isNull) { condition = condition.and("communityId", null, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 24a5507..dadab06 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -550,7 +550,11 @@ public class TestController { System.out.println(patients.getId() + "：这条数据的末日月经和分娩时间异常"); // 跳过 } - + if(StringUtils.isNotEmpty(patients.getFmHospital())){ + patients.setIsAutoFm(YnEnums.NO.getId()); + }else{ + patients.setIsAutoFm(YnEnums.YES.getId()); + } System.out.println(patients.getFmAge()); System.out.println(patients.getFmWeek()); 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 d08228a..4a5ace4 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 @@ -191,6 +191,7 @@ public class MatDeliverFacade { patientsLocal.setId(deliverAddRequest.getParentId()); patientsLocal.setFmDate(fmDate); // HuJiaqi添加开始，这里冗余了分娩分娩医院，分娩年龄，分娩孕周，分娩方式，并将状态更改为产妇 + patientsLocal.setIsAutoFm(YnEnums.NO.getId()); patientsLocal.setType(3); patientsLocal.setFmHospital(deliverAddRequest.getFmHospital()); patientsLocal.setFmType(MapUtils.isNotEmpty(deliverAddRequest.getDeliveryMode())?null:deliverAddRequest.getDeliveryMode().toString()); @@ -315,6 +316,7 @@ public class MatDeliverFacade { patients1.setFmDate(fmDate); // HuJiaqi添加开始，这里冗余了分娩分娩医院，分娩年龄，分娩孕周，分娩方式，并将状态更改为产妇 patients1.setType(3); + patients1.setIsAutoFm(YnEnums.NO.getId()); patients1.setFmHospital(deliverAddRequest.getFmHospital()); patients1.setFmType(MapUtils.isNotEmpty(deliverAddRequest.getDeliveryMode())?null:deliverAddRequest.getDeliveryMode().toString()); try { -- 1.8.3.1