From 45d128c90476277e516606ec6455372b706c064e Mon Sep 17 00:00:00 2001 From: yangfei Date: Mon, 28 May 2018 17:01:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E8=AF=8A=E5=8D=95=E7=8E=B0=E5=AE=9E?= =?UTF-8?q?=E7=AD=9B=E6=9F=A5=E7=BB=93=E6=9E=9C=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/facade/PatientFacade.java | 5 +++++ .../lyms/platform/operate/web/result/PatientBaseResult.java | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 7445603..663dbe7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -682,9 +682,14 @@ public class PatientFacade { patientsQuery.setCardNo(patientQueryRequest.getCardNo()); Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(), patientQueryRequest.getVcCardNo(), patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId, false), -1, true, patientQueryRequest.getPid(), false); + + + PatientBaseResult patientBaseResult = new PatientBaseResult(); if (null != patients) { patientBaseResult.convert(patients); + List> screenList = antenatalExaminationFacade.getscreenResult(patients.getScreenResult()); + patientBaseResult.setScreenResult(screenList); } try { HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java index 4706908..aa505ce 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java @@ -6,6 +6,7 @@ import com.lyms.platform.pojo.Patients; import java.util.Date; import java.util.List; +import java.util.Map; /** * Created by Administrator on 2016/7/10 0010. @@ -43,12 +44,21 @@ public class PatientBaseResult { private String lastMenses; //1 孕妇 0 产妇 private String isGravida; - + //筛查结果 + private List> screenResult; // 身高 private String height; //体重 private String weight ; + public List> getScreenResult() { + return screenResult; + } + + public void setScreenResult(List> screenResult) { + this.screenResult = screenResult; + } + public String getHeight() { return height; } -- 1.8.3.1