Commit f620d63a0d075265a7bc35f4a86515a07b812cbc
1 parent
7258c971c8
Exists in
master
and in
2 other branches
档案查询增加手机号判断；南和导出手机号不加密
Showing 2 changed files with 18 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
f620d63
| ... | ... | @@ -3575,13 +3575,19 @@ |
| 3575 | 3575 | if (StringUtils.isNotEmpty(id)) { |
| 3576 | 3576 | patientsQuery.setId(id); |
| 3577 | 3577 | }else if (StringUtils.isNotEmpty(cardNo)) { |
| 3578 | - patientsQuery.setCardNo(cardNo); | |
| 3578 | + //如果查询是卡号11位数且1开头，认为是手机号码 cfl 20231128 | |
| 3579 | + if(cardNo.length() == 11 && cardNo.startsWith("1")){ | |
| 3580 | + patientsQuery.setPhone(cardNo); | |
| 3581 | + }else{ | |
| 3582 | + patientsQuery.setCardNo(cardNo); | |
| 3583 | + } | |
| 3584 | + | |
| 3579 | 3585 | } else if (StringUtils.isNotEmpty(pid)) { |
| 3580 | 3586 | patientsQuery.setPid(pid); |
| 3581 | 3587 | } |
| 3582 | 3588 | |
| 3583 | 3589 | //id 和卡号都为空，才有可能使用就诊卡号查询 cfl 20230927 |
| 3584 | - if (StringUtils.isNotEmpty(id) && StringUtils.isEmpty(cardNo)) { | |
| 3590 | + if (StringUtils.isEmpty(id) && StringUtils.isEmpty(cardNo)) { | |
| 3585 | 3591 | if (StringUtils.isNotEmpty(vcCardNo)) { |
| 3586 | 3592 | //德州市妇幼保健院医院通过（就诊卡号、银行卡号，社保卡号） 查询出对应的用过的卡号 add lqy |
| 3587 | 3593 | if (CollectionUtils.isNotEmpty(hospitalId) && hospitalId.contains("1000000114")) { |
| ... | ... | @@ -3632,7 +3638,14 @@ |
| 3632 | 3638 | type, boolean outHospital, boolean isEnable, String hospitalId) { |
| 3633 | 3639 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 3634 | 3640 | if (StringUtils.isNotEmpty(cardNo)) { |
| 3635 | - patientsQuery.setCardNo(cardNo); | |
| 3641 | + | |
| 3642 | + //如果查询是卡号11位数且1开头，认为是手机号码 cfl 20231128 | |
| 3643 | + if(cardNo.length() == 11 && cardNo.startsWith("1") ){ | |
| 3644 | + patientsQuery.setPhone(cardNo); | |
| 3645 | + }else{ | |
| 3646 | + patientsQuery.setCardNo(cardNo); | |
| 3647 | + } | |
| 3648 | + | |
| 3636 | 3649 | } |
| 3637 | 3650 | |
| 3638 | 3651 | if (StringUtils.isNotEmpty(vcCardNo) && StringUtils.isEmpty(cardNo)) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
f620d63
| ... | ... | @@ -1956,8 +1956,8 @@ |
| 1956 | 1956 | ExceptionUtils.catchException(e, "convertToHighRisk get result Future error."); |
| 1957 | 1957 | } |
| 1958 | 1958 | } |
| 1959 | - //手机号已经加密，页面显示的是这个字段 | |
| 1960 | - if(CollectionUtils.isNotEmpty(data)){ | |
| 1959 | + //手机号已经加密，页面显示的是这个字段 南和区人民医院不加密 | |
| 1960 | + if(CollectionUtils.isNotEmpty(data) && !"1000000115".equals(hospital)){ | |
| 1961 | 1961 | for(RiskPatientsResult result: data){ |
| 1962 | 1962 | result.setRealPhone(StringUtils.encryPhone(result.getRealPhone())); |
| 1963 | 1963 | } |