fangcheng / regional-platform

Download as
Browse Code »

Commit 00dda3428eb1f3a0fb7ec39da3d48c29ac396f03

Authored by jiangjiazhi
1 parent 9acd1b5c07
Exists in master

修改产检删除

Showing 7 changed files with 23 additions and 14 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 00dda34
... ... @@ -862,7 +862,7 @@
862 862  
863 863 if (CollectionUtils.isNotEmpty(list)) {
864 864 // Patients patients2 = findOnePatient(null, null, null, hospital, -1, true, exListQueryRequest.getPid(),false);
865   - Patients patients2 = findOnePatient(null, null, null, groupsFacade.findGroupHospital(userId), -1, true, exListQueryRequest.getPid(), false);
  865 + Patients patients2 = findOnePatient(null, null, null, groupsFacade.findGroupHospital(userId,true), -1, true, exListQueryRequest.getPid(), false);
866 866 antexListResult.convertToResult(null, patients2, null);
867 867  
868 868 HighScoreResult highScoreResult = findLastRisk(list.get(0).getPid(), false);
... ... @@ -1746,7 +1746,7 @@
1746 1746 patients = list.get(0);
1747 1747 }
1748 1748 } else {
1749   - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, groupsFacade.findGroupHospital(userId), 1, false, null, og.getbStatus() == 1);
  1749 + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, groupsFacade.findGroupHospital(userId,false), 1, false, null, og.getbStatus() == 1);
1750 1750 //查询产妇数据
1751 1751 // patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 1, false, null, false);
1752 1752 }
... ... @@ -1759,7 +1759,7 @@
1759 1759 // //查询是否还有其他记录
1760 1760 // patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 3, false, null, false);
1761 1761 // }
1762   - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, groupsFacade.findGroupHospital(userId), 3, false, null, og.getbStatus() == 1);
  1762 + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, groupsFacade.findGroupHospital(userId,false), 3, false, null, og.getbStatus() == 1);
1763 1763  
1764 1764 //原来单机
1765 1765 if (null != patients) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 00dda34
... ... @@ -498,7 +498,7 @@
498 498 patientsQuery.setVcCardNo(bookbuildingQueryRequest.getVcCardNo());
499 499  
500 500 //区域模式
501   - patientsQuery.setHospitalList(groupsFacade.findGroupHospital(userId));
  501 + patientsQuery.setHospitalList(groupsFacade.findGroupHospital(userId,false));
502 502  
503 503 List<Patients> patientsVc = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
504 504 if (CollectionUtils.isNotEmpty(patientsVc)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 00dda34
... ... @@ -562,9 +562,9 @@
562 562  
563 563 //http://jira.healthbaby.com.cn/browse/WEB-204 修改bug
564 564 //本院的孕妇
565   - Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, organizationGroupsFacade.findGroupHospital(userId), 1, false, null,isEnable);
  565 + Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, organizationGroupsFacade.findGroupHospital(userId,false), 1, false, null,isEnable);
566 566 //本院产妇
567   - Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, organizationGroupsFacade.findGroupHospital(userId), 3, false, null,isEnable);
  567 + Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, organizationGroupsFacade.findGroupHospital(userId,false), 3, false, null,isEnable);
568 568 PersonModelQuery personModelQuery = new PersonModelQuery();
569 569 String pid = "";
570 570 if (null != patients1) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OrganizationGroupsFacade.java View file @ 00dda34
... ... @@ -82,14 +82,18 @@
82 82 * 查询当前用户可以查看那些医院
83 83 *
84 84 * @param userId 用户id
85   - * @return
  85 + * @return 是否是电子病历 电子病历显示全系统的数据
86 86 */
87   - public List<String> findGroupHospital(Integer userId) {
  87 + public List<String> findGroupHospital(Integer userId,boolean medicalRecord) {
88 88 String hospital = autoMatchFacade.getHospitalId(userId);
89 89 //查询当前帐号所在的组
90 90 String groupId = findByCurrentUserId(hospital);
91 91  
92 92 if (null == groupId) {
  93 + //电子病历不区分医院
  94 + if(medicalRecord){
  95 + return null;
  96 + }
93 97 List<String> data = new ArrayList<>();
94 98 data.add(hospital);
95 99 return data;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 00dda34
... ... @@ -21,7 +21,9 @@
21 21 import com.lyms.platform.permission.service.OrganizationService;
22 22 import com.lyms.platform.permission.service.UsersService;
23 23 import com.lyms.platform.pojo.*;
24   -import com.lyms.platform.query.*;
  24 +import com.lyms.platform.query.BabyModelQuery;
  25 +import com.lyms.platform.query.DataPermissionsModelQuery;
  26 +import com.lyms.platform.query.PatientsQuery;
25 27 import org.apache.commons.collections.CollectionUtils;
26 28 import org.apache.commons.lang.StringUtils;
27 29 import org.slf4j.Logger;
... ... @@ -33,7 +35,10 @@
33 35 import javax.servlet.http.HttpServletResponse;
34 36 import java.io.OutputStream;
35 37 import java.util.*;
36   -import java.util.concurrent.*;
  38 +import java.util.concurrent.Future;
  39 +import java.util.concurrent.LinkedBlockingQueue;
  40 +import java.util.concurrent.ThreadPoolExecutor;
  41 +import java.util.concurrent.TimeUnit;
37 42  
38 43 /**
39 44 * Created by Administrator on 2016/4/22 0022.
... ... @@ -463,7 +468,7 @@
463 468 patientsQuery.setPhone(patientQueryRequest.getPhone());
464 469 patientsQuery.setCardNo(patientQueryRequest.getCardNo());
465 470  
466   - Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(), null, patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId), -1, false, patientQueryRequest.getPid(),false);
  471 + Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(), null, patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId,false), -1, false, patientQueryRequest.getPid(),false);
467 472 PatientBaseResult patientBaseResult = new PatientBaseResult();
468 473 if (null != patients) {
469 474 patientBaseResult.convert(patients);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java View file @ 00dda34
... ... @@ -209,7 +209,7 @@
209 209  
210 210 //取所有医院的建档数据 优先取本院 ，然后取外院
211 211  
212   - Patients patientsList = examinationFacade.findOnePatient(postReviewQueryRequest.getCardNo(), postReviewQueryRequest.getVcCardNo(), null, groupsFacade.findGroupHospital(userId), 3, true, null, og.getbStatus() != 1);
  212 + Patients patientsList = examinationFacade.findOnePatient(postReviewQueryRequest.getCardNo(), postReviewQueryRequest.getVcCardNo(), null, groupsFacade.findGroupHospital(userId,false), 3, true, null, og.getbStatus() != 1);
213 213 PostReviewListResult postReviewListResult = new PostReviewListResult();
214 214 if (null != patientsList) {
215 215 if (null != patientsList.getDueStatus() && 1 == patientsList.getDueStatus()) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java View file @ 00dda34
... ... @@ -156,12 +156,12 @@
156 156  
157 157  
158 158 String groupId = groupsFacade.findByCurrentUserId(request.getHospitalId());
159   - List<String> hos = groupsFacade.findGroupHospital(userId);
  159 + List<String> hos = groupsFacade.findGroupHospital(userId,false);
160 160 String hospital = autoMatchFacade.getHospitalId(userId);
161 161 for (Patients patient : patients) {
162 162 if (patient != null) {
163 163 String hid = patient.getHospitalId();
164   - if (StringUtils.isNotEmpty(groupId) && hos.contains(hospital)) {
  164 + if (StringUtils.isNotEmpty(groupId) &&CollectionUtils.isNotEmpty(hos)&& hos.contains(hospital)) {
165 165 pat = patient;
166 166 } else if (StringUtils.isNotEmpty(hid) && hid.equals(request.getHospitalId())) {
167 167 pat = patient;