jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 45c0843264c0e8aa532a330ffcc09eaff3e77a26

Authored by liquanyu
1 parent 1795dae965
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update code

Showing 2 changed files with 6 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 45c0843
... ... @@ -653,10 +653,10 @@
653 653 List<Patients> list = patientsService.queryPatient(patientsQuery);
654 654 if (CollectionUtils.isNotEmpty(list)) {
655 655 HighScoreResult res = antenatalExaminationFacade.getPatLastRiskByDate(list.get(0).getPid(), false, list.get(0).getLastMenses(), model.getBirth());
656   - List<String> listHighRisk = res.getHighRisk();
  656 + List<Map> listHighRisk = res.getHighRisk();
657 657  
658 658 if (CollectionUtils.isNotEmpty(listHighRisk)) {
659   - if (listHighRisk.contains("健康")) {
  659 + if (listHighRisk.size() == 1 && listHighRisk.get(0).containsValue("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) {
660 660 base.setHighRisk("健康");
661 661 } else {
662 662 base.setHighRisk("高危");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 45c0843
... ... @@ -2639,10 +2639,10 @@
2639 2639 List<Patients> list = patientsService.queryPatient(patientsQuery);
2640 2640 if (CollectionUtils.isNotEmpty(list)) {
2641 2641 HighScoreResult res = antenatalExaminationFacade.getPatLastRiskByDate(list.get(0).getPid(), false, list.get(0).getLastMenses(), model.getBirth());
2642   - List<String> listHighRisk = res.getHighRisk();
  2642 + List<Map> listHighRisk = res.getHighRisk();
2643 2643  
2644 2644 if (CollectionUtils.isNotEmpty(listHighRisk)) {
2645   - if (listHighRisk.contains("健康")) {
  2645 + if (listHighRisk.size() == 1 && listHighRisk.get(0).containsValue("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) {
2646 2646 result.setMommyHighRiskReason("健康");
2647 2647 } else {
2648 2648 result.setMommyHighRiskReason("高危");
2649 2649  
... ... @@ -2788,10 +2788,10 @@
2788 2788 List<Patients> list = patientsService.queryPatient(patientsQuery);
2789 2789 if (CollectionUtils.isNotEmpty(list)) {
2790 2790 HighScoreResult res = antenatalExaminationFacade.getPatLastRiskByDate(list.get(0).getPid(), false, list.get(0).getLastMenses(), babyModel.getBirth());
2791   - List<String> listHighRisk = res.getHighRisk();
  2791 + List<Map> listHighRisk = res.getHighRisk();
2792 2792  
2793 2793 if (CollectionUtils.isNotEmpty(listHighRisk)) {
2794   - if (listHighRisk.contains("健康")) {
  2794 + if (listHighRisk.size() == 1 && listHighRisk.get(0).containsValue("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) {
2795 2795 model.setMommyHighRisk("健康");
2796 2796 } else {
2797 2797 model.setMommyHighRisk("高危");