diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index b23e36e..dc42c5e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -149,7 +149,6 @@ public class AntenatalExaminationFacade { */ public HighScoreResult findLastRisk(String parentId) { List list = antenatalExaminationService.findAllByParentId(parentId); - List result = new ArrayList(); AntenatalExaminationModel model = null; if (CollectionUtils.isNotEmpty(list)) { model = list.get(0); @@ -160,7 +159,6 @@ public class AntenatalExaminationFacade { if (null != model && StringUtils.isNotEmpty(model.getRiskFactor()) && !"{}".equals(model.getRiskFactor())) { List list1 = JsonUtil.toList(model.getRiskFactor(), List.class); highScoreResult = queryRisk(list1); - result.addAll(highScoreResult.getHighRisk()); } if (null != model &&!"{}".equals(model.getOtherRisk())) { Map map = JsonUtil.str2Obj(model.getOtherRisk(), Map.class); @@ -169,7 +167,7 @@ public class AntenatalExaminationFacade { Map map1 = new HashMap(); map1.put("id", ""); map1.put("name", map.get("fxysu")); - result.add(map1); + highScoreResult.getHighRisk().add(map1); //风险评分 Object idObj = map.get("fxpf"); if (null != idObj) { @@ -196,7 +194,7 @@ public class AntenatalExaminationFacade { Map map1 = new HashMap(); map1.put("id", ""); map1.put("name", map.get("fxysu")); - result.add(map1); + highScoreResult.getHighRisk().add(map1); //风险评分 Object idObj = map.get("fxpf"); if (null != idObj) { @@ -451,13 +449,13 @@ public class AntenatalExaminationFacade { antExChuQuery.setYn(YnEnums.YES.getId()); //获取初诊记录 List antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery); - AntExChuModel antExChuModel = null; + /* AntExChuModel antExChuModel = null; if (CollectionUtils.isNotEmpty(antExChulist)) { antExChuModel = antExChulist.get(0); - } - HighScoreResult highScoreResult = findLastRisk(patients1.getId()); + }*/ + HighScoreResult highScoreResult = findLastRisk(patients.getId()); //查询产前检查记录 - List list = antenatalExaminationService.findAllByParentId(patients1.getId()); + List list = antenatalExaminationService.findAllByParentId(patients.getId()); /* List data = new ArrayList(); if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getHighrisk())) { List l = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); @@ -476,7 +474,7 @@ public class AntenatalExaminationFacade { antexListResult.convertToResult(list, patients, antExChulist); - antexListResult.setIsSieve(cap(patients.getLastMenses(), patients1.getId())); + antexListResult.setIsSieve(cap(patients.getLastMenses(), patients.getId())); antexListResult.setRiskFactor(highScoreResult.getHighRisk()); antexListResult.setRiskScore(highScoreResult.getScore()+""); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 1a44e89..9d7eb5f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -148,6 +148,7 @@ public class MatDeliverFacade { babyModel.setMphone(patients.getPhone()); babyModel.setMbirth(patients.getBirth()); babyModel.setMcertNo(patients.getCardNo()); + babyModel.setMcertTypeId(patients.getPcerteTypeId()); //父亲信息 babyModel.setFjob(patients.getHworkUnit()); babyModel.setFname(patients.getHusbandName());