From 879c6fda33f896bebfff31df969c3973eb49caa1 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 11 Jul 2017 15:48:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=BF=AE=E6=94=B9=E5=88=86?= =?UTF-8?q?=E5=A8=A9=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/facade/MatDeliverFacade.java | 8 +++++--- .../lyms/platform/operate/web/service/impl/ReportServiceImpl.java | 1 - 2 files changed, 5 insertions(+), 4 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 3a042e5..cd0529d 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 @@ -233,7 +233,7 @@ public class MatDeliverFacade { patientsService.updatePatient(patientsLocal); //修改分娩日期 - updatePatientFmDate(patients1.getPid(), fmDate, 1); + updatePatientFmDate(patients1.getPid(), fmDate, 1,patients1.getLastMenses()); //修改person表状态为产妇 if (StringUtils.isNotEmpty(patients1.getPid())) { PersonModel personModel = new PersonModel(); @@ -348,7 +348,7 @@ public class MatDeliverFacade { patientsService.updatePatient(patients1); //修改分娩日期 - updatePatientFmDate(patients.getPid(), fmDate, 3); + updatePatientFmDate(patients.getPid(), fmDate, 3,patients.getLastMenses()); /** 填写分娩表分娩 >> 作废未使用的产检券 */ // remoteService.invalidCoupon(patients.getPid(), "2", RemoteUrlEnum.INVALID_COUPON_URL); @@ -365,13 +365,15 @@ public class MatDeliverFacade { * @param pid * @param fmDate */ - private void updatePatientFmDate(String pid, Date fmDate, int type) { + private void updatePatientFmDate(String pid, Date fmDate, int type,Date lastMess) { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setPid(pid); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setType(type); patientsQuery.setDueStatus(0); patientsQuery.setBuildType(1); + patientsQuery.setLastMensesStart(lastMess); + patientsQuery.setLastMensesEnd(fmDate); List patientsList = patientsService.queryPatient(patientsQuery); for (Patients patients : patientsList) { //判断分娩日期是否大于24孕周 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 601e996..3f7774a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -15,7 +15,6 @@ import com.lyms.platform.operate.web.utils.*; import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.pojo.*; import com.lymsh.platform.reportdata.model.echarts.Series; -import javafx.scene.shape.Circle; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -- 1.8.3.1