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 820c8d5..ba6778c 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 @@ -3497,6 +3497,7 @@ public class AntenatalExaminationFacade { */ public Patients findOnePatient(String cardNo, String vcCardNo, String id, List hospitalId, Integer type, boolean outHospital, String pid, boolean isEnable) { + //queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1 PatientsQuery patientsQuery = new PatientsQuery(); if (StringUtils.isNotEmpty(cardNo)) { patientsQuery.setCardNo(cardNo); @@ -3506,15 +3507,18 @@ public class AntenatalExaminationFacade { patientsQuery.setPid(pid); } - if (StringUtils.isNotEmpty(vcCardNo)) { - //德州市妇幼保健院医院通过(就诊卡号、银行卡号,社保卡号) 查询出对应的用过的卡号 add lqy - if (CollectionUtils.isNotEmpty(hospitalId) && hospitalId.contains("1000000114")) { - patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo)); - } else { - patientsQuery.setVcCardNo(vcCardNo); + if (StringUtils.isNotEmpty(cardNo)) { + if (StringUtils.isNotEmpty(vcCardNo)) { + //德州市妇幼保健院医院通过(就诊卡号、银行卡号,社保卡号) 查询出对应的用过的卡号 add lqy + if (CollectionUtils.isNotEmpty(hospitalId) && hospitalId.contains("1000000114")) { + patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo)); + } else { + patientsQuery.setVcCardNo(vcCardNo); + } } } + patientsQuery.setType(type); patientsQuery.setHospitalList(hospitalId); patientsQuery.setYn(YnEnums.YES.getId()); @@ -3742,13 +3746,14 @@ public class AntenatalExaminationFacade { e.printStackTrace(); } - } else { - //原来单机 - if (null != patients) { - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇在系统中已分娩/已终止妊娠不能再进行产检,请重新建档"); - } - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇还未在本院建档不能进行产检"); } +// else { +// //原来单机 +// if (null != patients) { +// return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇在系统中已分娩/已终止妊娠不能再进行产检,请重新建档"); +// } +// return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇还未在本院建档不能进行产检"); +// } } }