From 1e3ce05fbf83690a103cc537bb7db5d90ce30cc5 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Tue, 29 Mar 2022 17:26:36 +0800
Subject: [PATCH] update

---
 .../lyms/platform/operate/web/controller/BabyBuildController.java   | 6 +++++-
 .../lyms/platform/operate/web/facade/BabyBookbuildingFacade.java    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
index a1b2a55..ea19039 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
@@ -275,7 +275,9 @@ public class BabyBuildController extends BaseController {
                                           @RequestParam(value = "cyNumType", required = false) Integer cyNumType,
                                           @RequestParam(value = "qcNumType", required = false) Integer qcNumType,
                                           @RequestParam(value = "settleType", required = false) Integer settleType,
-                                          @RequestParam(value = "settleTime", required = false) String settleTime
+                                          @RequestParam(value = "settleTime", required = false) String settleTime,
+                                          @RequestParam(value = "positiveType", required = false) String positiveType,
+                                          @RequestParam(value = "lhEyePositiveType", required = false) String lhEyePositiveType
     ) {
 
         if (CollectionUtils.isNotEmpty(highRiskInfos)) {
@@ -389,6 +391,8 @@ public class BabyBuildController extends BaseController {
         request.setMildAnaemia(mildAnaemia);
         request.setModerateAnaemia(moderateAnaemia);
         request.setHeartMurmur(heartMurmur);
+        request.setPositiveType(positiveType);
+        request.setLhEyePositiveType(lhEyePositiveType);
         //出牙数状态
         request.setCyNumType(cyNumType);
         //龋齿状态
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 cff4171..e472e98 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
@@ -3414,7 +3414,7 @@ public class BabyBookbuildingFacade {
         //滦平、隆化-儿保管理-全部 加健康/高危筛选
         babyQuery.setHealthHigh(null!=request.getHealthHigh()?request.getHealthHigh():null);
         System.out.println("========"+babyQuery.convertToQuery().convertToMongoQuery().toString());
-        //用隆华新口腔模块中数据筛选 牙齿异常2项
+        //用隆华新口腔模块中数据筛选 牙齿异常2项,口腔阳性
         if(null!=request.getCyNumType()||null!=request.getQcNumType()||StringUtils.isNotEmpty(request.getPositiveType())){
             babyQuery.setOralCheckYn(YnEnums.YES.getId());
             babyQuery.setPositiveType(request.getPositiveType());
-- 
1.8.3.1