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 2fc5a1f..b530379 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 @@ -3575,13 +3575,19 @@ public class AntenatalExaminationFacade { if (StringUtils.isNotEmpty(id)) { patientsQuery.setId(id); }else if (StringUtils.isNotEmpty(cardNo)) { - patientsQuery.setCardNo(cardNo); + //如果查询是卡号11位数且1开头,认为是手机号码 cfl 20231128 + if(cardNo.length() == 11 && cardNo.startsWith("1")){ + patientsQuery.setPhone(cardNo); + }else{ + patientsQuery.setCardNo(cardNo); + } + } else if (StringUtils.isNotEmpty(pid)) { patientsQuery.setPid(pid); } //id 和卡号都为空,才有可能使用就诊卡号查询 cfl 20230927 - if (StringUtils.isNotEmpty(id) && StringUtils.isEmpty(cardNo)) { + if (StringUtils.isEmpty(id) && StringUtils.isEmpty(cardNo)) { if (StringUtils.isNotEmpty(vcCardNo)) { //德州市妇幼保健院医院通过(就诊卡号、银行卡号,社保卡号) 查询出对应的用过的卡号 add lqy if (CollectionUtils.isNotEmpty(hospitalId) && hospitalId.contains("1000000114")) { @@ -3632,7 +3638,14 @@ public class AntenatalExaminationFacade { type, boolean outHospital, boolean isEnable, String hospitalId) { PatientsQuery patientsQuery = new PatientsQuery(); if (StringUtils.isNotEmpty(cardNo)) { - patientsQuery.setCardNo(cardNo); + + //如果查询是卡号11位数且1开头,认为是手机号码 cfl 20231128 + if(cardNo.length() == 11 && cardNo.startsWith("1") ){ + patientsQuery.setPhone(cardNo); + }else{ + patientsQuery.setCardNo(cardNo); + } + } if (StringUtils.isNotEmpty(vcCardNo) && StringUtils.isEmpty(cardNo)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 15f56e9..8e7d207 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -1956,8 +1956,8 @@ public class PatientFacade extends BaseServiceImpl { ExceptionUtils.catchException(e, "convertToHighRisk get result Future error."); } } - //手机号已经加密,页面显示的是这个字段 - if(CollectionUtils.isNotEmpty(data)){ + //手机号已经加密,页面显示的是这个字段 南和区人民医院不加密 + if(CollectionUtils.isNotEmpty(data) && !"1000000115".equals(hospital)){ for(RiskPatientsResult result: data){ result.setRealPhone(StringUtils.encryPhone(result.getRealPhone())); }