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);