Commit a678c0e3a1689e8b6c4173f2525d8b658f7d85a3
1 parent
392123cee3
Exists in
master
and in
6 other branches
短信修改
Showing 3 changed files with 37 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
View file @
a678c0e
| ... | ... | @@ -401,11 +401,12 @@ |
| 401 | 401 | if (lis.getAge() != null) { |
| 402 | 402 | check.setAge(lis.getAge().toString()); |
| 403 | 403 | } |
| 404 | - check.setApplyDate(lis.getApplyTime()); | |
| 405 | - check.setApplyDateStr(DateUtil.getyyyy_MM_dd(lis.getApplyTime())); | |
| 406 | 404 | |
| 407 | -// check.setApplyDate(lis.getPublishTime()); | |
| 408 | -// check.setApplyDateStr(DateUtil.getyyyy_MM_dd(lis.getPublishTime())); | |
| 405 | + //聊城显示修改 | |
| 406 | + check.setApplyDate(lis.getPublishTime() != null ? lis.getPublishTime() : | |
| 407 | + lis.getCheckTime()); | |
| 408 | + check.setApplyDateStr(lis.getPublishTime() != null ? DateUtil.getyyyy_MM_dd(lis.getPublishTime()) : | |
| 409 | + DateUtil.getyyyy_MM_dd(lis.getCheckTime())); | |
| 409 | 410 | check.setCheckDept(lis.getApplyDept()); |
| 410 | 411 | check.setDoctor(lis.getApplyDoctor()); |
| 411 | 412 | check.setSex(lis.getSex()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java
View file @
a678c0e
| ... | ... | @@ -114,7 +114,7 @@ |
| 114 | 114 | |
| 115 | 115 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
| 116 | 116 | |
| 117 | - operateLogFacade.addAddOptLog(userId,Integer.parseInt(hospitalId),result,OptActionEnums.ADD.getId(),"添加服务配置"); | |
| 117 | + operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), result, OptActionEnums.ADD.getId(), "添加服务配置"); | |
| 118 | 118 | |
| 119 | 119 | BaseObjectResponse objectResponse = new BaseObjectResponse(); |
| 120 | 120 | objectResponse.setData(result.getId()); |
| ... | ... | @@ -207,6 +207,27 @@ |
| 207 | 207 | sr.setSmsService(getSelectedNode(model.getSmsService())); |
| 208 | 208 | sr.setAreaPrefix(model.getAreaPrefix()); |
| 209 | 209 | sr.setIsCharge(StringUtils.isEmpty(model.getIsCharge()) ? null : JsonUtil.getMap(model.getIsCharge())); |
| 210 | + | |
| 211 | + Map<String, Map<String, String>> serviceType = new HashMap<>(); | |
| 212 | + | |
| 213 | + Map<String, String> parents = StringUtils.isEmpty(model.getServiceType()) ? null : JsonUtil.getMap(model.getServiceType()); | |
| 214 | + if (parents != null && !parents.isEmpty()) | |
| 215 | + { | |
| 216 | + for (String key : parents.keySet()) | |
| 217 | + { | |
| 218 | + String child = parents.get(key); | |
| 219 | + if (StringUtils.isNotEmpty(child)) | |
| 220 | + { | |
| 221 | + Map<String, String> map =JsonUtil.getMap(child); | |
| 222 | + if (map != null) | |
| 223 | + { | |
| 224 | + serviceType.put(key,map); | |
| 225 | + } | |
| 226 | + } | |
| 227 | + } | |
| 228 | + } | |
| 229 | + | |
| 230 | + sr.setServiceType(serviceType); | |
| 210 | 231 | return sr; |
| 211 | 232 | } |
| 212 | 233 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsConfigResult.java
View file @
a678c0e
| ... | ... | @@ -34,6 +34,16 @@ |
| 34 | 34 | //区域前缀 |
| 35 | 35 | private String areaPrefix; |
| 36 | 36 | |
| 37 | + private Map<String,Map<String,String>> serviceType; | |
| 38 | + | |
| 39 | + public Map<String, Map<String, String>> getServiceType() { | |
| 40 | + return serviceType; | |
| 41 | + } | |
| 42 | + | |
| 43 | + public void setServiceType(Map<String, Map<String, String>> serviceType) { | |
| 44 | + this.serviceType = serviceType; | |
| 45 | + } | |
| 46 | + | |
| 37 | 47 | public Map<String, String> getIsCharge() { |
| 38 | 48 | return isCharge; |
| 39 | 49 | } |