From 439a0ceadb8c12e0560860440743e360fe940e54 Mon Sep 17 00:00:00 2001
From: changpengfei <changpengfei@lymsh.com>
Date: Tue, 26 Oct 2021 14:07:39 +0800
Subject: [PATCH] =?UTF-8?q?0-6=E5=B2=81=E5=84=BF=E7=AB=A5=E8=A7=86?=
 =?UTF-8?q?=E8=A7=89=E5=81=A5=E5=BA=B7=E6=A1=A3=E6=A1=88--=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=90=AC=E4=BA=86=E7=AD=9B=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/BabyHealthFacade.java       | 45 ++++++++++++++++++----
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java
index 6c0c5b1..4fa5144 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java
@@ -20,10 +20,7 @@ import com.lyms.platform.operate.web.service.impl.BaseServiceImpl;
 import com.lyms.platform.operate.web.utils.CollectionUtils;
 import com.lyms.platform.operate.web.utils.MongoUtil;
 import com.lyms.platform.permission.dao.master.CouponMapper;
-import com.lyms.platform.permission.model.CheckItem;
-import com.lyms.platform.permission.model.Organization;
-import com.lyms.platform.permission.model.PatientService;
-import com.lyms.platform.permission.model.Users;
+import com.lyms.platform.permission.model.*;
 import com.lyms.platform.permission.service.*;
 import com.lyms.platform.pojo.*;
 import com.lyms.platform.query.*;
@@ -35,6 +32,7 @@ import jxl.write.Label;
 import jxl.write.WritableCellFormat;
 import jxl.write.WritableSheet;
 import jxl.write.WritableWorkbook;
+import org.apache.commons.beanutils.BeanMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.domain.Sort;
@@ -152,6 +150,12 @@ public class BabyHealthFacade extends BaseServiceImpl {
 
     @Autowired
     private OrganizationGroupsFacade organizationGroupsFacade;
+    @Autowired
+    @Qualifier("commonThreadPool")
+    private ThreadPoolTaskExecutor commonThreadPool;
+    //听力筛查
+    @Autowired
+    private BabyPatientExtendEarScreenService babyPatientExtendEarScreenService;
 
     public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version");
 
@@ -997,8 +1001,35 @@ public class BabyHealthFacade extends BaseServiceImpl {
         Criteria criteriaCheck = Criteria.where("buildId").in(id);
         criteriaCheck.and("checkMonth").is(checkMonthAge);
         List<BabyCheckModel> babyCheckModelList = mongoTemplate.find(new Query(criteriaCheck).with(new Sort(Sort.Direction.DESC, "created")), BabyCheckModel.class);
+        List<BabyEyeCheck> babyEyeCheckList = mongoTemplate.find(new Query(criteriaCheck).with(new Sort(Sort.Direction.DESC, "created")), BabyEyeCheck.class);
+
+
+        Map<String,Object> rs=new HashMap<>();
+        Date birthDate=new Date();
+
+        if(babyCheckModelList.size()>0){
+            BabyCheckModel checkModel=babyCheckModelList.get(0);
+            checkModel.getBirth();
+
+            rs.putAll(new BeanMap(checkModel));
+        }
 
-        return RespBuilder.buildSuccess(babyCheckModelList);
+        if(babyEyeCheckList.size()>0){//眼检查
+            BabyEyeCheck checkModel=babyEyeCheckList.get(0);
+
+            rs.putAll(new BeanMap(checkModel));
+        }
+
+        BabyPatientExtendEarScreenQuery query = new BabyPatientExtendEarScreenQuery();//耳筛
+        query.setScreenDate(DateUtil.addMonth(birthDate,1));
+        List<BabyPatientExtendEarScreen> babyPatientExtendEarScreens = babyPatientExtendEarScreenService.queryBabyPatientExtendEarScreen(query);
+        if(babyPatientExtendEarScreens.size()>0){
+            rs.putAll(new BeanMap(babyPatientExtendEarScreens.get(0)));
+        }
+
+        List<Map> lst=new ArrayList<>();
+        lst.add(rs);
+        return RespBuilder.buildSuccess(lst);
     }
 
 
@@ -1133,7 +1164,5 @@ public class BabyHealthFacade extends BaseServiceImpl {
         return RespBuilder.buildSuccess(pageResult);
     }
 
-    @Autowired
-    @Qualifier("commonThreadPool")
-    private ThreadPoolTaskExecutor commonThreadPool;
+
 }
\ No newline at end of file
-- 
1.8.3.1