From 7380c8e5985c6f5d97c2567e79238638526f34be Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Tue, 21 Jul 2020 17:27:13 +0800
Subject: [PATCH] update

---
 .../operate/web/service/impl/BabyEyeCheckServiceImpl.java | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
index 493b443..99d96d5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
@@ -696,6 +696,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC
                              Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds,
                              Integer page, Integer limit, Date bookStartDate, Date bookEndDate,
                              String apparatusPositive, String doctorPositive, String yin) {
+        boolean b = true;
         String hospitalId = autoMatchFacade.getHospitalId(userId);
         Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId);
         if (startDate != null && endDate != null) {
@@ -707,9 +708,20 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC
         if (org.apache.commons.lang.StringUtils.isNotBlank(doctor)) {
             criteria.and("doctor").is(doctor);
         }
+
+        if(b && StringUtils.isNotEmpty(chechMonth)){
+            if("0".equals(chechMonth)){
+                chechMonth = "1";
+            }else if("9".equals(chechMonth)){
+                chechMonth = "12";
+            }else if("18".equals(chechMonth)){
+                chechMonth = "24";
+            }
+        }
         if (StringUtils.isNotEmpty(chechMonth)) {
             criteria.and("checkMonthId").is(chechMonth);
         }
+
         if (currentMonthStart != null && currentMonthEnd != null) {
             Date start = DateUtil.getBirthStart(currentMonthEnd);
             Date end = DateUtil.getBirthEnd(currentMonthStart);
@@ -1047,6 +1059,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC
         String hospitalId = autoMatchFacade.getHospitalId(userId);
         List<Map<String, Object>> checkMonth = EnumUtil.toJson(CheckMonthEnums.class); /** 检查月龄 */
         List<Map<String, Object>> currentMonth = EnumUtil.toJson(CheckMonthEnums2.class); /** 检查月龄 */
+        List<Map<String, Object>> checkMonthQhdEnums = EnumUtil.toJson(CheckMonthQhdEnums.class); /** (检查时间 */
         List<Map<String, Object>> positive = new ArrayList<>(); /** 阳性项目 */
 
         if ("197".equals(hospitalId)) {
@@ -1232,7 +1245,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC
         }
 
 
-        return RespBuilder.buildSuccess("checkMonth", checkMonth, "positive", positive, "currentMonth", currentMonth);
+        return RespBuilder.buildSuccess("checkMonth", checkMonth, "positive", positive, "currentMonth", currentMonth, "checkMonthQhdEnums", checkMonthQhdEnums);
     }
 
     @Override
-- 
1.8.3.1