Commit 79fa440b2f127c47d1b1cb09c168dbab8e20c2f4
Exists in
master
and in
8 other branches
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
79fa440
| ... | ... | @@ -92,6 +92,16 @@ |
| 92 | 92 | BabyModelQuery babyQuery = new BabyModelQuery(); |
| 93 | 93 | babyQuery.setId(babyId); |
| 94 | 94 | babyQuery.setYn(YnEnums.YES.getId()); |
| 95 | + | |
| 96 | + //查询建档记录 得到pid 通过pid查询所有的儿童建档记录 | |
| 97 | + List<BabyModel> builds = babyBookbuildingService.queryBabyBuildByCond(babyQuery); | |
| 98 | + if (CollectionUtils.isNotEmpty(builds)) | |
| 99 | + { | |
| 100 | + babyQuery.setId(null); | |
| 101 | + babyQuery.setPid(builds.get(0).getPid()); | |
| 102 | + } | |
| 103 | + | |
| 104 | + | |
| 95 | 105 | List<Map<String, String>> list = new ArrayList<>(); |
| 96 | 106 | //查询建档记录 |
| 97 | 107 | List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); |
| ... | ... | @@ -118,7 +128,13 @@ |
| 118 | 128 | } |
| 119 | 129 | //查询儿童的基本信息 |
| 120 | 130 | BabyModel model = babyCheckFacade.getBabyModel(babyId, base); |
| 121 | - babyCheckFacade.getBabyCheckList(babyId, model, list); | |
| 131 | + | |
| 132 | + if(CollectionUtils.isNotEmpty(models)){ | |
| 133 | + for(BabyModel babyModel:models){ | |
| 134 | + babyCheckFacade.getBabyCheckList(babyModel.getId(), babyModel, list); | |
| 135 | + } | |
| 136 | + } | |
| 137 | + | |
| 122 | 138 | resMap.put("baseInfo", base); |
| 123 | 139 | resMap.put("checkList", list); |
| 124 | 140 | br.setData(resMap); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
79fa440
| ... | ... | @@ -255,6 +255,15 @@ |
| 255 | 255 | checkRecord.put("monthAge", monthAge); |
| 256 | 256 | checkRecord.put("buildId", cmodel.getBuildId()); |
| 257 | 257 | checkRecord.put("type","2"); |
| 258 | + | |
| 259 | + checkRecord.put("hospitalId",model.getHospitalId()); | |
| 260 | + //查询建档医院 | |
| 261 | + Organization org = organizationService.getOrganization(Integer.valueOf(model.getHospitalId())); | |
| 262 | + if (org != null) { | |
| 263 | + checkRecord.put("hospitalName", org.getName()); | |
| 264 | + } else { | |
| 265 | + checkRecord.put("hospitalName", ""); | |
| 266 | + } | |
| 258 | 267 | list.add(checkRecord); |
| 259 | 268 | } |
| 260 | 269 | } |
| ... | ... | @@ -304,60 +313,6 @@ |
| 304 | 313 | //母亲是否高危 |
| 305 | 314 | if (!StringUtils.isEmpty(model.getMcertNo())) |
| 306 | 315 | { |
| 307 | -// PatientsQuery patientsQuery = new PatientsQuery(); | |
| 308 | -// patientsQuery.setCardNo(model.getMcertNo()); | |
| 309 | -// patientsQuery.setYn(YnEnums.YES.getId()); | |
| 310 | -// | |
| 311 | -// | |
| 312 | -// List listHighRisk = new ArrayList(); | |
| 313 | -// List<Patients> list = patientsService.queryPatient(patientsQuery); | |
| 314 | -// Patients patients = null; | |
| 315 | -// if (CollectionUtils.isNotEmpty(list)) { | |
| 316 | -// patients = list.get(0); | |
| 317 | -// base.setCardNo(patients.getCardNo()); | |
| 318 | -// base.setVcCardNo(patients.getVcCardNo()); | |
| 319 | -// AntExChuQuery antExChuQuery=new AntExChuQuery(); | |
| 320 | -// antExChuQuery.setParentId(patients.getId()); | |
| 321 | -// antExChuQuery.setYn(YnEnums.YES.getId()); | |
| 322 | -// //查询产前检查记录 | |
| 323 | -// List checkList = antenatalExaminationService.findAllByParentId(patients.getId()); | |
| 324 | -// | |
| 325 | -// String highRisk = ""; | |
| 326 | -// if (CollectionUtils.isNotEmpty(checkList)) | |
| 327 | -// { | |
| 328 | -// AntenatalExaminationModel m = (AntenatalExaminationModel)checkList.get(0); | |
| 329 | -// highRisk = m.getRiskFactor(); | |
| 330 | -// } | |
| 331 | -// else | |
| 332 | -// { | |
| 333 | -// | |
| 334 | -// //获取初诊记录 | |
| 335 | -// List<AntExChuModel> antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery); | |
| 336 | -// AntExChuModel antExChuModel=null; | |
| 337 | -// if(CollectionUtils.isNotEmpty(antExChulist)){ | |
| 338 | -// antExChuModel= antExChulist.get(0); | |
| 339 | -// } | |
| 340 | -// if (antExChuModel != null) | |
| 341 | -// { | |
| 342 | -// highRisk = antExChuModel.getHighrisk(); | |
| 343 | -// } | |
| 344 | -// | |
| 345 | -// } | |
| 346 | -// | |
| 347 | -// if (!StringUtils.isEmpty(highRisk)) | |
| 348 | -// { | |
| 349 | -// listHighRisk = JsonUtil.toList(highRisk, List.class); | |
| 350 | -// } | |
| 351 | - | |
| 352 | -// if (CollectionUtils.isNotEmpty(listHighRisk)) | |
| 353 | -// { | |
| 354 | -// base.setHighRisk("高危"); | |
| 355 | -// } | |
| 356 | -// else | |
| 357 | -// { | |
| 358 | -// base.setHighRisk("健康"); | |
| 359 | -// } | |
| 360 | - | |
| 361 | 316 | |
| 362 | 317 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 363 | 318 | patientsQuery.setCardNo(model.getMcertNo()); |