diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java index 79232ef..8d482ce 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java @@ -401,11 +401,12 @@ public class LisFacade { if (lis.getAge() != null) { check.setAge(lis.getAge().toString()); } - check.setApplyDate(lis.getApplyTime()); - check.setApplyDateStr(DateUtil.getyyyy_MM_dd(lis.getApplyTime())); -// check.setApplyDate(lis.getPublishTime()); -// check.setApplyDateStr(DateUtil.getyyyy_MM_dd(lis.getPublishTime())); + //聊城显示修改 + check.setApplyDate(lis.getPublishTime() != null ? lis.getPublishTime() : + lis.getCheckTime()); + check.setApplyDateStr(lis.getPublishTime() != null ? DateUtil.getyyyy_MM_dd(lis.getPublishTime()) : + DateUtil.getyyyy_MM_dd(lis.getCheckTime())); check.setCheckDept(lis.getApplyDept()); check.setDoctor(lis.getApplyDoctor()); check.setSex(lis.getSex()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java index 7c481f9..fbacdb4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java @@ -114,7 +114,7 @@ public class SmsConfigFacade { String hospitalId = autoMatchFacade.getHospitalId(userId); - operateLogFacade.addAddOptLog(userId,Integer.parseInt(hospitalId),result,OptActionEnums.ADD.getId(),"添加服务配置"); + operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), result, OptActionEnums.ADD.getId(), "添加服务配置"); BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setData(result.getId()); @@ -207,6 +207,27 @@ public class SmsConfigFacade { sr.setSmsService(getSelectedNode(model.getSmsService())); sr.setAreaPrefix(model.getAreaPrefix()); sr.setIsCharge(StringUtils.isEmpty(model.getIsCharge()) ? null : JsonUtil.getMap(model.getIsCharge())); + + Map> serviceType = new HashMap<>(); + + Map parents = StringUtils.isEmpty(model.getServiceType()) ? null : JsonUtil.getMap(model.getServiceType()); + if (parents != null && !parents.isEmpty()) + { + for (String key : parents.keySet()) + { + String child = parents.get(key); + if (StringUtils.isNotEmpty(child)) + { + Map map =JsonUtil.getMap(child); + if (map != null) + { + serviceType.put(key,map); + } + } + } + } + + sr.setServiceType(serviceType); return sr; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsConfigResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsConfigResult.java index 36ae9d3..c9d6b50 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsConfigResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsConfigResult.java @@ -34,6 +34,16 @@ public class SmsConfigResult { //区域前缀 private String areaPrefix; + private Map> serviceType; + + public Map> getServiceType() { + return serviceType; + } + + public void setServiceType(Map> serviceType) { + this.serviceType = serviceType; + } + public Map getIsCharge() { return isCharge; }