From c00a1370de6c031b025b2e00dd697420bcbfb331 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 11 Apr 2018 15:04:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=8D=B1=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/facade/AntenatalExaminationFacade.java | 4 ++-- .../com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) 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 3c886e7..36d1207 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 @@ -3352,7 +3352,7 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(items)) { //乙肝e抗体——阳性（+） for (DiagnoseItemModel item : items) { - if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.YGEKY.getId()).equals(item.getValueOne()) + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.YGEKT.getId()).equals(item.getValueOne()) && CollectionUtils.isNotEmpty(item.getRiskIds())) { list.addAll(item.getRiskIds()); } @@ -3738,7 +3738,7 @@ public class AntenatalExaminationFacade { for (String key : selecteds) { BasicConfig config = basicConfigService.getOneBasicConfigById(key); if (config != null && StringUtils.isNotEmpty(config.getName())) { - Integer cid = DiagnoseEnums.JwsChildEnums.getIdByParentName(DiagnoseEnums.DiagnoseDetailItemEnums.JWSXHXTL.getTitle(), config.getName()); + Integer cid = DiagnoseEnums.JwsChildEnums.getIdByParentName(bc.getName(), config.getName()); if (cid != null) { for (DiagnoseItemModel item : items) { if (String.valueOf(cid).equals(item.getValueTwo()) && diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index e852746..4bcea51 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -479,13 +479,10 @@ public class PremaritalCheckupFacade { public BaseObjectResponse addPremaritalCheckup(PremaritalCheckupAddRequest addRequest,Integer userId){ String id = null; - ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); archiveQuery.setYn(YnEnums.YES.getId()); archiveQuery.setHospitalId(addRequest.getHospitalId()); - //证件类型和证件号不为空 StringUtils.isNotEmpty(addRequest.getCertificateTypeId()) && if (StringUtils.isNotEmpty(addRequest.getCertificateNum())){ -// archiveQuery.setCertificateTypeId(addRequest.getCertificateTypeId()); archiveQuery.setCertificateNum(addRequest.getCertificateNum()); }else if (StringUtils.isNotEmpty(addRequest.getVcCardNo())){ //就诊卡不为空 -- 1.8.3.1