Commit c15afa968b185220bc4af4f4f0d82c6cb8fd3450
1 parent
63cc1d5579
Exists in
master
and in
6 other branches
唐山区域查询建档记录
Showing 1 changed file with 28 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
c15afa9
| ... | ... | @@ -14,6 +14,7 @@ |
| 14 | 14 | import com.lyms.platform.common.result.BaseObjectResponse; |
| 15 | 15 | import com.lyms.platform.common.result.BaseResponse; |
| 16 | 16 | import com.lyms.platform.common.utils.*; |
| 17 | +import com.lyms.platform.common.utils.StringUtils; | |
| 17 | 18 | import com.lyms.platform.operate.web.request.BookBuildManagerQueryRequest; |
| 18 | 19 | import com.lyms.platform.operate.web.request.BookbuildingQueryRequest; |
| 19 | 20 | import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest; |
| ... | ... | @@ -31,6 +32,7 @@ |
| 31 | 32 | import com.lyms.platform.pojo.*; |
| 32 | 33 | import com.lyms.platform.query.*; |
| 33 | 34 | import org.apache.commons.collections.CollectionUtils; |
| 35 | +import org.apache.commons.lang.*; | |
| 34 | 36 | import org.slf4j.Logger; |
| 35 | 37 | import org.slf4j.LoggerFactory; |
| 36 | 38 | import org.springframework.beans.factory.annotation.Autowired; |
| 37 | 39 | |
| 38 | 40 | |
| ... | ... | @@ -872,15 +874,39 @@ |
| 872 | 874 | //查询主档案 |
| 873 | 875 | patientsQuery.setExtEnable(false); |
| 874 | 876 | |
| 877 | + String hospitalId = autoMatchFacade.getHospitalId(userId); | |
| 878 | + | |
| 875 | 879 | //如果身份证号码不为空就以身份证号码查询 |
| 876 | 880 | if (!StringUtils.isEmpty(bookbuildingQueryRequest.getCardNo())) { |
| 877 | 881 | patientsQuery.setCardNo(bookbuildingQueryRequest.getCardNo()); |
| 882 | + | |
| 883 | + | |
| 884 | + //线上唐山区域查询的时候只查询唐山医院的已有建档记录 | |
| 885 | + Organization org = organizationService.getOrganization(Integer.parseInt(hospitalId)); | |
| 886 | + List<String> hids = new ArrayList<>(); | |
| 887 | + if (org != null && "4".equals(org.getCityId()) && "1".equals(org.getProvinceId())) | |
| 888 | + { | |
| 889 | + OrganizationQuery query = new OrganizationQuery(); | |
| 890 | + query.setYn(YnEnums.YES.getId()); | |
| 891 | + query.setCityId("4"); | |
| 892 | + query.setProvinceId("1"); | |
| 893 | + List<Organization> list = organizationService.queryOrganization(query); | |
| 894 | + if (CollectionUtils.isNotEmpty(list)) | |
| 895 | + { | |
| 896 | + for (Organization organization : list) { | |
| 897 | + hids.add(String.valueOf(organization.getId())); | |
| 898 | + } | |
| 899 | + } | |
| 900 | + if (CollectionUtils.isNotEmpty(hids)) | |
| 901 | + { | |
| 902 | + patientsQuery.setHospitalList(hids); | |
| 903 | + } | |
| 904 | + } | |
| 905 | + | |
| 878 | 906 | patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery, "bookbuildingDate", Sort.Direction.DESC); |
| 879 | 907 | } |
| 880 | 908 | //否则用就诊卡号 查询到这个孕妇的身份证号码 再用身份证号码查询该孕妇的所有建档 包括产妇记录 |
| 881 | 909 | else if (!StringUtils.isEmpty(bookbuildingQueryRequest.getVcCardNo())) { |
| 882 | - | |
| 883 | - String hospitalId = autoMatchFacade.getHospitalId(userId); | |
| 884 | 910 | |
| 885 | 911 | //德州市妇幼保健院医院通过（就诊卡号、银行卡号，社保卡号） 查询出对应的用过的卡号 add lqy |
| 886 | 912 | if ("1000000114".equals(hospitalId)) { |