From 3822f0713f702e116aa22267bc374fef89073fc0 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 12 May 2020 13:57:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E5=90=AC=E5=8A=9B=E7=AD=9B?=
 =?UTF-8?q?=E6=9F=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lyms/platform/msg/utils/DateUtils.java  |  5 +----
 .../com/lyms/platform/operate/web/facade/BabyEarFacade.java   | 11 +++++++++++
 .../com/lyms/platform/operate/web/request/BabyEarBase.java    |  6 +-----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/DateUtils.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/DateUtils.java
index 8ba93a6..3ecafdf 100644
--- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/DateUtils.java
+++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/DateUtils.java
@@ -231,9 +231,6 @@ public class DateUtils {
         return Math.abs(result);
     }
     public static void main(String[] args) {
-        Date startDate = DateUtils.getNewDate(new Date(), -1 - 1, "月", 1);
-        Date endDate = DateUtils.getNewDate(new Date(), -1, "月",2);
-        System.out.println(DateUtils.getDateStr(startDate, Y_M_D));
-        System.out.println(DateUtils.getDateStr(endDate,Y_M_D));
+        System.out.println( getWeekOfDate(new Date()));
     }
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
index 9ec860d..bdc8ddc 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
@@ -488,6 +488,17 @@ public class BabyEarFacade {
             //babyId
             String babyPatientId = "";
             if (StringUtils.isNotEmpty(baby.getId())) {//更新本院儿童信息
+
+                BabyModel tempBaby = babyService.getOneBabyById(baby.getId());
+                if (tempBaby != null)
+                {
+                    if (tempBaby.getDataStatus() != null && tempBaby.getDataStatus() == 1)
+                    {
+                        baby.setDataStatus(0);
+                        baby.setYn(YnEnums.YES.getId());
+                    }
+                }
+
                 babyService.updateOneBaby(baby, baby.getId());
                 babyPatientId = baby.getId();
             } else {//新增
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java
index c20a329..ec0a6f8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java
@@ -246,11 +246,7 @@ public class BabyEarBase implements IBasicRequestConvert<BabyModel> {
         babyModel.setFproTypeId(fproTypeId);
         babyModel.setFileCode(fileCode);
 
-        if (dataStatus != null && dataStatus == 1)
-        {
-            babyModel.setDataStatus(0);
-            babyModel.setYn(YnEnums.YES.getId());
-        }
+
 
         return babyModel;
     }
-- 
1.8.3.1