From 98dcb0ed242f9e70cb443afe2a46cedac443889b Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 5 Aug 2016 11:26:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=88=86=E5=A8=A9=E5=90=8E?= =?UTF-8?q?=20=E5=8F=98=E6=88=90=E4=BA=A7=E5=A6=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/AntenatalExaminationFacade.java | 1 - .../com/lyms/platform/operate/web/result/AntexListResult.java | 11 +++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) 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 8f009de..fcd98c7 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 @@ -431,7 +431,6 @@ public class AntenatalExaminationFacade { List list = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isNotEmpty(list)) { patients = list.get(0); - patients1 = patients; } } else { List list1 = autoMatchFacade.matchOrgId(userId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java index 89b9111..85013d4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java @@ -38,6 +38,8 @@ public class AntexListResult { private String remarks; //末次月经 private String lastMenses; + //建档时间 + private String buildTime; private String cardNo; private String vcCardNo; @@ -45,6 +47,14 @@ public class AntexListResult { // + public String getBuildTime() { + return buildTime; + } + + public void setBuildTime(String buildTime) { + this.buildTime = buildTime; + } + public String getIsSieve() { return isSieve; } @@ -156,6 +166,7 @@ public class AntexListResult { if(null!=patients.getDueDate()){ setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); } + setBuildTime(DateUtil.getyyyy_MM_dd(patients.getCreated())); setName(patients.getUsername()); setPhone(patients.getPhone()); setRemarks(patients.getMremark()); -- 1.8.3.1