diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ModularFunctionConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ModularFunctionConfigController.java index d6d2f76..b0fe7bd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ModularFunctionConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ModularFunctionConfigController.java @@ -12,6 +12,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +import java.util.Map; /** @@ -74,7 +75,7 @@ public class ModularFunctionConfigController extends BaseController { */ @RequestMapping(method = RequestMethod.GET, value = "/queryHospitalSmsSendConfig") @ResponseBody - public BaseResponse queryHospitalSmsSendConfig(@RequestParam(required = false) String hospitalId) { + public Map queryHospitalSmsSendConfig(@RequestParam(required = false) String hospitalId) { return modularFunctionConfigFacde.queryHospitalSmsSendConfig(hospitalId); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ModularFunctionConfigFacde.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ModularFunctionConfigFacde.java index 8aa442b..ffd6665 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ModularFunctionConfigFacde.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ModularFunctionConfigFacde.java @@ -7,6 +7,7 @@ import com.lyms.platform.common.enums.OptActionEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.ModularFunctionConfigRequest; import com.lyms.platform.operate.web.result.ModularFunctionConfigResult; @@ -121,7 +122,7 @@ public class ModularFunctionConfigFacde { return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有数据"); } - public BaseResponse queryHospitalSmsSendConfig(String hospitalId) { + public Map queryHospitalSmsSendConfig(String hospitalId) { Map map = new HashMap<>(); ModularFunctionConfigQuery diagnoseConfigQuery = new ModularFunctionConfigQuery(); if(StringUtils.isNotEmpty(hospitalId)) @@ -129,26 +130,32 @@ public class ModularFunctionConfigFacde { diagnoseConfigQuery.setHospitalId(hospitalId); } - List configModels = modularFunctionConfigServcie.queryDiagnoseConfigs(diagnoseConfigQuery); - if (CollectionUtils.isNotEmpty(configModels)) - { - for (ModularFunctionConfigModel model : configModels) + try { + List configModels = modularFunctionConfigServcie.queryDiagnoseConfigs(diagnoseConfigQuery); + if (CollectionUtils.isNotEmpty(configModels)) { - List> list = model.getConfigs(); - if (CollectionUtils.isNotEmpty(list)) + for (ModularFunctionConfigModel model : configModels) { - for (Map config : list) + List> list = model.getConfigs(); + if (CollectionUtils.isNotEmpty(list)) { - //是否推送发送失败后补发短信 - if ("10".equals(String.valueOf(config.get("type")))) + for (Map config : list) { - String isOpen = "1".equals(String.valueOf(config.get("value"))) ? "ture" : "false"; - map.put(model.getHospitalId(),isOpen); + //是否推送发送失败后补发短信 + if ("10".equals(String.valueOf(config.get("type")))) + { + String isOpen = "1".equals(String.valueOf(config.get("value"))) ? "ture" : "false"; + map.put(model.getHospitalId(),isOpen); + } } } } } } - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setData(map); + catch (Exception e) + { + ExceptionUtils.catchException(e,"queryHospitalSmsSendConfig error."); + } + return map; } }