From 8f41d26d65668a77f268b6483fe0209cec895f63 Mon Sep 17 00:00:00 2001
From: shiyang <shiyang@lymsh.com>
Date: Fri, 25 Mar 2022 14:18:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=86=E5=8C=96-=E6=96=B0=E7=9C=BC=E4=BF=9D?=
 =?UTF-8?q?=E5=81=A5=E7=AD=9B=E9=80=89=EF=BC=8C=E4=BB=8E=E9=98=B3=E5=88=B0?=
 =?UTF-8?q?=E6=AD=A3=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lyms/platform/query/BabyModelQuery.java    | 12 ++++++++++++
 .../java/com/lyms/platform/query/LhBabyEyelCheckQuery.java   | 12 ++++++++++++
 .../platform/operate/web/facade/LhBabyEyeCheckFacade.java    | 10 ++++++++++
 3 files changed, 34 insertions(+)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
index 5e05a0c..7647be8 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
@@ -1457,6 +1457,18 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
      * 当前月龄筛选-结束(业务模块接收字段)
      */
     private Integer lhQueryEyeMonthAgeEnd;
+    /**
+     * 从阳到正常（业务处理，筛选用） 1：需要筛选
+     */
+    private Integer lhmasculineToNormal;
+
+    public Integer getLhmasculineToNormal() {
+        return lhmasculineToNormal;
+    }
+
+    public void setLhmasculineToNormal(Integer lhmasculineToNormal) {
+        this.lhmasculineToNormal = lhmasculineToNormal;
+    }
 
     public String getYcsz() {
         return ycsz;
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/LhBabyEyelCheckQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/LhBabyEyelCheckQuery.java
index fd175cb..a98750c 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/LhBabyEyelCheckQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/LhBabyEyelCheckQuery.java
@@ -115,6 +115,10 @@ public class LhBabyEyelCheckQuery extends BaseQuery implements IConvertToNativeQ
      * 眼高危
      */
     private List<String> eyeHighRisk;
+    /**
+     * 从阳到正常（业务处理，筛选用）1：需要筛选
+     */
+    private Integer masculineToNormal;
 
 
 
@@ -229,6 +233,14 @@ public class LhBabyEyelCheckQuery extends BaseQuery implements IConvertToNativeQ
         this.chuPositiveType = chuPositiveType;
     }
 
+    public Integer getMasculineToNormal() {
+        return masculineToNormal;
+    }
+
+    public void setMasculineToNormal(Integer masculineToNormal) {
+        this.masculineToNormal = masculineToNormal;
+    }
+
     public String getId() {
         return id;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java
index c3e9ec5..6a6777c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java
@@ -257,6 +257,11 @@ public class LhBabyEyeCheckFacade {
             request.setBirthStart(DateUtil.getBirthStart(request.getQueryMonthAgeEnd()));
             request.setBirthEnd(DateUtil.getBirthEnd(request.getQueryMonthAgeStart()));
         }
+        //从阳到正常 1：需要筛选
+        if(1==request.getMasculineToNormal()){
+            request.setChuPositiveType("2");
+            request.setPositiveType("1");
+        }
         List<LhBabyEyeCheck> babyOralChecks=lhBabyEyeCheckService.queryList(request,Sort.Direction.DESC,"eyeCheckTime");
         List<Map> result=new ArrayList<>();
         for (LhBabyEyeCheck babyCheck : babyOralChecks) {
@@ -291,6 +296,11 @@ public class LhBabyEyeCheckFacade {
             babyModelQuery.setBirthStart(DateUtil.getBirthStart(babyModelQuery.getLhQueryEyeMonthAgeEnd()));
             babyModelQuery.setBirthEnd(DateUtil.getBirthEnd(babyModelQuery.getLhQueryEyeMonthAgeStart()));
         }
+        //从阳到正常 1：需要筛选
+        if(1==babyModelQuery.getLhmasculineToNormal()){
+            babyModelQuery.setLhChuEyePositiveType("2");
+            babyModelQuery.setLhEyePositiveType("1");
+        }
         List<BabyModel> babyModelList = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery, "lhEyeCheckTime", Sort.Direction.DESC);
         List<Map> result=new ArrayList<>();
         for (BabyModel babyModel : babyModelList) {
-- 
1.8.3.1