From 6bffc99d9d855fbaf87bbc3476c7a81e057f7aac Mon Sep 17 00:00:00 2001 From: landong2015 Date: Mon, 16 Jan 2017 14:07:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E6=8E=A5=E5=8D=95=E4=BD=8D,=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=9F=A5=E7=9C=8B=E5=BB=BA=E6=A1=A3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/facade/ViewFacade.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index b114adb..bb39efd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -104,13 +104,24 @@ public class ViewFacade { /* 院内信息 */ map.put("lastMenses", DateUtil.getyyyy_MM_dd(data.getLastMenses())); - //TODO 纠正末次月经 + //纠正末次月经,取末次月经数据 + map.put("correctionLastMenses", DateUtil.getyyyy_MM_dd(data.getLastMenses())); map.put("dueDate", DateUtil.getyyyy_MM_dd(data.getDueDate())); map.put("vcCardNo", data.getVcCardNo()); //TODO 条码 - //TODO 档案编号 + //档案编号 + map.put("fileCode", data.getFileCode()); map.put("mremark", data.getMremark()); - //TODO 服务类型 + //服务类型 + String serviceType = ""; + if (data.getServiceType()!=null){ + for (ServiceTypeEnums serviceTypeEnums:ServiceTypeEnums.values()){ + if (data.getServiceType().equals(serviceTypeEnums.getId())){ + serviceType = serviceTypeEnums.getName(); + } + } + } + map.put("serviceType",serviceType ); map.put("serviceStatus", ServiceStatusEnums.getNameById(data.getServiceStatus())); br.setData(map); -- 1.8.3.1