From ff9b31972c0160ba77252f0fb586c316dfffd51f Mon Sep 17 00:00:00 2001 From: yangfei Date: Mon, 21 May 2018 18:08:11 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=9B=E6=9F=A5=E7=BB=93=E6=9E=9C=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AntenatalExaminationController.java | 6 ++-- .../ModularFunctionConfigController.java | 3 +- .../web/facade/AntenatalExaminationFacade.java | 34 ++++++++++++++++++++-- .../operate/web/facade/BasicConfigFacade.java | 6 ++-- .../web/facade/ModularFunctionConfigFacde.java | 2 +- 5 files changed, 40 insertions(+), 11 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java index 6d60afe..108bab7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java @@ -226,8 +226,10 @@ public class AntenatalExaminationController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/antex/getenums") @ResponseBody - public BaseResponse getEnums() { - return antenatalExaminationFacade.getEnums(); + @TokenRequired + public BaseResponse getEnums(HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return antenatalExaminationFacade.getEnums(loginState.getId()); } /** 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 90ed0cb..f9d8b7a 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 @@ -49,8 +49,7 @@ public class ModularFunctionConfigController extends BaseController { @TokenRequired public BaseResponse queryDiagnoseConfig(@RequestParam("hospitalId")String hospitalId, HttpServletRequest request) { - - return modularFunctionConfigFacde.queryDiagnoseConfig(hospitalId, getUserId(request)); + return modularFunctionConfigFacde.queryDiagnoseConfig(hospitalId); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 1e5c78c..4d0d853 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -52,7 +52,7 @@ public class AntenatalExaminationFacade { private static final Logger logger = LoggerFactory.getLogger(AntenatalExaminationFacade.class); public static final String his_version = PropertiesUtils.getPropertyValue("his_version"); - + private static List mainBasicConfigList; @Autowired private AntenatalExaminationService antenatalExaminationService; @Autowired @@ -82,7 +82,8 @@ public class AntenatalExaminationFacade { @Autowired private OrganizationGroupsFacade groupsFacade; - + @Autowired + private ModularFunctionConfigService modularFunctionConfigServcie; @Autowired private PatientCheckTicketService patientCheckTicketService; @@ -2677,7 +2678,9 @@ public class AntenatalExaminationFacade { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("").setData(m); } - public BaseResponse getEnums() { + public BaseResponse getEnums(Integer userId) { + String hospitalId = autoMatchFacade.getHospitalId(userId); + Map map = new HashMap<>(); // 胎动情况 map.put("quickenEnum", EnumUtil.toJson(QuickenEnums.class)); @@ -2719,6 +2722,31 @@ public class AntenatalExaminationFacade { map.put("gwfz", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.GWFZ)); map.put("organizations", convert()); map.put("cTime", DateUtil.getyyyy_MM_dd(new Date())); + ModularFunctionConfigQuery diagnoseConfigQuery = new ModularFunctionConfigQuery(); + diagnoseConfigQuery.setHospitalId(hospitalId); + //医院配置 + List configModels = modularFunctionConfigServcie.queryDiagnoseConfigs(diagnoseConfigQuery); + if (CollectionUtils.isNotEmpty(configModels)) + { + ModularFunctionConfigModel configModel = configModels.get(0); + map.put("modularFunction", configModel.getConfigs()); + } + + if (CollectionUtils.isEmpty(mainBasicConfigList)) { + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setEnable(1); + basicConfigQuery.setTypeId("5b023e73422b03d4ad2bf8af"); + + //所有数据 + List basicConfigList = basicConfigService.queryBasicConfig(basicConfigQuery); + //主节点数据 + basicConfigQuery.setTypeId(null); + basicConfigQuery.setParentId("5b023e73422b03d4ad2bf8af"); + mainBasicConfigList = basicConfigService.queryBasicConfig(basicConfigQuery); + BasicConfigFacade.dispNewHighRisk(basicConfigList, mainBasicConfigList); + } + //筛查结果的基础数据 + map.put("secrEnmum", mainBasicConfigList); return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java index cb86a3d..f45e3b6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java @@ -115,7 +115,7 @@ public class BasicConfigFacade { * @param basicConfigList * @param mainBasicConfigList */ - public List dispNewHighRisk(List basicConfigList, List mainBasicConfigList) { + public synchronized static List dispNewHighRisk(List basicConfigList, List mainBasicConfigList) { Map> slaveBasicConfigMap = new HashMap<>(); for (BasicConfig bc : basicConfigList) { bc.setColor(HosptialHighRiskFacade.colorMap.get(bc.getParentId())); @@ -150,7 +150,7 @@ public class BasicConfigFacade { //子节点根据权重排序 - public void configData(BasicConfig bs, Map> slaveBasicConfigMap) { + public synchronized static void configData(BasicConfig bs, Map> slaveBasicConfigMap) { if (slaveBasicConfigMap.containsKey(bs.getId())) { bs.setBasicConfigs(slaveBasicConfigMap.get(bs.getId())); @@ -160,7 +160,7 @@ public class BasicConfigFacade { } } - public void sortBasicConfig(BasicConfig basicConfig) { + public synchronized static void sortBasicConfig(BasicConfig basicConfig) { if (CollectionUtils.isNotEmpty(basicConfig.getBasicConfigs())) { for (BasicConfig bs : basicConfig.getBasicConfigs()) { if (CollectionUtils.isNotEmpty(bs.getBasicConfigs())) { 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 0854c10..5b51f9f 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 @@ -57,7 +57,7 @@ public class ModularFunctionConfigFacde { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); } - public BaseResponse queryDiagnoseConfig(String hospitalId, Integer userId) { + public BaseResponse queryDiagnoseConfig(String hospitalId) { ModularFunctionConfigQuery diagnoseConfigQuery = new ModularFunctionConfigQuery(); diagnoseConfigQuery.setHospitalId(hospitalId); -- 1.8.3.1