jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 4c878850407ae3624e27c4e186356cd18d672734

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

儿童列表高危儿

Showing 2 changed files with 4 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 4c87885
... ... @@ -1666,7 +1666,8 @@
1666 1666 List listData = new ArrayList();
1667 1667 Patients patients = iterator.next();
1668 1668 Patients patients2 = null;
1669   -
  1669 + //获取产程ID
  1670 + patientId = patients.getId();
1670 1671 List<String> patientIds = new ArrayList<>();
1671 1672 patientIds.add(patientId);
1672 1673  
... ... @@ -1674,8 +1675,7 @@
1674 1675 if (null != patients.getHospitalId()) {
1675 1676 organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId()));
1676 1677 }
1677   - //获取产程ID
1678   - patientId = patients.getId();
  1678 +
1679 1679 if (patients.getBuildType() == 3) {//转诊建档，数据则装入主档案数据中,必须要有主档案，而且是第一条
1680 1680 if (CollectionUtils.isNotEmpty(sortList)) {
1681 1681 listData = sortList.get(sortList.size() - 1);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java View file @ 4c87885
... ... @@ -62,7 +62,7 @@
62 62 for (BabyModel model : models) {
63 63 BabyManageListResult result = new BabyManageListResult();
64 64 result.setId(model.getId());
65   - if (model.getLastHighRisk() == null || model.getLastHighRisk() == 0) {
  65 + if (model.getHighRisk() == null || model.getHighRisk() == 0) {
66 66 result.setHighRisk("健康");
67 67 } else {
68 68 result.setHighRisk("高危");