From 44e0966670ae0fce585e09b9e96914fba603c123 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 6 Sep 2016 10:50:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java | 1 + .../java/com/lyms/platform/operate/web/result/MatDeliverListResult.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index f902cc9..8209dd5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -540,6 +540,7 @@ public class MatDeliverFacade { return 0; } }); + list12.get(0).setEnableEdit("1"); matDeliverListResult.setData(list12); } else { StopPregQuery stopPregQuery = new StopPregQuery(); 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 f5edb1d..41bfc95 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 @@ -226,7 +226,7 @@ public class MatDeliverListResult { setHospitalName(deliverModel.getFmHospital()); if (null != deliverModel.getDueDate()) { Date date = DateUtil.parseYMD(deliverModel.getDueDate()); - setEnableEdit(date.after(lastCreatedTime) ? "1" : "0"); + } if (null != dueDate) { -- 1.8.3.1