diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java index dbc4f06..aade684 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java @@ -6,6 +6,7 @@ import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -56,7 +57,15 @@ public class DiagnosisModel extends BaseModel { private Date diaDate;//诊断时间 private String diaHospital;//诊断单位 private String inPerson;//录入人员 + private List sieveProject;//筛查项目 + public List getSieveProject() { + return sieveProject; + } + + public void setSieveProject(List sieveProject) { + this.sieveProject = sieveProject; + } public Date getDiaDate() { return diaDate; @@ -420,6 +429,9 @@ public class DiagnosisModel extends BaseModel { map.put("diaResult",diaResult); map.put("applyWeek",applyWeek); map.put("resultDate",DateUtil.getyyyy_MM_dd(resultDate)); + map.put("CsStatus",CsStatus); + map.put("tireNumber",tireNumber); + map.put("sieveProject",sieveProject.toString()); return map; } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java index ed9202a..8a447b0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java @@ -326,6 +326,21 @@ public class DiagnosisFacaed { List list = sieveService.queryList1(sieveQuery, "order"); if(list != null && list.size() > 0){ SieveModel sieveModel = list.get(0); + + //产筛项目 + SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); + sieveApplyOrderQuery.setParentId(patients.getId()); + sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); + List applyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery); + List sList = new ArrayList(); + if(applyOrderModels != null && applyOrderModels.size() > 0){ + SieveApplyOrderModel sieveAppModel = applyOrderModels.get(0); + if (StringUtils.isNotEmpty(sieveAppModel.getCheckItem())) { + sList = JsonUtil.jkstr2Obj(sieveAppModel.getCheckItem(), List.class); + } + } + diagnosisModel.setSieveProject(sList); + if(sieveModel.getRenShenResult() != null){ diagnosisModel.setRsResult(sieveModel.getRenShenResult().toString()); }