From 04376c3d0aa121caa96c0f032ad7aa180562cb5f Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 23 Apr 2020 15:42:29 +0800 Subject: [PATCH] update --- .../src/main/java/com/lyms/platform/biz/service/PatientsService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 6b4da8c..cc1b856 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 @@ -452,7 +452,7 @@ public class PatientsService { public void setAutoMatDeliver(String cardNo,Date dueDate) { - Date endDate = dueDate == null ? DateUtil.addDay(new Date(), -294) : dueDate; + Date endDate = DateUtil.addDay(new Date(), -294); PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setType(1); @@ -470,7 +470,8 @@ public class PatientsService { for (Patients patients : patientses) { patients.setType(3); patients.setBuildType(2); - patients.setFmDate(DateUtil.addDay(patients.getLastMenses(), 294)); + Date fmDate = dueDate != null ? dueDate : DateUtil.addDay(patients.getLastMenses(), 294); + patients.setFmDate(fmDate); patients.setModified(new Date()); // hujiaqi添加，是否自动分娩 patients.setIsAutoFm(YnEnums.YES.getId()); -- 1.8.3.1