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 ab5f909..a38cd61 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 @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.facade; +import com.lyms.hospitalapi.dzfy.DzfyHisService; import com.lyms.platform.biz.SequenceConstant; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; @@ -94,6 +95,9 @@ public class AntenatalExaminationFacade { @Autowired private OperateLogFacade operateLogFacade; + @Autowired + private DzfyHisService dzfyHisService; + /** * 处理区域隐藏建档 * @@ -1841,7 +1845,15 @@ public class AntenatalExaminationFacade { if (StringUtils.isNotEmpty(cardNo)) { patientsQuery.setCardNo(cardNo); } else if (StringUtils.isNotEmpty(vcCardNo)) { - patientsQuery.setVcCardNo(vcCardNo); + //德州市妇幼保健院医院通过(就诊卡号、银行卡号,社保卡号) 查询出对应的用过的卡号 add lqy + if ("1000000114".equals(hospitalId)) + { + patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo)); + } + else + { + patientsQuery.setVcCardNo(vcCardNo); + } } else if (StringUtils.isNotEmpty(id)) { patientsQuery.setId(id); } else if (StringUtils.isNotEmpty(pid)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java index 786c142..846fd06 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.facade; +import com.lyms.hospitalapi.dzfy.DzfyHisService; import com.lyms.platform.biz.service.BabyService; import com.lyms.platform.biz.service.DischargeAbstractBabyService; import com.lyms.platform.biz.service.DischargeAbstractMotherService; @@ -61,6 +62,10 @@ public class DischargeAbstractFacade { private BabyService babyService; @Autowired + private DzfyHisService dzfyHisService; + + + @Autowired private AntenatalExaminationFacade antenatalExaminationFacade; @Autowired @@ -157,6 +162,15 @@ public class DischargeAbstractFacade { DischargeAbstractQueryResult dischargeAbstractQueryResult = new DischargeAbstractQueryResult(); dischargeAbstractQueryResult.setErrorcode(ErrorCodeConstants.SUCCESS); + String hospitalId; + try { + hospitalId = autoMatchFacade.getHospitalId(dischargeAbstractSaveRequest.getOperatorId()); + } catch (Exception e) { + dischargeAbstractQueryResult.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); + dischargeAbstractQueryResult.setErrormsg("获取获取当前医院异常"); + return dischargeAbstractQueryResult; + } + PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); List typeList = new ArrayList<>(); @@ -166,7 +180,20 @@ public class DischargeAbstractFacade { // patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(dischargeAbstractSaveRequest.getOperatorId())); patientsQuery.setTypeList(typeList); patientsQuery.setCardNo(StringUtils.isEmpty(dischargeAbstractSaveRequest.getCardNo()) ? null : dischargeAbstractSaveRequest.getCardNo()); - patientsQuery.setVcCardNo(StringUtils.isEmpty(dischargeAbstractSaveRequest.getVcCardNo()) ? null : dischargeAbstractSaveRequest.getVcCardNo()); + + //德州市妇幼保健院医院通过(就诊卡号、银行卡号,社保卡号) 查询出对应的用过的卡号 add lqy + if ("1000000114".equals(hospitalId)) + { + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(dischargeAbstractSaveRequest.getVcCardNo())) + { + patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(dischargeAbstractSaveRequest.getVcCardNo())); + } + } + else + { + patientsQuery.setVcCardNo(StringUtils.isEmpty(dischargeAbstractSaveRequest.getVcCardNo()) ? null : dischargeAbstractSaveRequest.getVcCardNo()); + } + List patientsList = patientsService.queryPatient(patientsQuery); if (patientsList == null || patientsList.size() == 0) { dischargeAbstractQueryResult.setStatus("0"); @@ -203,14 +230,7 @@ public class DischargeAbstractFacade { return dischargeAbstractQueryResult; } - String hospitalId; - try { - hospitalId = autoMatchFacade.getHospitalId(dischargeAbstractSaveRequest.getOperatorId()); - } catch (Exception e) { - dischargeAbstractQueryResult.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); - dischargeAbstractQueryResult.setErrormsg("获取获取当前医院异常"); - return dischargeAbstractQueryResult; - } + if (!hospitalId.equals(patients.getFmHospital())) { dischargeAbstractQueryResult.setStatus("6");