Commit 2eb3e699392db4f5dc0bf687165beee0e61a4b14

Authored by jiangjiazhi

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 2eb3e69
... ... @@ -354,9 +354,16 @@
354 354 // }
355 355  
356 356  
357   - HighScoreResult res = antenatalExaminationFacade.findLastRisk(model.getPid(),false);
358   - List<String> listHighRisk = res.getHighRisk();
  357 + PatientsQuery patientsQuery = new PatientsQuery();
  358 + patientsQuery.setCardNo(model.getMcertNo());
  359 + patientsQuery.setYn(YnEnums.YES.getId());
359 360  
  361 + List<Patients> list = patientsService.queryPatient(patientsQuery);
  362 + if (CollectionUtils.isNotEmpty(list))
  363 + {
  364 + HighScoreResult res = antenatalExaminationFacade.findLastRisk(list.get(0).getPid(),false);
  365 + List<String> listHighRisk = res.getHighRisk();
  366 +
360 367 if (CollectionUtils.isNotEmpty(listHighRisk))
361 368 {
362 369 if (listHighRisk.contains("健康"))
363 370  
... ... @@ -372,8 +379,9 @@
372 379 {
373 380 base.setHighRisk("健康");
374 381 }
375   - }
  382 + }
376 383  
  384 + }
377 385  
378 386 base.setMremark(model.getMremark());
379 387 base.setMphone(model.getMphone());