Commit 19eb251eee00b9e0c3c9ed04c21628de50e8ebd4
1 parent
84d7b494c5
Exists in
master
and in
6 other branches
update code
Showing 1 changed file with 6 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
19eb251
| ... | ... | @@ -4139,7 +4139,7 @@ |
| 4139 | 4139 | { |
| 4140 | 4140 | AutoRiskRequest autoRiskRequest = new AutoRiskRequest(); |
| 4141 | 4141 | autoRiskRequest.setParentId(pat.getId()); |
| 4142 | - List<Map<String, String>> riskList = autoRisk(autoRiskRequest, pat.getHospitalId()); | |
| 4142 | + List<Map<String, String>> riskList = autoRisk(autoRiskRequest, pat.getHospitalId(),0); | |
| 4143 | 4143 | saveAutoRisk(riskList,null,pat.getHospitalId(),pat.getPid(),pat.getId(),0); |
| 4144 | 4144 | } |
| 4145 | 4145 | |
| ... | ... | @@ -4158,7 +4158,7 @@ |
| 4158 | 4158 | org.springframework.beans.BeanUtils.copyProperties(antExcAddRequest, autoRiskRequest); |
| 4159 | 4159 | String fid = antExcAddRequest.getId(); |
| 4160 | 4160 | System.out.println("autoExcRisk fid = "+fid); |
| 4161 | - List<Map<String, String>> riskList = autoRisk(autoRiskRequest, pat.getHospitalId()); | |
| 4161 | + List<Map<String, String>> riskList = autoRisk(autoRiskRequest, pat.getHospitalId(),1); | |
| 4162 | 4162 | saveAutoRisk(riskList,fid,pat.getHospitalId(),pat.getPid(),pat.getId(),1); |
| 4163 | 4163 | } |
| 4164 | 4164 | }); |
| ... | ... | @@ -4191,7 +4191,7 @@ |
| 4191 | 4191 | |
| 4192 | 4192 | String fid = antExAddRequest.getId(); |
| 4193 | 4193 | System.out.println("autoExRisk fid = "+fid); |
| 4194 | - List<Map<String, String>> riskList = autoRisk(autoRiskRequest, pat.getHospitalId()); | |
| 4194 | + List<Map<String, String>> riskList = autoRisk(autoRiskRequest, pat.getHospitalId(),2); | |
| 4195 | 4195 | saveAutoRisk(riskList,fid,pat.getHospitalId(),pat.getPid(),pat.getId(),2); |
| 4196 | 4196 | } |
| 4197 | 4197 | }); |
| ... | ... | @@ -4260,7 +4260,7 @@ |
| 4260 | 4260 | */ |
| 4261 | 4261 | public BaseResponse getAntexExRisk(AutoRiskRequest antExcAddRequest, Integer userId) { |
| 4262 | 4262 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
| 4263 | - List<Map<String, String>> riskList = autoRisk(antExcAddRequest,hospitalId); | |
| 4263 | + List<Map<String, String>> riskList = autoRisk(antExcAddRequest,hospitalId,1); | |
| 4264 | 4264 | |
| 4265 | 4265 | return new BaseObjectResponse().setData(riskList).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); |
| 4266 | 4266 | } |
| ... | ... | @@ -4271,7 +4271,7 @@ |
| 4271 | 4271 | * @param hospitalId |
| 4272 | 4272 | * @return |
| 4273 | 4273 | */ |
| 4274 | - private List<Map<String, String>> autoRisk(AutoRiskRequest antExcAddRequest,String hospitalId) | |
| 4274 | + private List<Map<String, String>> autoRisk(AutoRiskRequest antExcAddRequest,String hospitalId,Integer type) | |
| 4275 | 4275 | { |
| 4276 | 4276 | Set<String> list = new HashSet<>(); |
| 4277 | 4277 | |
| ... | ... | @@ -4299,7 +4299,7 @@ |
| 4299 | 4299 | Map<Integer, List<DiagnoseItemModel>> mapItems = getRiskConfig(configModels); |
| 4300 | 4300 | System.out.println("mapItems"+mapItems); |
| 4301 | 4301 | if (mapItems != null && mapItems.size() > 0) { |
| 4302 | - if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.age.getId())) { | |
| 4302 | + if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.age.getId()) && type == 0) { | |
| 4303 | 4303 | Patients patients = patientsService.findOnePatientById(antExcAddRequest.getParentId()); |
| 4304 | 4304 | if (patients != null && patients.getBirth() != null) { |
| 4305 | 4305 | String age = String.valueOf(DateUtil.getAge(patients.getBirth(), new Date())); |