jiangjiazhi / regional-platform

Authored by liquanyu about 2 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 22 additions and 3 deletions

...	...	@@ -43,8 +43,8 @@
43	43	*/
44	44	@RequestMapping(method = RequestMethod.GET, value = "/findNewHighRisk")
45	45	@ResponseBody
46		- public BaseResponse findNewHighRisk() {
47		- return basicConfigFacade.findNewHighRisk();
	46	+ public BaseResponse findNewHighRisk(@RequestParam("orgId") String orgId) {
	47	+ return basicConfigFacade.findNewHighRisk(orgId);
48	48	}
49	49
50	50	/**

...	...	@@ -48,7 +48,7 @@
48	48	*
49	49	* @return
50	50	*/
51		- public BaseResponse findNewHighRisk() {
	51	+ public BaseResponse findNewHighRisk(String orgId) {
52	52	// //true-开发、false-正式
53	53	// boolean isTest = true;
54	54	// if(isTest){
...	...	@@ -62,6 +62,25 @@
62	62
63	63	//所有数据
64	64	List<BasicConfig> basicConfigList = basicConfigService.queryBasicConfig(basicConfigQuery);
	65	+ /**
	66	+ * 大同单独添加高位因素==高血压（需要药物治疗）
	67	+ */
	68	+ if (!orgId.equalsIgnoreCase("2100002419")) {
	69	+ Iterator<BasicConfig> basicConfigIterator = basicConfigList.iterator();
	70	+ while (basicConfigIterator.hasNext()) {
	71	+ BasicConfig basicConfig = basicConfigIterator.next();
	72	+ if (basicConfig.getName().equalsIgnoreCase("高血压（需要药物治疗）")) {
	73	+ basicConfigIterator.remove();
	74	+ }
	75	+ }
	76	+ }
	77	+ if (orgId.equalsIgnoreCase("2100002419")) {
	78	+ Iterator<BasicConfig> basicConfigIterator = basicConfigList.iterator();
	79	+ while (basicConfigIterator.hasNext()) {
	80	+ BasicConfig basicConfig = basicConfigIterator.next();
	81	+ basicConfig.setName(basicConfig.getName()+"1");
	82	+ }
	83	+ }
65	84
66	85	//主节点数据
67	86	basicConfigQuery.setTypeId(null);