Commit 0a7ea4f6bab5eb4f76c02e08df74e6a2d75e0e0a
1 parent
6a3e5d74f0
Exists in
master
and in
6 other branches
德州电子健康卡
Showing 2 changed files with 20 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
View file @
0a7ea4f
| 1 | 1 | package com.lyms.platform.operate.web.facade; |
| 2 | 2 | |
| 3 | +import com.lyms.hospitalapi.dzfy.DzfyHisService; | |
| 3 | 4 | import com.lyms.platform.biz.dal.IFolicAcidDao; |
| 4 | 5 | import com.lyms.platform.biz.service.*; |
| 5 | 6 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
| ... | ... | @@ -82,8 +83,6 @@ |
| 82 | 83 | @Autowired |
| 83 | 84 | private AntenatalExaminationFacade antenatalExaminationFacade; |
| 84 | 85 | |
| 85 | - @Autowired | |
| 86 | - private ModularFunctionConfigService modularFunctionConfigServcie; | |
| 87 | 86 | |
| 88 | 87 | @Autowired |
| 89 | 88 | private AntenatalExaminationService antenatalExaminationService; |
| ... | ... | @@ -95,6 +94,9 @@ |
| 95 | 94 | @Autowired |
| 96 | 95 | private GuidelinesService guidelinesService; |
| 97 | 96 | |
| 97 | + @Autowired | |
| 98 | + private DzfyHisService dzfyHisService; | |
| 99 | + | |
| 98 | 100 | /** |
| 99 | 101 | * 组合查询请求 |
| 100 | 102 | * |
| ... | ... | @@ -271,6 +273,20 @@ |
| 271 | 273 | if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo())) { |
| 272 | 274 | patientsQuery.setQueryNo(antExManagerQueryRequest.getQueryNo()); |
| 273 | 275 | patientses = patientsService.queryPatient1(patientsQuery, "modpatientsQueryified"); |
| 276 | + | |
| 277 | + if (CollectionUtils.isEmpty(patientses)) | |
| 278 | + { | |
| 279 | + String hospitalId = autoMatchFacade.getHospitalId(userId); | |
| 280 | + if ("1000000114".equals(hospitalId)) { | |
| 281 | + List<String> list = dzfyHisService.getDzVcCardNos(antExManagerQueryRequest.getQueryNo()); | |
| 282 | + if (CollectionUtils.isNotEmpty(list)) | |
| 283 | + { | |
| 284 | + patientsQuery.setVcCardNos(list); | |
| 285 | + patientsQuery.setQueryNo(null); | |
| 286 | + patientses = patientsService.queryPatient1(patientsQuery, "modpatientsQueryified"); | |
| 287 | + } | |
| 288 | + } | |
| 289 | + } | |
| 274 | 290 | } |
| 275 | 291 | |
| 276 | 292 | AntExRecordQuery antExRecordQuery = complayRequest(userId, antExManagerQueryRequest, isRegion, isPage); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
0a7ea4f
| ... | ... | @@ -2700,7 +2700,7 @@ |
| 2700 | 2700 | |
| 2701 | 2701 | if (StringUtils.isNotEmpty(vcCardNo)) { |
| 2702 | 2702 | //德州市妇幼保健院医院通过（就诊卡号、银行卡号，社保卡号） 查询出对应的用过的卡号 add lqy |
| 2703 | - if ("1000000114".equals(hospitalId)) { | |
| 2703 | + if (CollectionUtils.isNotEmpty(hospitalId) && hospitalId.contains("1000000114")) { | |
| 2704 | 2704 | patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo)); |
| 2705 | 2705 | } else { |
| 2706 | 2706 | patientsQuery.setVcCardNo(vcCardNo); |
| ... | ... | @@ -2746,7 +2746,7 @@ |
| 2746 | 2746 | |
| 2747 | 2747 | if (StringUtils.isNotEmpty(vcCardNo)) { |
| 2748 | 2748 | //德州市妇幼保健院医院通过（就诊卡号、银行卡号，社保卡号） 查询出对应的用过的卡号 add lqy |
| 2749 | - if ("1000000114".equals(hospitalIds)) { | |
| 2749 | + if ("1000000114".equals(hospitalId)) { | |
| 2750 | 2750 | patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo)); |
| 2751 | 2751 | } else { |
| 2752 | 2752 | patientsQuery.setVcCardNo(vcCardNo); |