Commit 6bffc99d9d855fbaf87bbc3476c7a81e057f7aac
1 parent
742336c917
Exists in
master
and in
7 other branches
拼接单位,修改查看建档接口
Showing 1 changed file with 14 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
6bffc99
| ... | ... | @@ -104,13 +104,24 @@ |
| 104 | 104 | |
| 105 | 105 | /* 院内信息 */ |
| 106 | 106 | map.put("lastMenses", DateUtil.getyyyy_MM_dd(data.getLastMenses())); |
| 107 | - //TODO 纠正末次月经 | |
| 107 | + //纠正末次月经,取末次月经数据 | |
| 108 | + map.put("correctionLastMenses", DateUtil.getyyyy_MM_dd(data.getLastMenses())); | |
| 108 | 109 | map.put("dueDate", DateUtil.getyyyy_MM_dd(data.getDueDate())); |
| 109 | 110 | map.put("vcCardNo", data.getVcCardNo()); |
| 110 | 111 | //TODO 条码 |
| 111 | - //TODO 档案编号 | |
| 112 | + //档案编号 | |
| 113 | + map.put("fileCode", data.getFileCode()); | |
| 112 | 114 | map.put("mremark", data.getMremark()); |
| 113 | - //TODO 服务类型 | |
| 115 | + //服务类型 | |
| 116 | + String serviceType = ""; | |
| 117 | + if (data.getServiceType()!=null){ | |
| 118 | + for (ServiceTypeEnums serviceTypeEnums:ServiceTypeEnums.values()){ | |
| 119 | + if (data.getServiceType().equals(serviceTypeEnums.getId())){ | |
| 120 | + serviceType = serviceTypeEnums.getName(); | |
| 121 | + } | |
| 122 | + } | |
| 123 | + } | |
| 124 | + map.put("serviceType",serviceType ); | |
| 114 | 125 | map.put("serviceStatus", ServiceStatusEnums.getNameById(data.getServiceStatus())); |
| 115 | 126 | |
| 116 | 127 | br.setData(map); |