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 dbbf741..f74cb8d 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 @@ -14,6 +14,7 @@ import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; +import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.BookBuildManagerQueryRequest; import com.lyms.platform.operate.web.request.BookbuildingQueryRequest; import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest; @@ -31,6 +32,7 @@ import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -872,16 +874,40 @@ public class BookbuildingFacade { //查询主档案 patientsQuery.setExtEnable(false); + String hospitalId = autoMatchFacade.getHospitalId(userId); + //如果身份证号码不为空就以身份证号码查询 if (!StringUtils.isEmpty(bookbuildingQueryRequest.getCardNo())) { patientsQuery.setCardNo(bookbuildingQueryRequest.getCardNo()); + + + //线上唐山区域查询的时候只查询唐山医院的已有建档记录 + Organization org = organizationService.getOrganization(Integer.parseInt(hospitalId)); + List hids = new ArrayList<>(); + if (org != null && "4".equals(org.getCityId()) && "1".equals(org.getProvinceId())) + { + OrganizationQuery query = new OrganizationQuery(); + query.setYn(YnEnums.YES.getId()); + query.setCityId("4"); + query.setProvinceId("1"); + List list = organizationService.queryOrganization(query); + if (CollectionUtils.isNotEmpty(list)) + { + for (Organization organization : list) { + hids.add(String.valueOf(organization.getId())); + } + } + if (CollectionUtils.isNotEmpty(hids)) + { + patientsQuery.setHospitalList(hids); + } + } + patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery, "bookbuildingDate", Sort.Direction.DESC); } //否则用就诊卡号 查询到这个孕妇的身份证号码 再用身份证号码查询该孕妇的所有建档 包括产妇记录 else if (!StringUtils.isEmpty(bookbuildingQueryRequest.getVcCardNo())) { - String hospitalId = autoMatchFacade.getHospitalId(userId); - //德州市妇幼保健院医院通过(就诊卡号、银行卡号,社保卡号) 查询出对应的用过的卡号 add lqy if ("1000000114".equals(hospitalId)) { patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(bookbuildingQueryRequest.getVcCardNo()));