From 00dda3428eb1f3a0fb7ec39da3d48c29ac396f03 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 28 Dec 2016 11:10:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E6=A3=80=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/AntenatalExaminationFacade.java | 6 +++--- .../lyms/platform/operate/web/facade/BookbuildingFacade.java | 2 +- .../lyms/platform/operate/web/facade/MatDeliverFacade.java | 4 ++-- .../platform/operate/web/facade/OrganizationGroupsFacade.java | 8 ++++++-- .../com/lyms/platform/operate/web/facade/PatientFacade.java | 11 ++++++++--- .../lyms/platform/operate/web/facade/PostReviewFacade.java | 2 +- .../lyms/platform/operate/web/facade/StopPregnancyFacade.java | 4 ++-- 7 files changed, 23 insertions(+), 14 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 44e4763..87e2546 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 @@ -862,7 +862,7 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(list)) { // Patients patients2 = findOnePatient(null, null, null, hospital, -1, true, exListQueryRequest.getPid(),false); - Patients patients2 = findOnePatient(null, null, null, groupsFacade.findGroupHospital(userId), -1, true, exListQueryRequest.getPid(), false); + Patients patients2 = findOnePatient(null, null, null, groupsFacade.findGroupHospital(userId,true), -1, true, exListQueryRequest.getPid(), false); antexListResult.convertToResult(null, patients2, null); HighScoreResult highScoreResult = findLastRisk(list.get(0).getPid(), false); @@ -1746,7 +1746,7 @@ public class AntenatalExaminationFacade { patients = list.get(0); } } else { - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, groupsFacade.findGroupHospital(userId), 1, false, null, og.getbStatus() == 1); + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, groupsFacade.findGroupHospital(userId,false), 1, false, null, og.getbStatus() == 1); //查询产妇数据 // patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 1, false, null, false); } @@ -1759,7 +1759,7 @@ public class AntenatalExaminationFacade { // //查询是否还有其他记录 // patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 3, false, null, false); // } - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, groupsFacade.findGroupHospital(userId), 3, false, null, og.getbStatus() == 1); + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, groupsFacade.findGroupHospital(userId,false), 3, false, null, og.getbStatus() == 1); //原来单机 if (null != patients) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 994fbd8..d2c4ed0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -498,7 +498,7 @@ public class BookbuildingFacade { patientsQuery.setVcCardNo(bookbuildingQueryRequest.getVcCardNo()); //区域模式 - patientsQuery.setHospitalList(groupsFacade.findGroupHospital(userId)); + patientsQuery.setHospitalList(groupsFacade.findGroupHospital(userId,false)); List patientsVc = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); if (CollectionUtils.isNotEmpty(patientsVc)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 33af0c6..468e5f2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -562,9 +562,9 @@ public class MatDeliverFacade { //http://jira.healthbaby.com.cn/browse/WEB-204 修改bug //本院的孕妇 - Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, organizationGroupsFacade.findGroupHospital(userId), 1, false, null,isEnable); + Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, organizationGroupsFacade.findGroupHospital(userId,false), 1, false, null,isEnable); //本院产妇 - Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, organizationGroupsFacade.findGroupHospital(userId), 3, false, null,isEnable); + Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, organizationGroupsFacade.findGroupHospital(userId,false), 3, false, null,isEnable); PersonModelQuery personModelQuery = new PersonModelQuery(); String pid = ""; if (null != patients1) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OrganizationGroupsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OrganizationGroupsFacade.java index d5ece1e..2dc06e1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OrganizationGroupsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OrganizationGroupsFacade.java @@ -82,14 +82,18 @@ public class OrganizationGroupsFacade { * 查询当前用户可以查看那些医院 * * @param userId 用户id - * @return + * @return 是否是电子病历 电子病历显示全系统的数据 */ - public List findGroupHospital(Integer userId) { + public List findGroupHospital(Integer userId,boolean medicalRecord) { String hospital = autoMatchFacade.getHospitalId(userId); //查询当前帐号所在的组 String groupId = findByCurrentUserId(hospital); if (null == groupId) { + //电子病历不区分医院 + if(medicalRecord){ + return null; + } List data = new ArrayList<>(); data.add(hospital); return data; 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 a1ac28d..b125147 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 @@ -21,7 +21,9 @@ import com.lyms.platform.permission.model.UsersQuery; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; -import com.lyms.platform.query.*; +import com.lyms.platform.query.BabyModelQuery; +import com.lyms.platform.query.DataPermissionsModelQuery; +import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; @@ -33,7 +35,10 @@ import org.springframework.util.StopWatch; import javax.servlet.http.HttpServletResponse; import java.io.OutputStream; import java.util.*; -import java.util.concurrent.*; +import java.util.concurrent.Future; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; /** * Created by Administrator on 2016/4/22 0022. @@ -463,7 +468,7 @@ public class PatientFacade { patientsQuery.setPhone(patientQueryRequest.getPhone()); patientsQuery.setCardNo(patientQueryRequest.getCardNo()); - Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(), null, patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId), -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); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java index 375decb..39a4d37 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java @@ -209,7 +209,7 @@ public class PostReviewFacade { //取所有医院的建档数据 优先取本院 ，然后取外院 - Patients patientsList = examinationFacade.findOnePatient(postReviewQueryRequest.getCardNo(), postReviewQueryRequest.getVcCardNo(), null, groupsFacade.findGroupHospital(userId), 3, true, null, og.getbStatus() != 1); + Patients patientsList = examinationFacade.findOnePatient(postReviewQueryRequest.getCardNo(), postReviewQueryRequest.getVcCardNo(), null, groupsFacade.findGroupHospital(userId,false), 3, true, null, og.getbStatus() != 1); PostReviewListResult postReviewListResult = new PostReviewListResult(); if (null != patientsList) { if (null != patientsList.getDueStatus() && 1 == patientsList.getDueStatus()) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java index 842ab76..54ef21d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java @@ -156,12 +156,12 @@ public class StopPregnancyFacade { String groupId = groupsFacade.findByCurrentUserId(request.getHospitalId()); - List hos = groupsFacade.findGroupHospital(userId); + List hos = groupsFacade.findGroupHospital(userId,false); String hospital = autoMatchFacade.getHospitalId(userId); for (Patients patient : patients) { if (patient != null) { String hid = patient.getHospitalId(); - if (StringUtils.isNotEmpty(groupId) && hos.contains(hospital)) { + if (StringUtils.isNotEmpty(groupId) &&CollectionUtils.isNotEmpty(hos)&& hos.contains(hospital)) { pat = patient; } else if (StringUtils.isNotEmpty(hid) && hid.equals(request.getHospitalId())) { pat = patient; -- 1.8.3.1