From 0a7ea4f6bab5eb4f76c02e08df74e6a2d75e0e0a Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 11 Oct 2019 17:45:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=B7=E5=B7=9E=E7=94=B5=E5=AD=90=E5=81=A5?= =?UTF-8?q?=E5=BA=B7=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/AntExRecordFacade.java | 20 ++++++++++++++++++-- .../web/facade/AntenatalExaminationFacade.java | 4 ++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 3db92cf..698d87d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.facade; +import com.lyms.hospitalapi.dzfy.DzfyHisService; import com.lyms.platform.biz.dal.IFolicAcidDao; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; @@ -82,8 +83,6 @@ public class AntExRecordFacade { @Autowired private AntenatalExaminationFacade antenatalExaminationFacade; - @Autowired - private ModularFunctionConfigService modularFunctionConfigServcie; @Autowired private AntenatalExaminationService antenatalExaminationService; @@ -95,6 +94,9 @@ public class AntExRecordFacade { @Autowired private GuidelinesService guidelinesService; + @Autowired + private DzfyHisService dzfyHisService; + /** * 组合查询请求 * @@ -271,6 +273,20 @@ public class AntExRecordFacade { if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo())) { patientsQuery.setQueryNo(antExManagerQueryRequest.getQueryNo()); patientses = patientsService.queryPatient1(patientsQuery, "modpatientsQueryified"); + + if (CollectionUtils.isEmpty(patientses)) + { + String hospitalId = autoMatchFacade.getHospitalId(userId); + if ("1000000114".equals(hospitalId)) { + List list = dzfyHisService.getDzVcCardNos(antExManagerQueryRequest.getQueryNo()); + if (CollectionUtils.isNotEmpty(list)) + { + patientsQuery.setVcCardNos(list); + patientsQuery.setQueryNo(null); + patientses = patientsService.queryPatient1(patientsQuery, "modpatientsQueryified"); + } + } + } } AntExRecordQuery antExRecordQuery = complayRequest(userId, antExManagerQueryRequest, isRegion, isPage); 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 a5fb7f1..ec2740e 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 @@ -2700,7 +2700,7 @@ public class AntenatalExaminationFacade { if (StringUtils.isNotEmpty(vcCardNo)) { //德州市妇幼保健院医院通过（就诊卡号、银行卡号，社保卡号） 查询出对应的用过的卡号 add lqy - if ("1000000114".equals(hospitalId)) { + if (CollectionUtils.isNotEmpty(hospitalId) && hospitalId.contains("1000000114")) { patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo)); } else { patientsQuery.setVcCardNo(vcCardNo); @@ -2746,7 +2746,7 @@ public class AntenatalExaminationFacade { if (StringUtils.isNotEmpty(vcCardNo)) { //德州市妇幼保健院医院通过（就诊卡号、银行卡号，社保卡号） 查询出对应的用过的卡号 add lqy - if ("1000000114".equals(hospitalIds)) { + if ("1000000114".equals(hospitalId)) { patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo)); } else { patientsQuery.setVcCardNo(vcCardNo); -- 1.8.3.1