jiangjiazhi / regional-platform

Commit 0bb804549e56b71159e3e109f251da7ec74c6c06

Authored by liquanyu almost 4 years ago

Exists in master and in 6 other branches

update

Showing 10 changed files with 102 additions and 2 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.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/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BasicConfigResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java

...	...	@@ -211,6 +211,8 @@
211	211
212	212	//诊断
213	213	private String diagnose;
	214	+ //诊断等级
	215	+ private List<String> diagnoseLevel;
214	216	//其它诊断
215	217	private String otherDiagnose;
216	218
...	...	@@ -531,6 +533,14 @@
531	533	private String zhipJoint;
532	534	//髋关节右
533	535	private String yhipJoint;
	536	+
	537	+ public List<String> getDiagnoseLevel() {
	538	+ return diagnoseLevel;
	539	+ }
	540	+
	541	+ public void setDiagnoseLevel(List<String> diagnoseLevel) {
	542	+ this.diagnoseLevel = diagnoseLevel;
	543	+ }
534	544
535	545	public String getZhipJoint() {
536	546	return zhipJoint;

...	...	@@ -46,6 +46,17 @@
46	46
47	47	private Integer type;
48	48
	49	+
	50	+ private String level;
	51	+
	52	+ public String getLevel() {
	53	+ return level;
	54	+ }
	55	+
	56	+ public void setLevel(String level) {
	57	+ this.level = level;
	58	+ }
	59	+
49	60	public Integer getType() {
50	61	return type;
51	62	}

...	...	@@ -474,6 +474,12 @@
474	474
475	475	model.setOtherDiagnose(JsonUtil.array2JsonString(request.getOtherDiagnose()));
476	476	model.setDiagnose(JsonUtil.array2JsonString(request.getDiagnose()));
	477	+
	478	+ if (CollectionUtils.isNotEmpty(request.getDiagnose()))
	479	+ {
	480	+ model.setDiagnoseLevel(getBabyDiagnoseLevel(request.getDiagnose()));
	481	+ }
	482	+
477	483	model.setHandlSuggest(request.getHandlSuggest());
478	484	model.setGuideSuggest(request.getGuideSuggest());
479	485	model.setCheckDoctor(request.getCheckDoctor());
...	...	@@ -572,6 +578,26 @@
572	578	return model;
573	579	}
574	580
	581	+
	582	+ public List<String> getBabyDiagnoseLevel(List<String> diagnoses)
	583	+ {
	584	+ if (CollectionUtils.isNotEmpty(diagnoses))
	585	+ {
	586	+ List<String> list = new ArrayList<>();
	587	+
	588	+ for (String dia : diagnoses)
	589	+ {
	590	+ BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(dia);
	591	+ if (basicConfig != null && StringUtils.isNotEmpty(basicConfig.getLevel()))
	592	+ {
	593	+ list.add(basicConfig.getLevel());
	594	+ }
	595	+ }
	596	+ }
	597	+ return null;
	598	+ }
	599	+
	600	+
575	601	/**
576	602	* 添加儿保检查
577	603	*
...	...	@@ -2108,6 +2134,7 @@
2108	2134	Map <String, String> map = new HashMap <>();
2109	2135	map.put("id", datas.get(0).getId());
2110	2136	map.put("name", datas.get(0).getName());
	2137	+ map.put("level", datas.get(0).getLevel());
2111	2138	list.add(map);
2112	2139	} else if (CollectionUtils.isEmpty(datas)) {//秦皇岛诊断内容是高危内容，如果不是诊断就判断是高危内容
2113	2140	BasicConfigQuery basicConfigQuery1 = new BasicConfigQuery();
...	...	@@ -2118,6 +2145,7 @@
2118	2145	Map <String, String> map = new HashMap <>();
2119	2146	map.put("id", datas2.get(0).getId());
2120	2147	map.put("name", datas2.get(0).getName());
	2148	+ map.put("level", datas2.get(0).getLevel());
2121	2149	list.add(map);
2122	2150	}
2123	2151	}

...	...	@@ -243,6 +243,7 @@
243	243	obj.setTypeId(basicConfigUpdateRequest.getTypeId());
244	244	obj.setScore(basicConfigUpdateRequest.getScore());
245	245	obj.setDescribe(basicConfigUpdateRequest.getDesc());
	246	+ obj.setLevel(basicConfigUpdateRequest.getLevel());
246	247	BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
247	248	basicConfigQuery.setId(basicConfigUpdateRequest.getId());
248	249	basicConfigQuery.setYn(YnEnums.YES.getId());

...	...	@@ -6121,10 +6121,14 @@
6121	6121	model.setOtherUrine(checkModel.getOtherUrine());
6122	6122	String diagnoseStr = checkModel.getDiagnose();
6123	6123	String diagnoseValue = "";
	6124	+ List<Map> diagnoseList = new ArrayList<>();
6124	6125	if (!com.lyms.platform.common.utils.StringUtils.isEmpty(diagnoseStr)) {
6125	6126	List diagnoses = JsonUtil.toList(diagnoseStr, List.class);
6126	6127	for (int i = 0; i < diagnoses.size(); i++) {
6127	6128	if (diagnoses.get(i) != null) {
	6129	+
	6130	+ Map data = new HashMap();
	6131	+
6128	6132	BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
6129	6133	basicConfigQuery.setYn(YnEnums.YES.getId());
6130	6134	basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID);
...	...	@@ -6136,6 +6140,9 @@
6136	6140	} else {
6137	6141	diagnoseValue += datas.get(0).getName();
6138	6142	}
	6143	+ data.put("name",datas.get(0).getName());
	6144	+ data.put("level",datas.get(0).getLevel());
	6145	+ diagnoseList.add(data);
6139	6146	} else if (CollectionUtils.isEmpty(datas)) {
6140	6147	BasicConfigQuery basicConfigQuery2 = new BasicConfigQuery();
6141	6148	basicConfigQuery2.setYn(YnEnums.YES.getId());
...	...	@@ -6147,6 +6154,9 @@
6147	6154	} else {
6148	6155	diagnoseValue += datas2.get(0).getName();
6149	6156	}
	6157	+ data.put("name",datas2.get(0).getName());
	6158	+ data.put("level",datas2.get(0).getLevel());
	6159	+ diagnoseList.add(data);
6150	6160	}
6151	6161	}
6152	6162	}
...	...	@@ -6154,6 +6164,7 @@
6154	6164	}
6155	6165	}
6156	6166	model.setCheckDiagnose(diagnoseValue);
	6167	+ model.setCheckDiagnoseLevel(diagnoseList);
6157	6168	model.setHandlSuggest(checkModel.getHandlSuggest());
6158	6169	model.setGuideSuggest(checkModel.getGuideSuggest());
6159	6170

...	...	@@ -24,6 +24,16 @@
24	24	private Integer score;
25	25	private String describe;
26	26
	27	+ private String level;
	28	+
	29	+ public String getLevel() {
	30	+ return level;
	31	+ }
	32	+
	33	+ public void setLevel(String level) {
	34	+ this.level = level;
	35	+ }
	36	+
27	37	public Integer getWeight() {
28	38	return weight;
29	39	}
...	...	@@ -101,6 +111,7 @@
101	111	basicConfig.setParentId(parentId);
102	112	basicConfig.setYn(YnEnums.YES.getId());
103	113	basicConfig.setEnable(1);
	114	+ basicConfig.setLevel(level);
104	115	return basicConfig;
105	116	}
106	117	}

...	...	@@ -19,9 +19,19 @@
19	19
20	20	private String leastUse;
21	21
	22	+ private String level;
	23	+
22	24	//权重
23	25	private Integer weight;
24	26	private List childConfigs;
	27	+
	28	+ public String getLevel() {
	29	+ return level;
	30	+ }
	31	+
	32	+ public void setLevel(String level) {
	33	+ this.level = level;
	34	+ }
25	35
26	36	public String getLeastUse() {
27	37	return leastUse;

...	...	@@ -414,6 +414,7 @@
414	414
415	415	//检查诊断
416	416	private String checkDiagnose;
	417	+ private List<Map> checkDiagnoseLevel;
417	418
418	419	//处理意见
419	420	private String handlSuggest;
...	...	@@ -702,6 +703,13 @@
702	703	//髋关节右
703	704	private String yhipJoint;
704	705
	706	+ public List<Map> getCheckDiagnoseLevel() {
	707	+ return checkDiagnoseLevel;
	708	+ }
	709	+
	710	+ public void setCheckDiagnoseLevel(List<Map> checkDiagnoseLevel) {
	711	+ this.checkDiagnoseLevel = checkDiagnoseLevel;
	712	+ }
705	713
706	714	public String getZhipJoint() {
707	715	return zhipJoint;

...	...	@@ -14,11 +14,20 @@
14	14	private String name;
15	15	private String parentName;
16	16	private String desc;
	17	+ private String level;
17	18	//权重
18	19	private Integer weight;
19	20
20	21	private List leastUse;
21	22
	23	+ public String getLevel() {
	24	+ return level;
	25	+ }
	26	+
	27	+ public void setLevel(String level) {
	28	+ this.level = level;
	29	+ }
	30	+
22	31	private List<BasicConfig> basicConfigs = new ArrayList<>();
23	32
24	33	public List<BasicConfig> getBasicConfigs() {
...	...	@@ -114,6 +123,7 @@
114	123	setParentId(destModel.getParentId());
115	124	setWeight(destModel.getWeight());
116	125	setBasicConfigs(destModel.getBasicConfigs());
	126	+ setLevel(destModel.getLevel());
117	127	return this;
118	128	}
119	129	}

...	...	@@ -928,7 +928,7 @@
928	928	}
929	929
930	930	//预约时间冗余到下次产检时间
931		- if (trackDown.getTrackDownDateType() == TrackDownDateEnums.C.getId())
	931	+ if (trackDown.getTrackDownDateType() == TrackDownDateEnums.C.getId() \|\| trackDown.getTrackDownDateType() == TrackDownDateEnums.I.getId())
932	932	{
933	933	trackDownRecord1.setNextCheckTime(trackDown.getReservatDate());
934	934	}
...	...	@@ -1007,7 +1007,7 @@
1007	1007	.convertToNativeUpdate(ReflectionUtils.getUpdateField(record));
1008	1008	mongoTemplate.updateFirst(query, update, TrackCountRecord.class);
1009	1009	}
1010		- if (trackDown.getTrackDownDateType() == TrackDownDateEnums.C.getId())
	1010	+ if (trackDown.getTrackDownDateType() == TrackDownDateEnums.C.getId() \|\| trackDown.getTrackDownDateType() == TrackDownDateEnums.I.getId())
1011	1011	{
1012	1012	String fid = "";
1013	1013	List<AntenatalExaminationModel> examinationModel = mongoTemplate.find(Query.query(Criteria.where("pid").is(patients.getPid()).