From d190d8dcc928ab54f7ff90ba7e8b5f2c7d01b16e Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 8 Aug 2016 17:32:17 +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/result/MatDeliverListResult.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java index 1832db0..f143a19 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java @@ -79,7 +79,7 @@ public class MatDeliverListResult { if (CollectionUtils.isNotEmpty(destList)) { List list = new ArrayList<>(); for (MaternalDeliverModel model : destList) { - list.add(new MatDeliverExt(model,patients.getCreated())); + list.add(new MatDeliverExt(model,patients.getCreated(),patients.getBuildType())); } setData(list); } @@ -177,8 +177,9 @@ public class MatDeliverListResult { private String id; private String checkTime; private String enableEdit = "0"; - - public MatDeliverExt(MaternalDeliverModel deliverModel, Date lastCreatedTime) { + //建档类型 0 未分娩建档 1儿童建档时建档 + private String dueType; + public MatDeliverExt(MaternalDeliverModel deliverModel, Date lastCreatedTime,Integer buildType) { setCheckTime(deliverModel.getDueDate()); setId(deliverModel.getId()); setHospitalId(deliverModel.getHospitalId()); @@ -187,6 +188,17 @@ public class MatDeliverListResult { Date date = DateUtil.parseYMD(deliverModel.getDueDate()); setEnableEdit(date.after(lastCreatedTime) ? "1" : "0"); } + if(null!=buildType){ + dueType=buildType+""; + } + } + + public String getDueType() { + return dueType; + } + + public void setDueType(String dueType) { + this.dueType = dueType; } public String getEnableEdit() { -- 1.8.3.1