jiangjiazhi / regional-platform

Commit ff9b31972c0160ba77252f0fb586c316dfffd51f

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

筛查结果初始化接口

Showing 5 changed files with 40 additions and 11 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ModularFunctionConfigController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ModularFunctionConfigFacde.java

...	...	@@ -226,8 +226,10 @@
226	226
227	227	@RequestMapping(method = RequestMethod.GET, value = "/antex/getenums")
228	228	@ResponseBody
229		- public BaseResponse getEnums() {
230		- return antenatalExaminationFacade.getEnums();
	229	+ @TokenRequired
	230	+ public BaseResponse getEnums(HttpServletRequest request) {
	231	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	232	+ return antenatalExaminationFacade.getEnums(loginState.getId());
231	233	}
232	234
233	235	/**

...	...	@@ -49,8 +49,7 @@
49	49	@TokenRequired
50	50	public BaseResponse queryDiagnoseConfig(@RequestParam("hospitalId")String hospitalId,
51	51	HttpServletRequest request) {
52		-
53		- return modularFunctionConfigFacde.queryDiagnoseConfig(hospitalId, getUserId(request));
	52	+ return modularFunctionConfigFacde.queryDiagnoseConfig(hospitalId);
54	53	}
55	54
56	55	}

...	...	@@ -52,7 +52,7 @@
52	52	private static final Logger logger = LoggerFactory.getLogger(AntenatalExaminationFacade.class);
53	53
54	54	public static final String his_version = PropertiesUtils.getPropertyValue("his_version");
55		-
	55	+ private static List<BasicConfig> mainBasicConfigList;
56	56	@Autowired
57	57	private AntenatalExaminationService antenatalExaminationService;
58	58	@Autowired
59	59
...	...	@@ -82,8 +82,9 @@
82	82
83	83	@Autowired
84	84	private OrganizationGroupsFacade groupsFacade;
85		-
86	85	@Autowired
	86	+ private ModularFunctionConfigService modularFunctionConfigServcie;
	87	+ @Autowired
87	88	private PatientCheckTicketService patientCheckTicketService;
88	89
89	90	@Autowired
...	...	@@ -2677,7 +2678,9 @@
2677	2678	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("").setData(m);
2678	2679	}
2679	2680
2680		- public BaseResponse getEnums() {
	2681	+ public BaseResponse getEnums(Integer userId) {
	2682	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
	2683	+
2681	2684	Map<String, Object> map = new HashMap<>();
2682	2685	// 胎动情况
2683	2686	map.put("quickenEnum", EnumUtil.toJson(QuickenEnums.class));
...	...	@@ -2719,6 +2722,31 @@
2719	2722	map.put("gwfz", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.GWFZ));
2720	2723	map.put("organizations", convert());
2721	2724	map.put("cTime", DateUtil.getyyyy_MM_dd(new Date()));
	2725	+ ModularFunctionConfigQuery diagnoseConfigQuery = new ModularFunctionConfigQuery();
	2726	+ diagnoseConfigQuery.setHospitalId(hospitalId);
	2727	+ //医院配置
	2728	+ List<ModularFunctionConfigModel> configModels = modularFunctionConfigServcie.queryDiagnoseConfigs(diagnoseConfigQuery);
	2729	+ if (CollectionUtils.isNotEmpty(configModels))
	2730	+ {
	2731	+ ModularFunctionConfigModel configModel = configModels.get(0);
	2732	+ map.put("modularFunction", configModel.getConfigs());
	2733	+ }
	2734	+
	2735	+ if (CollectionUtils.isEmpty(mainBasicConfigList)) {
	2736	+ BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
	2737	+ basicConfigQuery.setEnable(1);
	2738	+ basicConfigQuery.setTypeId("5b023e73422b03d4ad2bf8af");
	2739	+
	2740	+ //所有数据
	2741	+ List<BasicConfig> basicConfigList = basicConfigService.queryBasicConfig(basicConfigQuery);
	2742	+ //主节点数据
	2743	+ basicConfigQuery.setTypeId(null);
	2744	+ basicConfigQuery.setParentId("5b023e73422b03d4ad2bf8af");
	2745	+ mainBasicConfigList = basicConfigService.queryBasicConfig(basicConfigQuery);
	2746	+ BasicConfigFacade.dispNewHighRisk(basicConfigList, mainBasicConfigList);
	2747	+ }
	2748	+ //筛查结果的基础数据
	2749	+ map.put("secrEnmum", mainBasicConfigList);
2722	2750	return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
2723	2751	}
2724	2752

...	...	@@ -115,7 +115,7 @@
115	115	* @param basicConfigList
116	116	* @param mainBasicConfigList
117	117	*/
118		- public List<BasicConfig> dispNewHighRisk(List<BasicConfig> basicConfigList, List<BasicConfig> mainBasicConfigList) {
	118	+ public synchronized static List<BasicConfig> dispNewHighRisk(List<BasicConfig> basicConfigList, List<BasicConfig> mainBasicConfigList) {
119	119	Map<String, List<BasicConfig>> slaveBasicConfigMap = new HashMap<>();
120	120	for (BasicConfig bc : basicConfigList) {
121	121	bc.setColor(HosptialHighRiskFacade.colorMap.get(bc.getParentId()));
...	...	@@ -150,7 +150,7 @@
150	150
151	151
152	152	//子节点根据权重排序
153		- public void configData(BasicConfig bs, Map<String, List<BasicConfig>> slaveBasicConfigMap) {
	153	+ public synchronized static void configData(BasicConfig bs, Map<String, List<BasicConfig>> slaveBasicConfigMap) {
154	154
155	155	if (slaveBasicConfigMap.containsKey(bs.getId())) {
156	156	bs.setBasicConfigs(slaveBasicConfigMap.get(bs.getId()));
...	...	@@ -160,7 +160,7 @@
160	160	}
161	161	}
162	162
163		- public void sortBasicConfig(BasicConfig basicConfig) {
	163	+ public synchronized static void sortBasicConfig(BasicConfig basicConfig) {
164	164	if (CollectionUtils.isNotEmpty(basicConfig.getBasicConfigs())) {
165	165	for (BasicConfig bs : basicConfig.getBasicConfigs()) {
166	166	if (CollectionUtils.isNotEmpty(bs.getBasicConfigs())) {

...	...	@@ -57,7 +57,7 @@
57	57	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
58	58	}
59	59
60		- public BaseResponse queryDiagnoseConfig(String hospitalId, Integer userId) {
	60	+ public BaseResponse queryDiagnoseConfig(String hospitalId) {
61	61
62	62	ModularFunctionConfigQuery diagnoseConfigQuery = new ModularFunctionConfigQuery();
63	63	diagnoseConfigQuery.setHospitalId(hospitalId);