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 2e65ff6..2f76c7e 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 @@ -4261,6 +4261,16 @@ public class AntenatalExaminationFacade { } catch (Exception e) { e.printStackTrace(); } + + try { + if (StringUtils.isNotEmpty(antExChuModel.getSecondaryDiagnosisId())) { + List list = JsonUtil.toList(antExChuModel.getSecondaryDiagnosisId(), List.class); + antexChuResult.setSecondaryDiagnosisId(queryRisk(list, false).getHighRisk()); + } + } catch (Exception e) { + } + + String doctorId = antExChuModel.getProdDoctor(); Map map1 = new HashMap <>(); if (StringUtils.isNotEmpty(doctorId)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java index e0f2e23..5e14c1a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java @@ -26,14 +26,24 @@ public class AntexChuResult { //该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项 private String lisCheckItems; private String vcCardNo; + //次要诊断手入 + private String secondaryDiagnosis; - private String secondaryDiagnosisId; - public String getSecondaryDiagnosisId() { + public String getSecondaryDiagnosis() { + return secondaryDiagnosis; + } + + public void setSecondaryDiagnosis(String secondaryDiagnosis) { + this.secondaryDiagnosis = secondaryDiagnosis; + } + private List secondaryDiagnosisId; + + public List getSecondaryDiagnosisId() { return secondaryDiagnosisId; } - public void setSecondaryDiagnosisId(String secondaryDiagnosisId) { + public void setSecondaryDiagnosisId(List secondaryDiagnosisId) { this.secondaryDiagnosisId = secondaryDiagnosisId; } @@ -1972,7 +1982,7 @@ public class AntexChuResult { } public AntexChuResult convertToResult(AntExChuModel antExChuModel) { if (null != antExChuModel) { - setSecondaryDiagnosisId(antExChuModel.getSecondaryDiagnosisId()); + setSecondaryDiagnosis(antExChuModel.getSecondaryDiagnosis()); setZyzlState(antExChuModel.getZyzlState()); if("no".equals(antExChuModel.getZyzlState())){ setZyzlContent(null);