From 40882faf0acfce55066b18bd9cbb09e722dca14a Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 16 Jan 2018 20:42:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E7=AD=9B=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/biz/service/PatientsService.java | 8 ++++---- .../com/lyms/platform/operate/web/facade/ApplyOrderFacade.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) 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 2ec5779..15bbb51 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 @@ -398,8 +398,8 @@ public class PatientsService { sieveModel.setName(patients.getUsername()); sieveModel.setLastMenses(patients.getLastMenses()); sieveModel.setCardNo(patients.getCardNo()); - if (null != sieveModel.getDueWeek()) { - sieveModel.setDueWeek(days); + if (null != sieveModel.getDueWeek()&&null!=sieveModel.getApplyDate()) { + sieveModel.setDueWeek(DateUtil.daysBetween(patients.getLastMenses(), sieveModel.getApplyDate())); } SieveService.handOrder(sieveModel); sieveDao.updateChanQianSieve(sieveModel); @@ -436,8 +436,8 @@ public class PatientsService { sieveModel.setName(patients.getUsername()); sieveModel.setLastMenses(patients.getLastMenses()); sieveModel.setCardNo(patients.getCardNo()); - if (null != sieveModel.getDueWeek()) { - sieveModel.setDueWeek(days); + if (null != sieveModel.getDueWeek() &&null!=sieveModel.getApplyDate()) { + sieveModel.setDueWeek(DateUtil.daysBetween(patients.getLastMenses(), sieveModel.getApplyDate())); } SieveService.handOrder(sieveModel); sieveDao.updateChanQianSieve(sieveModel); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 0359d51..4d25036 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -387,7 +387,7 @@ public class ApplyOrderFacade { if (StringUtils.isNotEmpty(sieveApplyOrderModel.getCheckDate())) { sieveModel.setApplyDate(DateUtil.parseYMD(sieveApplyOrderModel.getCheckDate())); } - int days = DateUtil.daysBetween(sieveModel.getLastMenses(), new Date()); + int days = DateUtil.daysBetween(sieveModel.getLastMenses(), sieveModel.getApplyDate()); sieveModel.setDueWeek(days); SieveService.handOrder(sieveModel); sieveService.updateOneChanQianDiaSieve(sieveModel); -- 1.8.3.1