From 6b90efab00103fc94c2baa9dc77d1b00a87148bb Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 9 Jan 2017 16:31:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E4=BD=9C=E5=BA=9F=E4=BA=A7?=
 =?UTF-8?q?=E6=A3=80=E5=8A=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/facade/PatientFacade.java | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index 3139cac..1a56e8b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -272,7 +272,6 @@ public class PatientFacade {
         patientsQuery.setLastCheckEmployeeId(riskPatientsQueryRequest.getLastCheckDoctorId());
 
 
-
         patientsQuery.setrLevel(riskPatientsQueryRequest.getrLevel());
         patientsQuery.setLastMensesStart(riskPatientsQueryRequest.capEnd());
         patientsQuery.setLastMensesEnd(riskPatientsQueryRequest.capStart());
@@ -342,7 +341,7 @@ public class PatientFacade {
             //王平说的  必须要给区域医院权限，不然他就是蠢逼 201611124  16:41
             hospitalList = new ArrayList<>();
             String hospital = autoMatchFacade.getHospitalId(userId);
-            if(null!=hospital){
+            if (null != hospital) {
                 hospitalList.add(hospital);
             }
             DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
@@ -466,7 +465,7 @@ public class PatientFacade {
         patientsQuery.setPhone(patientQueryRequest.getPhone());
         patientsQuery.setCardNo(patientQueryRequest.getCardNo());
 
-        Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(), null, patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId,false), -1, false, patientQueryRequest.getPid(),false);
+        Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(), null, patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId, false), -1, false, patientQueryRequest.getPid(), false);
         PatientBaseResult patientBaseResult = new PatientBaseResult();
         if (null != patients) {
             patientBaseResult.convert(patients);
@@ -498,7 +497,7 @@ public class PatientFacade {
             if (end > patientses.size()) {
                 end = patientses.size();
             }
-            listFuture.add(threadPoolExecutor.submit(new QuanChanPatientWorker(patientses.subList(i, end), hospital, usersService, postReviewService, matDeliverService, patientsService,organizationService,basicConfigService)));
+            listFuture.add(threadPoolExecutor.submit(new QuanChanPatientWorker(patientses.subList(i, end), hospital, usersService, postReviewService, matDeliverService, patientsService, organizationService, basicConfigService)));
         }
         for (Future f : listFuture) {
             try {
@@ -521,7 +520,7 @@ public class PatientFacade {
             if (end > patientses.size()) {
                 end = patientses.size();
             }
-            listFuture.add(threadPoolExecutor.submit(new QuanPatientWorker(patientses.subList(i, end), usersService, hospital, antExService, basicConfigService, patientsService,organizationService)));
+            listFuture.add(threadPoolExecutor.submit(new QuanPatientWorker(patientses.subList(i, end), usersService, hospital, antExService, basicConfigService, patientsService, organizationService)));
         }
         for (Future f : listFuture) {
             try {
@@ -549,7 +548,7 @@ public class PatientFacade {
             if (end > patientses.size()) {
                 end = patientses.size();
             }
-            listFuture.add(threadPoolExecutor.submit(new WorkHR(patientses.subList(i, end), usersService, hospital, basicConfigService, antExService, patientsService,organizationService)));
+            listFuture.add(threadPoolExecutor.submit(new WorkHR(patientses.subList(i, end), usersService, hospital, basicConfigService, antExService, patientsService, organizationService)));
         }
         for (Future f : listFuture) {
             try {
@@ -767,10 +766,8 @@ public class PatientFacade {
             patientsQuery.setLimit(patientManagerRequest.getLimit());
             patientsQuery.setPage(patientManagerRequest.getPage());
         }
-        //在区域组的时候不用查询隐藏档案
-        if(null!=groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId()))){
-            patientsQuery.setExtEnable(false);
-        }
+        //排查本院隐藏建档
+        patientsQuery.setExtEnable(false);
         patientsQuery.setBuildTypeNot(1);
         patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId()));
         patientsQuery.setProvinceId(StringUtils.isEmpty(patientManagerRequest.getProvinceRegisterId()) ? null : patientManagerRequest.getProvinceRegisterId());
-- 
1.8.3.1