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 4215bae..ae0e73a 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 @@ -4139,7 +4139,7 @@ public class AntenatalExaminationFacade { { AutoRiskRequest autoRiskRequest = new AutoRiskRequest(); autoRiskRequest.setParentId(pat.getId()); - List> riskList = autoRisk(autoRiskRequest, pat.getHospitalId()); + List> riskList = autoRisk(autoRiskRequest, pat.getHospitalId(),0); saveAutoRisk(riskList,null,pat.getHospitalId(),pat.getPid(),pat.getId(),0); } @@ -4158,7 +4158,7 @@ public class AntenatalExaminationFacade { org.springframework.beans.BeanUtils.copyProperties(antExcAddRequest, autoRiskRequest); String fid = antExcAddRequest.getId(); System.out.println("autoExcRisk fid = "+fid); - List> riskList = autoRisk(autoRiskRequest, pat.getHospitalId()); + List> riskList = autoRisk(autoRiskRequest, pat.getHospitalId(),1); saveAutoRisk(riskList,fid,pat.getHospitalId(),pat.getPid(),pat.getId(),1); } }); @@ -4191,7 +4191,7 @@ public class AntenatalExaminationFacade { String fid = antExAddRequest.getId(); System.out.println("autoExRisk fid = "+fid); - List> riskList = autoRisk(autoRiskRequest, pat.getHospitalId()); + List> riskList = autoRisk(autoRiskRequest, pat.getHospitalId(),2); saveAutoRisk(riskList,fid,pat.getHospitalId(),pat.getPid(),pat.getId(),2); } }); @@ -4260,7 +4260,7 @@ public class AntenatalExaminationFacade { */ public BaseResponse getAntexExRisk(AutoRiskRequest antExcAddRequest, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); - List> riskList = autoRisk(antExcAddRequest,hospitalId); + List> riskList = autoRisk(antExcAddRequest,hospitalId,1); return new BaseObjectResponse().setData(riskList).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @@ -4271,7 +4271,7 @@ public class AntenatalExaminationFacade { * @param hospitalId * @return */ - private List> autoRisk(AutoRiskRequest antExcAddRequest,String hospitalId) + private List> autoRisk(AutoRiskRequest antExcAddRequest,String hospitalId,Integer type) { Set list = new HashSet<>(); @@ -4299,7 +4299,7 @@ public class AntenatalExaminationFacade { Map> mapItems = getRiskConfig(configModels); System.out.println("mapItems"+mapItems); if (mapItems != null && mapItems.size() > 0) { - if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.age.getId())) { + if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.age.getId()) && type == 0) { Patients patients = patientsService.findOnePatientById(antExcAddRequest.getParentId()); if (patients != null && patients.getBirth() != null) { String age = String.valueOf(DateUtil.getAge(patients.getBirth(), new Date()));