Commit c00a1370de6c031b025b2e00dd697420bcbfb331
1 parent
4694396e5c
Exists in
master
and in
6 other branches
高危匹配
Showing 2 changed files with 2 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
c00a137
| ... | ... | @@ -3352,7 +3352,7 @@ |
| 3352 | 3352 | if (CollectionUtils.isNotEmpty(items)) { |
| 3353 | 3353 | //乙肝e抗体——阳性（+） |
| 3354 | 3354 | for (DiagnoseItemModel item : items) { |
| 3355 | - if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.YGEKY.getId()).equals(item.getValueOne()) | |
| 3355 | + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.YGEKT.getId()).equals(item.getValueOne()) | |
| 3356 | 3356 | && CollectionUtils.isNotEmpty(item.getRiskIds())) { |
| 3357 | 3357 | list.addAll(item.getRiskIds()); |
| 3358 | 3358 | } |
| ... | ... | @@ -3738,7 +3738,7 @@ |
| 3738 | 3738 | for (String key : selecteds) { |
| 3739 | 3739 | BasicConfig config = basicConfigService.getOneBasicConfigById(key); |
| 3740 | 3740 | if (config != null && StringUtils.isNotEmpty(config.getName())) { |
| 3741 | - Integer cid = DiagnoseEnums.JwsChildEnums.getIdByParentName(DiagnoseEnums.DiagnoseDetailItemEnums.JWSXHXTL.getTitle(), config.getName()); | |
| 3741 | + Integer cid = DiagnoseEnums.JwsChildEnums.getIdByParentName(bc.getName(), config.getName()); | |
| 3742 | 3742 | if (cid != null) { |
| 3743 | 3743 | for (DiagnoseItemModel item : items) { |
| 3744 | 3744 | if (String.valueOf(cid).equals(item.getValueTwo()) && |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
View file @
c00a137
| ... | ... | @@ -479,13 +479,10 @@ |
| 479 | 479 | public BaseObjectResponse addPremaritalCheckup(PremaritalCheckupAddRequest addRequest,Integer userId){ |
| 480 | 480 | |
| 481 | 481 | String id = null; |
| 482 | - | |
| 483 | 482 | ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); |
| 484 | 483 | archiveQuery.setYn(YnEnums.YES.getId()); |
| 485 | 484 | archiveQuery.setHospitalId(addRequest.getHospitalId()); |
| 486 | - //证件类型和证件号不为空 StringUtils.isNotEmpty(addRequest.getCertificateTypeId()) && | |
| 487 | 485 | if (StringUtils.isNotEmpty(addRequest.getCertificateNum())){ |
| 488 | -// archiveQuery.setCertificateTypeId(addRequest.getCertificateTypeId()); | |
| 489 | 486 | archiveQuery.setCertificateNum(addRequest.getCertificateNum()); |
| 490 | 487 | }else if (StringUtils.isNotEmpty(addRequest.getVcCardNo())){ |
| 491 | 488 | //就诊卡不为空 |