From b3f119cf441fa1866261375cca9e6450ef3cf919 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Tue, 29 Aug 2017 16:59:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E5=8A=9B=E8=AF=8A=E6=96=AD=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/controller/EarController.java   | 16 +++++++++++++---
 .../lyms/platform/operate/web/facade/BabyEarFacade.java  |  9 ++++++---
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java
index c8ca27c..0714036 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java
@@ -60,6 +60,7 @@ public class EarController extends BaseController {
     @Autowired
     private BabyEarFacade babyEarFacade;
 
+
     /**
      * 检测儿童是否能够随访
      *
@@ -69,7 +70,12 @@ public class EarController extends BaseController {
     @RequestMapping(method = RequestMethod.GET, value = "/checkBabyFollowUp")
     @ResponseBody
     @TokenRequired
-    public BaseResponse checkBabyFollowUp(String babyId) {
+    public BaseResponse checkBabyFollowUp(String babyId, HttpServletRequest request){
+
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        if (loginState == null) {
+            return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录");
+        }
         InitFollowUp initHearingDiagnose = new InitFollowUp();
         if (StringUtils.isEmpty(babyId)) {//传入儿童档案id
             return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案id");
@@ -78,7 +84,11 @@ public class EarController extends BaseController {
 
         //查询随访记录
         BabyPatientExtendEarFollowUpQuery query = new BabyPatientExtendEarFollowUpQuery();
-        query.setBabyId(babyId);
+        //当前登录人医院Id
+        String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
+        //获取机构内同一儿童babyIds
+        List<String> babyIds = babyEarFacade.getBabyIdsByItemOrg(babyId,hospitalId);
+        query.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()]));
         List<BabyPatientExtendEarFollowUp> followUpList = babyPatientExtendEarFollowUpService.queryBabyPatientExtendEarFollowUp(query);
         //是否结案
         boolean Ifclose = false;
@@ -99,7 +109,7 @@ public class EarController extends BaseController {
         //该儿童档案有听诊记录，条件2：听诊记录有一条记录已经确诊。
         //查询听诊记录
         BabyPatientExtendEarHearingDiagnoseQuery hdQuery = new BabyPatientExtendEarHearingDiagnoseQuery();
-        hdQuery.setBabyId(babyId);
+        hdQuery.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()]));
         List<BabyPatientExtendEarHearingDiagnose> hdList = hearingDiagnoseService.queryBabyPatientExtendEarHearingDiagnose(hdQuery);
 
         if (hdList == null && hdList.size() == 0) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
index 9d3f68f..0df0115 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
@@ -1477,11 +1477,14 @@ public class BabyEarFacade {
      */
     public BaseResponse findBabyEarSrc(String babyId, Integer userId) {
         BabyPatientExtendEarScreenQuery query = new BabyPatientExtendEarScreenQuery();
-        query.setBabyId(babyId);
-        query.setStatus(0);
-        query.setSort("create_date");
         //当前登录人医院Id
         String hospitalId = autoMatchFacade.getHospitalId(userId);
+        //获取机构内同一儿童babyIds
+        List<String> babyIds = getBabyIdsByItemOrg(babyId,hospitalId);
+        query.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()]));
+        query.setStatus(0);
+        query.setSort("create_date");
+
         List hospitalIds = getOrgHospitalIds(hospitalId);
         String[] checkHospitalIds = (String[]) hospitalIds.toArray(new String[hospitalIds.size()]);
         query.setCheckHospitalIds(checkHospitalIds);
-- 
1.8.3.1