From 6708ab13519f153eebc0c167f8c91d6aef8826a7 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 15 Jun 2017 15:24:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/AntenatalExaminationFacade.java | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
index dbbc206..dfce9a6 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
@@ -74,7 +74,8 @@ public class AntenatalExaminationFacade {
 
     @Autowired
     private CouponService couponService;
-
+@Autowired
+    private SieveService sieveService;
     /**
      * 处理区域隐藏建档
      *
@@ -2137,14 +2138,21 @@ public class AntenatalExaminationFacade {
         return highScoreResult;
     }
 
-    public BaseResponse getLastCheck(Integer userId,String pid){
+    public BaseResponse getLastCheck(Integer userId,String parentId){
         AntExQuery antExQuery1 = new AntExQuery();
         String hospitalId =  autoMatchFacade.getHospitalId(userId);
         antExQuery1.setHospitalId(hospitalId);
-        antExQuery1.setPid(pid);
+        antExQuery1.setParentId(parentId);
         antExQuery1.setYn(YnEnums.YES.getId());
         List<AntenatalExaminationModel> examinationModelList = antenatalExaminationService.queryAntenatalExamination(antExQuery1.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
         Map m =new HashMap();
+        SieveQuery sieveQuery = new SieveQuery();
+        sieveQuery.setParentId(parentId);
+        List<SieveModel> list =sieveService.queryList(sieveQuery);
+        int status=-1;
+        if(CollectionUtils.isNotEmpty(list)){
+            status= list.get(0).getStatus();
+        }
         if(CollectionUtils.isNotEmpty(examinationModelList)){
            for(AntenatalExaminationModel model:examinationModelList){
                String zybd=model.getZyqbd();
@@ -2161,13 +2169,14 @@ public class AntenatalExaminationFacade {
                     m.put("textpjbc",text);
                     m.put("s75gdgtt",s75gdgtt);
                     m.put("jzxgn",jzxgn);
+                    m.put("status",status);
                     break;
                 }
            }
         }
         AntExChuQuery antExChuQuery =new AntExChuQuery();
         antExQuery1.setHospitalId(hospitalId);
-        antExQuery1.setPid(pid);
+        antExQuery1.setParentId(parentId);
         antExQuery1.setYn(YnEnums.YES.getId());
         List<AntExChuModel> chuModelList= antenatalExaminationService.queryAntExChu(antExChuQuery);
         if(CollectionUtils.isNotEmpty(chuModelList)){
@@ -2186,6 +2195,7 @@ public class AntenatalExaminationFacade {
                     m.put("textpjbc",text);
                     m.put("s75gdgtt",s75gdgtt);
                     m.put("jzxgn",jzxgn);
+                    m.put("status",status);
                     break;
                 }
             }
-- 
1.8.3.1