From 82e5ffe8549342c16cdec22811f7cf5cf611bfde Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Sun, 6 Sep 2020 09:40:21 +0800
Subject: [PATCH] update

---
 .../operate/web/facade/BabyBookbuildingFacade.java       | 16 +++-------------
 .../platform/operate/web/facade/BabyCheckFacade.java     |  3 ++-
 .../platform/operate/web/facade/MatDeliverFacade.java    |  4 +++-
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index 6968601..cdeae3a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -525,20 +525,10 @@ public class BabyBookbuildingFacade {
             babyAutoRiskRequest.setEncoded(model.getEncoded());
             babyAutoRiskRequest.setCardNo(model.getCardNo());
             if(model.getBirth()!=null && model.getCreated()!=null){
-                babyAutoRiskRequest.setDueWeek(DateUtil.getWeekDesc(model.getBirth(), model.getCreated()));
-            }
-            String dueWeek = "";
-            if (model.getDueWeek() != null) {
-                dueWeek += model.getDueWeek() + "周";
-            } else {
-                dueWeek += "0周";
-            }
-            if (model.getDueDay() != null) {
-                dueWeek += model.getDueDay() + "天";
-            } else {
-                dueWeek += "0天";
+                babyAutoRiskRequest.setDueWeek(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
+
             }
-            babyAutoRiskRequest.setDueWeek(dueWeek);
+
             Map map = new HashMap();
             map.put("fmfs", model.getDueType());
             babyAutoRiskRequest.setDeliveryMode(map);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
index b8084e2..6879a71 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
@@ -643,7 +643,8 @@ public class BabyCheckFacade extends BaseServiceImpl {
                 babyAutoRiskRequest.setEncoded(babyModel.getEncoded());
                 babyAutoRiskRequest.setCardNo(babyModel.getCardNo());
                 if(babyModel.getBirth()!=null && model.getCreated()!=null){
-                    babyAutoRiskRequest.setDueWeek(DateUtil.getWeekDesc(babyModel.getBirth(), model.getCreated()));
+                    babyAutoRiskRequest.setDueWeek(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
+
                 }
                 babyAutoDiagnoseRiskFacade.autoBabyRisk(babyAutoRiskRequest, userId, 2,"");
             }
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 74581a3..672c172 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
@@ -455,13 +455,15 @@ public class MatDeliverFacade {
                     babyAutoRiskRequest.setMphone(patients1.getPhone());
                     babyAutoRiskRequest.setMname(patients1.getUsername());
                     babyAutoRiskRequest.setMcertNo(patients1.getCardNo());
-                    babyAutoRiskRequest.setDueWeek(maternalDeliverModel.getDueWeek());
+
                     BabyModel babyModel = babyService.getOneBabyById(baby.get(i).getId());
                     if(babyModel!=null ){
                         babyAutoRiskRequest.setBabyId(babyModel.getId());
                         babyAutoRiskRequest.setName(babyModel.getName());
                         babyAutoRiskRequest.setEncoded(babyModel.getEncoded());
                         babyAutoRiskRequest.setCardNo(babyModel.getCardNo());
+                        babyAutoRiskRequest.setDueWeek(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()));
+
                     }
                     babyAutoDiagnoseRiskFacade.autoBabyRisk(babyAutoRiskRequest, userId, 0, "");
                 }
-- 
1.8.3.1