jiangjiazhi / regional-platform

Commit 45a4f3ca30e85e1d5a884ca76a64ff1b366304c1

Authored by jiangjiazhi almost 8 years ago

Exists in master and in 6 other branches

1

Showing 4 changed files with 117 additions and 92 deletions

platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java
platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/HighScoreResult.java
platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java

...	...	@@ -369,7 +369,7 @@
369	369	drugGllergic += " 先锋霉素过敏,";
370	370	}
371	371
372		- drugGllergic= FunvCommonUtil.spitd(drugGllergic);
	372	+ drugGllergic = FunvCommonUtil.spitd(drugGllergic);
373	373	String qt = map.get("qt") == null ? "" : map.get("qt").toString();
374	374	if ("true".equals(qt)) {
375	375	String qtText = map.get("qtText") == null ? "" : map.get("qtText").toString();
376	376
...	...	@@ -679,16 +679,24 @@
679	679	}
680	680	}
681	681	}
682		- if (null != antExChuModel.getOtherHighRisk() && !"{}".equals(antExChuModel.getOtherHighRisk())) {
683		- Map map1 = null;
684		- try {
685		- map1 = JsonUtil.str2Obj(antExChuModel.getOtherHighRisk(), Map.class);
686		- } catch (Exception e) {
687		- }
688	682
689		- Object rh = map1.get("fxysu");
690		- if (null != rh && StringUtils.isNotEmpty(rh.toString())) {
691		- sb.append(rh);
	683	+ List<Map> otherHighRisks = new ArrayList<>();
	684	+ List list3 = null;
	685	+ String ot=antExChuModel.getOtherHighRisk();
	686	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(ot)&&ot.startsWith("[") && antExChuModel.getOtherHighRisk().endsWith("]")) {
	687	+ list3 = JsonUtil.toList(ot, Map.class);
	688	+ otherHighRisks.addAll(list3);
	689	+ } else if(org.apache.commons.lang.StringUtils.isNotEmpty(ot)){
	690	+ Map otherMap = JsonUtil.jkstr2Obj(ot, Map.class);
	691	+ otherHighRisks.add(otherMap);
	692	+ }
	693	+
	694	+ if (CollectionUtils.isNotEmpty(otherHighRisks)) {
	695	+ for (Map ma : otherHighRisks) {
	696	+ Object rh = ma.get("fxysu");
	697	+ if (null != rh && StringUtils.isNotEmpty(rh.toString())) {
	698	+ sb.append(rh);
	699	+ }
692	700	}
693	701	}
694	702	//低压
695	703
696	704
...	...	@@ -883,20 +891,24 @@
883	891	}
884	892	}
885	893	}
886		- if (null != antExChuModel.getOtherRisk() && !"{}".equals(antExChuModel.getOtherRisk())) {
887		- Map map1 = null;
888		- try {
889		- map1 = JsonUtil.str2Obj(antExChuModel.getOtherRisk(), Map.class);
890		- } catch (Exception e) {
	894	+ List<Map> otherHighRisks = new ArrayList<>();
	895	+ List list3 = null;
	896	+ String ot =antExChuModel.getOtherRisk();
	897	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(ot)&ot.startsWith("[") && ot.endsWith("]")) {
	898	+ list3 = JsonUtil.toList(ot, Map.class);
	899	+ otherHighRisks.addAll(list3);
	900	+ } else if(org.apache.commons.lang.StringUtils.isNotEmpty(ot)){
	901	+ Map otherMap = JsonUtil.jkstr2Obj(ot, Map.class);
	902	+ otherHighRisks.add(otherMap);
	903	+ }
891	904
892		- }
893		- if (null != map1) {
894		- Object rh = map1.get("fxysu");
	905	+ if (CollectionUtils.isNotEmpty(otherHighRisks)) {
	906	+ for (Map ma : otherHighRisks) {
	907	+ Object rh = ma.get("fxysu");
895	908	if (null != rh && StringUtils.isNotEmpty(rh.toString())) {
896	909	sb.append(rh);
897	910	}
898	911	}
899		-
900	912	}
901	913	//低压
902	914	java.util.Map<String, Object> dataMap1 = new HashMap<>();

1	1	package com.lyms.platform.job.index.restore.data;
2	2
3	3	import com.lyms.platform.common.utils.StringUtils;
	4	+import org.apache.commons.collections.CollectionUtils;
4	5
5	6	import java.util.ArrayList;
6	7	import java.util.Collections;
7	8
8	9
9	10
10	11
11	12
12	13
...	...	@@ -9,32 +10,61 @@
9	10	/**
10	11	* Created by Administrator on 2016/8/2 0002.
11	12	*/
	13	+
	14	+/**
	15	+ * Created by Administrator on 2016/8/2 0002.
	16	+ */
12	17	public class HighScoreResult {
13	18
14	19	//高危因素
15	20	private List highRisk = new ArrayList();
16	21	//风险等级颜色
17	22	private List level = new ArrayList();
	23	+
	24	+ private String otherRisk;
	25	+
18	26	//高危评分
19	27	private Integer score = 0;
20	28
	29	+ //补充高危因素
	30	+ private String highriskDesc;
	31	+
	32	+ public String getHighriskDesc() {
	33	+ return highriskDesc;
	34	+ }
	35	+
	36	+ public void setHighriskDesc(String highriskDesc) {
	37	+ this.highriskDesc = highriskDesc;
	38	+ }
	39	+
21	40	public List getHighRisk() {
22	41	return highRisk;
23	42	}
24	43
25	44	public List getLevel() {
26		- return (level);
	45	+ return /filter(/level/)/;
27	46	}
28	47
29		- public static List filter(List<java.util.Map> level){
	48	+ public String getOtherRisk() {
	49	+ return otherRisk;
	50	+ }
	51	+
	52	+ public void setOtherRisk(String otherRisk) {
	53	+ this.otherRisk = otherRisk;
	54	+ }
	55	+
	56	+ public static List filter(List<java.util.Map> level) {
30	57	List list = new ArrayList();
31		- List addEdList = new ArrayList();
32		- for(java.util.Map map :level){
33		- if(!addEdList.contains(map.get("name"))){
34		- list.add(map);
35		- addEdList.add(map.get("name"));
	58	+ List addEdList = new ArrayList();
	59	+ if (CollectionUtils.isNotEmpty(level)) {
	60	+ for (java.util.Map map : level) {
	61	+ if (!addEdList.contains(map.get("name"))) {
	62	+ list.add(map);
	63	+ addEdList.add(map.get("name"));
	64	+ }
36	65	}
37	66	}
	67	+
38	68	return list;
39	69	}
40	70
41	71
...	...	@@ -54,11 +84,11 @@
54	84	}
55	85
56	86
57		- public String getScoreStr(){
58		- if(null==score \|\| 0==score){
	87	+ public String getScoreStr() {
	88	+ if (null == score \|\| 0 == score) {
59	89	return "";
60	90	}
61		- return score+"";
	91	+ return score + "";
62	92	}
63	93
64	94	public List<String> getLevelId() {
65	95
...	...	@@ -69,9 +99,13 @@
69	99	for (int i1 = 0; i1 < level.size(); i1++) {
70	100	java.util.Map<String, String> map = (java.util.Map<String, String>) level.get(i1);
71	101	String name = map.get("id");
	102	+ String fyyse = map.get("fyyse");
72	103	if (StringUtils.isNotEmpty(name)) {
73	104	idList.add(name);
74	105	}
	106	+ if (StringUtils.isNotEmpty(fyyse)) {
	107	+ idList.add(fyyse);
	108	+ }
75	109	}
76	110	return idList;
77	111	}
78	112
...	...	@@ -91,11 +125,11 @@
91	125	return idList;
92	126	}
93	127
94		- public String getOtherHigh(){
	128	+ public String getOtherHigh() {
95	129	if (null == highRisk) {
96	130	return "";
97	131	}
98		- StringBuilder stringBuilder=new StringBuilder();
	132	+ StringBuilder stringBuilder = new StringBuilder();
99	133	for (int i1 = 0; i1 < highRisk.size(); i1++) {
100	134	java.util.Map<String, String> map = (java.util.Map<String, String>) highRisk.get(i1);
101	135	String id = map.get("id");
...	...	@@ -103,8 +137,8 @@
103	137	stringBuilder.append(map.get("name")).append(",");
104	138	}
105	139	}
106		- if(stringBuilder.length()>0){
107		- stringBuilder.setLength(stringBuilder.length()-1);
	140	+ if (stringBuilder.length() > 0) {
	141	+ stringBuilder.setLength(stringBuilder.length() - 1);
108	142	}
109	143	return stringBuilder.toString();
110	144	}
...	...	@@ -131,7 +165,7 @@
131	165	return stringBuilder.toString();
132	166	}
133	167
134		- public String getLevelStr(List levelList) {
	168	+ public static String getLevelStr(List levelList) {
135	169	StringBuilder stringBuilder = new StringBuilder();
136	170	if (null == levelList) {
137	171	return "";
...	...	@@ -148,6 +182,7 @@
148	182	}
149	183	return stringBuilder.toString();
150	184	}
	185	+
151	186	public String gethighRiskStr() {
152	187	StringBuilder stringBuilder = new StringBuilder();
153	188	if (null == highRisk) {
...	...	@@ -162,8 +197,9 @@
162	197	}
163	198	return stringBuilder.toString();
164	199	}
165		- public List gethighRiskList(){
166		- List<String> list=new ArrayList<>();
	200	+
	201	+ public List gethighRiskList() {
	202	+ List<String> list = new ArrayList<>();
167	203	if (null == highRisk) {
168	204	return list;
169	205	}

...	...	@@ -236,6 +236,8 @@
236	236	name = "红色";
237	237	}else if (name.indexOf("紫色") > -1) {
238	238	name = "紫色";
	239	+ }else if (name.indexOf("绿色") > -1) {
	240	+ name = "绿色";
239	241	}
240	242	highLevel.put(basicConfig.getId(), name);
241	243
242	244
...	...	@@ -622,59 +624,7 @@
622	624	}
623	625	}
624	626
625		- /**
626		- * 处理自定义高危
627		- */
628		- private RiskDetails customHighRisk(String otherRisk, Integer patientId) {
629		- RiskDetails riskDetails = null;
630		- if (StringUtils.isNotEmpty(otherRisk)) {
631		- Map map = JsonUtil.str2Obj(otherRisk, Map.class);
632	627
633		- riskDetails = new RiskDetails();
634		- riskDetails.setCreated(new Date());
635		- riskDetails.setYn(YnEnums.YES.getId());
636		- riskDetails.setModified(new Date());
637		- riskDetails.setPublishId(0);
638		- riskDetails.setPublishName("system-worker");
639		- riskDetails.setPatientId(patientId);
640		- //风险因素
641		- Map map1 = new HashMap();
642		- map1.put("id", "");
643		- Object obj = map.get("fxysu");
644		- if (null != obj && !"null".equals(obj.toString()) && !"".equals(obj.toString())) {
645		- riskDetails.setTitle(map.get("fxysu").toString());
646		- }
647		-
648		- //风险评分
649		- Object idObj = map.get("fxpf");
650		- if (null != idObj && !"null".equals(idObj.toString()) && !"".equals(idObj.toString())) {
651		- BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj.toString());
652		- riskDetails.setScore(NumberUtils.toInt(basicConfig.getName()));
653		- }
654		- Object idObj1 = map.get("fyyse");
655		- if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) {
656		- BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString());
657		- if (null != basicConfig) {
658		- String name = basicConfig.getName();
659		- if (name.indexOf("黄色") > -1) {
660		- name = "黄色";
661		- }else if (name.indexOf("橙色") > -1) {
662		- name = "橙色";
663		- }else if (name.indexOf("红色") > -1) {
664		- name = "红色";
665		- }else if (name.indexOf("紫色") > -1) {
666		- name = "紫色";
667		- }
668		- RiskColorEnum riskColorEnum = SyncDataWork.map.get(name);
669		- riskDetails.setCrisis(riskColorEnum == null ? null : riskColorEnum.getId());
670		- }
671		- }
672		- riskDetailsService.addRiskDetails(riskDetails);
673		- }
674		- return riskDetails;
675		- }
676		-
677		-
678	628	private void handleDoctorMemeber(Reports reports, String prodDoctor, Patients mamiPatient, com.lyms.platform.pojo.Patients patients, StopWatch stopWatch3) {
679	629	if (NumberUtils.isNumber(prodDoctor)) {
680	630	Users users = usersService.getUsers(Integer.valueOf(prodDoctor));
681	631
...	...	@@ -989,11 +939,14 @@
989	939	name = "红色";
990	940	}else if (name.indexOf("紫色") > -1) {
991	941	name = "紫色";
	942	+ }else if (name.indexOf("绿色") > -1) {
	943	+ name = "绿色";
992	944	}
993	945
994	946	map2.put("name", name);
995	947	RiskColorEnum riskColorEnum = SyncDataWork.map.get(name);
996	948	riskDetails.setCrisis(riskColorEnum == null ? null : riskColorEnum.getId());
	949	+
997	950	map2.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
998	951	highScoreResult.getLevel().add(map2);
999	952	}
...	...	@@ -1009,7 +962,7 @@
1009	962	riskDetails.setModified(new Date());
1010	963	riskDetails.setPatientId(patientId);
1011	964	if (StringUtils.isNotEmpty(riskDetails.getTitle())) {
1012		- riskDetailsService.addRiskDetails(riskDetails);
	965	+// riskDetailsService.addRiskDetails(riskDetails);
1013	966	}
1014	967	}
1015	968	}
...	...	@@ -1042,7 +995,7 @@
1042	995	}
1043	996	}
1044	997
1045		- private void handLastRisk(com.lyms.platform.pojo.Patients patients, Integer patientId) {
	998	+ /*private void handLastRisk(com.lyms.platform.pojo.Patients patients, Integer patientId) {
1046	999	logger.info("start handLastRisk " + patients.getId() + ".");
1047	1000
1048	1001	StringBuilder sb = new StringBuilder();
...	...	@@ -1072,6 +1025,8 @@
1072	1025	name = "红色";
1073	1026	}else if (name.indexOf("紫色") > -1) {
1074	1027	name = "紫色";
	1028	+ }else if (name.indexOf("绿色") > -1) {
	1029	+ name = "绿色";
1075	1030	}
1076	1031	riskColorEnum = SyncDataWork.map.get(name);
1077	1032	if (null != riskColorEnum) {
...	...	@@ -1123,7 +1078,7 @@
1123	1078	ERROR_LOGGER.error("convert high risk error.", e);
1124	1079	}
1125	1080	logger.info("end handLastRisk " + patients.getId() + ".");
1126		- }
	1081	+ }*/
1127	1082
1128	1083	public static void main(String[] args) {
1129	1084
...	...	@@ -1239,6 +1194,8 @@
1239	1194	name = "红色";
1240	1195	}else if (name.indexOf("紫色") > -1) {
1241	1196	name = "紫色";
	1197	+ }else if (name.indexOf("绿色") > -1) {
	1198	+ name = "绿色";
1242	1199	}
1243	1200	map2.put("name", name);
1244	1201	RiskColorEnum riskColorEnum = SyncDataWork.map.get(name);
...	...	@@ -1257,7 +1214,7 @@
1257	1214	riskDetails.setCreated(new Date());
1258	1215	riskDetails.setModified(new Date());
1259	1216	riskDetails.setPatientId(patientId);
1260		- riskDetailsService.addRiskDetails(riskDetails);
	1217	+// riskDetailsService.addRiskDetails(riskDetails);
1261	1218	}
1262	1219	}
1263	1220	}
...	...	@@ -1274,6 +1231,9 @@
1274	1231	String name = tmp.get("name") == null ? null : (String) tmp.get("name");
1275	1232	if (null != name) {
1276	1233	RiskColorEnum colorEnum = map.get(name);
	1234	+ if(null==colorEnum){
	1235	+ logger.info("error :colorEnum null." +name);
	1236	+ }
1277	1237	crisis = crisis \| colorEnum.getId();
1278	1238	}
1279	1239	}
...	...	@@ -1328,6 +1288,18 @@
1328	1288	if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(name) && name.indexOf("预警") > -1) {
1329	1289	name = name.replace("预警", "");
1330	1290	}
	1291	+ if (name.indexOf("黄色") > -1) {
	1292	+ name = "黄色";
	1293	+ }else if (name.indexOf("橙色") > -1) {
	1294	+ name = "橙色";
	1295	+ }else if (name.indexOf("红色") > -1) {
	1296	+ name = "红色";
	1297	+ }else if (name.indexOf("紫色") > -1) {
	1298	+ name = "紫色";
	1299	+ }else if (name.indexOf("绿色") > -1) {
	1300	+ name = "绿色";
	1301	+ }
	1302	+
1331	1303	map1.put("name", name);
1332	1304	crisis = SyncDataWork.map.get(name) == null ? null : SyncDataWork.map.get(name).getId();
1333	1305	map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));

...	...	@@ -145,6 +145,7 @@
145	145	highRisks.put("80587d8a-009e-46aa-87e5-57996b0708b1", "d6cfcad8-c674-4624-b50d-8797d217f10c"); //糖尿病并发肾功能不全 ---糖尿病并发肾病V级、严重心血管病、增生性视网膜病变或玻璃体出血、周围神经病变等
146	146	highRisks.put("f50206fe-5fe4-4831-be7b-506ab0b458ed", "63347e70-4a74-4bc9-bad6-0c0cf1b2fd89"); //严重心律失常 ---严重心血管系统疾病
147	147	highRisks.put("e04d5364-11da-45f6-9801-c50ad5eb6f27", "63347e70-4a74-4bc9-bad6-0c0cf1b2fd89"); //严重心律失常 ---严重心血管系统疾病
	148	+ highRisks.put("4ec114d7-9c78-4dfc-878c-1139ef3ff04c", "5a40c73c422b03d4ad2bf7bf"); //骨盆狭窄或产道畸形，--- 生殖道畸形和骨盆狭小
148	149	}
149	150
150	151	@ResponseBody
...	...	@@ -1648,6 +1649,10 @@
1648	1649	patientRisk.remove(key);
1649	1650	if (!patientRisk.contains(highRisks.get(key))) {
1650	1651	patientRisk.add(highRisks.get(key));
	1652	+ //骨盆狭窄或产道畸形
	1653	+ if(key.equals("4ec114d7-9c78-4dfc-878c-1139ef3ff04c")){
	1654	+ patientRisk.add("5a40c747422b03d4ad2bf7c0");
	1655	+ }
1651	1656	modCount++;
1652	1657	}
1653	1658	}