From fb3b415c79a749ca2357ac570e9159072c96840d Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 29 Aug 2016 17:41:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E7=97=85=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/controller/SieveController.java    | 13 ++++++++++-
 .../platform/operate/web/facade/SieveFacade.java   | 26 +++++++++++++++++-----
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java
index 75deda8..2f90f1d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java
@@ -85,7 +85,18 @@ public class SieveController extends BaseController {
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
         return sieveFacade.getOneChanQianDiaSieve(id/*,loginState.getId()*/);
     }
-
+    /**
+     * 产前诊断
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/checkItem",method = RequestMethod.GET)
+    @TokenRequired
+    public BaseResponse getCheckItem(@RequestParam("parentId")String id,HttpServletRequest request) {
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        return sieveFacade.getCheckItem(id,loginState.getId());
+    }
 
     @ResponseBody
     @RequestMapping(value = "/cqsieve/enums",method = RequestMethod.GET)
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
index fb4faf7..347fdfa 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
@@ -1,6 +1,7 @@
 package com.lyms.platform.operate.web.facade;
 
 import com.lyms.platform.biz.service.AntenatalExaminationService;
+import com.lyms.platform.biz.service.ApplyOrderService;
 import com.lyms.platform.biz.service.PatientsService;
 import com.lyms.platform.biz.service.SieveService;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
@@ -9,6 +10,7 @@ import com.lyms.platform.common.result.BaseListResponse;
 import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.common.utils.DateUtil;
+import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.operate.web.request.ChanQianDiaAddRequest;
 import com.lyms.platform.operate.web.request.CqSieveQueryRequest;
 import com.lyms.platform.operate.web.request.SieveAddRequest;
@@ -18,10 +20,7 @@ import com.lyms.platform.operate.web.result.SieveResult;
 import com.lyms.platform.permission.model.Organization;
 import com.lyms.platform.permission.service.OrganizationService;
 import com.lyms.platform.pojo.*;
-import com.lyms.platform.query.AntExChuQuery;
-import com.lyms.platform.query.AntExQuery;
-import com.lyms.platform.query.SieveQuery;
-import com.lyms.platform.query.SieveResultQuery;
+import com.lyms.platform.query.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
@@ -50,6 +49,8 @@ public class SieveFacade {
     private AntenatalExaminationService antenatalExaminationService;
     @Autowired
     private OrganizationService organizationService;
+    @Autowired
+    private ApplyOrderService applyOrderService;
 
     /**
      * 增加一条产筛结果记录
@@ -90,7 +91,7 @@ public class SieveFacade {
         if(CollectionUtils.isNotEmpty(sb)){
             SieveResultModel sieveResultModel=sb.get(0);
 //            Patients patients= patientsService.findOnePatientById(sieveResultModel.getParentId());
-            sieveResult.convert(sieveResultModel,null);
+            sieveResult.convert(sieveResultModel, null);
         }
         return new BaseObjectResponse().setData(sieveResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
     }
@@ -122,7 +123,20 @@ public class SieveFacade {
         }
         return new BaseObjectResponse().setData(sieveDetailResult).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);
     }
-
+    public BaseResponse getCheckItem(String id,Integer userId) {
+        SieveApplyOrderQuery sieveQuery = new SieveApplyOrderQuery();
+        sieveQuery.setYn(YnEnums.YES.getId());
+        sieveQuery.setParentId(id);
+        String hospital  =  autoMatchFacade.getHospitalId(userId);
+        sieveQuery.setHospitalId(hospital);
+        List<SieveApplyOrderModel> applyOrderModels =   applyOrderService.querySieveApplyOrderWithQuery(sieveQuery);
+        List  list = new ArrayList();
+        if(CollectionUtils.isNotEmpty(applyOrderModels)) {
+            SieveApplyOrderModel sieveModel = applyOrderModels.get(0);
+            list=JsonUtil.jkstr2Obj(sieveModel.getCheckItem(), List.class) ;
+        }
+        return  new BaseObjectResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
+    }
     /**
      * 产前诊断
      *
-- 
1.8.3.1