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);