jiangjiazhi / regional-platform

Commit bf1c9213597fd8f6a8724e0613705eb92f941f32

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

update

Showing 5 changed files with 110 additions and 29 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.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/ViewFacade.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/BabyCheckResult.java

...	...	@@ -26,9 +26,8 @@
26	26	private Integer yn;
27	27
28	28	private String buildId;
29		- //其它诊断
30		- private List<String> otherDiagnose;
31	29
	30	+
32	31	//儿保检查时间
33	32	private Date checkDate;
34	33	//月龄下拉框
...	...	@@ -181,6 +180,8 @@
181	180
182	181	//诊断
183	182	private String diagnose;
	183	+ //其它诊断
	184	+ private String otherDiagnose;
184	185
185	186	//处理意见
186	187	private String handlSuggest;
187	188
...	...	@@ -472,11 +473,11 @@
472	473	//精细运动
473	474	private String fineExercise ;
474	475
475		- public List<String> getOtherDiagnose() {
	476	+ public String getOtherDiagnose() {
476	477	return otherDiagnose;
477	478	}
478	479
479		- public void setOtherDiagnose(List<String> otherDiagnose) {
	480	+ public void setOtherDiagnose(String otherDiagnose) {
480	481	this.otherDiagnose = otherDiagnose;
481	482	}
482	483
483	484
...	...	@@ -1945,11 +1946,11 @@
1945	1946	", head='" + head + '\'' +
1946	1947	", heightWeight='" + heightWeight + '\'' +
1947	1948	", chestw='" + chestw + '\'' +
	1949	+ ", bregma='" + bregma + '\'' +
1948	1950	", growthEvaluate='" + growthEvaluate + '\'' +
1949	1951	", bilirubinHead='" + bilirubinHead + '\'' +
1950	1952	", bilirubinChest='" + bilirubinChest + '\'' +
1951	1953	", bilirubinBelly='" + bilirubinBelly + '\'' +
1952		- ", bregma='" + bregma + '\'' +
1953	1954	", tooth='" + tooth + '\'' +
1954	1955	", faceColor='" + faceColor + '\'' +
1955	1956	", skin='" + skin + '\'' +
1956	1957
...	...	@@ -1978,11 +1979,15 @@
1978	1979	", hematuria='" + hematuria + '\'' +
1979	1980	", otherUrine='" + otherUrine + '\'' +
1980	1981	", diagnose='" + diagnose + '\'' +
	1982	+ ", otherDiagnose='" + otherDiagnose + '\'' +
1981	1983	", handlSuggest='" + handlSuggest + '\'' +
1982	1984	", guideSuggest='" + guideSuggest + '\'' +
1983	1985	", checkDoctor='" + checkDoctor + '\'' +
1984	1986	", nextDate=" + nextDate +
1985	1987	", highRisk=" + highRisk +
	1988	+ ", highRiskInfo=" + highRiskInfo +
	1989	+ ", waskSon=" + waskSon +
	1990	+ ", waskSonInfo=" + waskSonInfo +
1986	1991	", modified=" + modified +
1987	1992	", created=" + created +
1988	1993	", hospitalId='" + hospitalId + '\'' +
...	...	@@ -2001,6 +2006,7 @@
2001	2006	", mtcnNum='" + mtcnNum + '\'' +
2002	2007	", xbNum='" + xbNum + '\'' +
2003	2008	", dbNum='" + dbNum + '\'' +
	2009	+ ", dbDayNum='" + dbDayNum + '\'' +
2004	2010	", qdtlTime='" + qdtlTime + '\'' +
2005	2011	", pfhrTime='" + pfhrTime + '\'' +
2006	2012	", wssAd='" + wssAd + '\'' +
...	...	@@ -2066,6 +2072,28 @@
2066	2072	", zlsc='" + zlsc + '\'' +
2067	2073	", qtfz='" + qtfz + '\'' +
2068	2074	", correctAge='" + correctAge + '\'' +
	2075	+ ", eyeAppearance='" + eyeAppearance + '\'' +
	2076	+ ", eyeRedReflex='" + eyeRedReflex + '\'' +
	2077	+ ", eyeDioptroscopy='" + eyeDioptroscopy + '\'' +
	2078	+ ", eyeAdvice='" + eyeAdvice + '\'' +
	2079	+ ", eyeGuideSuggestions='" + eyeGuideSuggestions + '\'' +
	2080	+ ", abnormalSize=" + abnormalSize +
	2081	+ ", okSize=" + okSize +
	2082	+ ", exerciseIA='" + exerciseIA + '\'' +
	2083	+ ", exerciseDQ='" + exerciseDQ + '\'' +
	2084	+ ", movementIA='" + movementIA + '\'' +
	2085	+ ", movementDQ='" + movementDQ + '\'' +
	2086	+ ", adaptationIA='" + adaptationIA + '\'' +
	2087	+ ", adaptationDQ='" + adaptationDQ + '\'' +
	2088	+ ", languageIA='" + languageIA + '\'' +
	2089	+ ", languageDQ='" + languageDQ + '\'' +
	2090	+ ", socialContactIA='" + socialContactIA + '\'' +
	2091	+ ", socialContactDQ='" + socialContactDQ + '\'' +
	2092	+ ", exercise='" + exercise + '\'' +
	2093	+ ", language='" + language + '\'' +
	2094	+ ", socialContact='" + socialContact + '\'' +
	2095	+ ", alotExercise='" + alotExercise + '\'' +
	2096	+ ", fineExercise='" + fineExercise + '\'' +
2069	2097	'}';
2070	2098	}
2071	2099	}

...	...	@@ -114,7 +114,6 @@
114	114	private BabyAfterVisitService babyAfterVisitService;
115	115
116	116	public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version");
117		- public static final String NORMAL= "正常";
118	117	/**
119	118	* 更新检查
120	119	*
...	...	@@ -214,7 +213,6 @@
214	213	model.setEndCaseTime(new Date());
215	214	}*/
216	215	//新加字段
217		- model.setOtherDiagnose(request.getOtherDiagnose());
218	216	model.setCorrectAge(request.getCorrectAge());
219	217	model.setTcType(request.getTcType());
220	218	model.setCnqk(request.getCnqk());
...	...	@@ -371,6 +369,7 @@
371	369	model.setHematuria(request.getHematuria());
372	370	model.setOtherUrine(request.getOtherUrine());
373	371
	372	+ model.setOtherDiagnose(JsonUtil.array2JsonString(request.getOtherDiagnose()));
374	373	model.setDiagnose(JsonUtil.array2JsonString(request.getDiagnose()));
375	374	model.setHandlSuggest(request.getHandlSuggest());
376	375	model.setGuideSuggest(request.getGuideSuggest());
...	...	@@ -1538,7 +1537,6 @@
1538	1537	model.setOutcome(babyMode.getOutcome());
1539	1538	}
1540	1539	}
1541		- model.setOtherDiagnose(checkModel.getOtherDiagnose());
1542	1540	model.setTcType(checkModel.getTcType());
1543	1541	model.setCnqk(checkModel.getCnqk());
1544	1542	model.setMtcnNum(checkModel.getMtcnNum());
1545	1543
...	...	@@ -1711,9 +1709,30 @@
1711	1709	}
1712	1710	}
1713	1711	model.setDiagnose(list);
	1712	+ String otherDiagnoseStr = checkModel.getOtherDiagnose();
	1713	+ if (!StringUtils.isEmpty(otherDiagnoseStr)) {
	1714	+ List otherDiagnoses = JsonUtil.toList(otherDiagnoseStr, List.class);
	1715	+ for (Object obj : otherDiagnoses) {
	1716	+ if (obj != null) {
	1717	+ BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
	1718	+ basicConfigQuery.setYn(YnEnums.YES.getId());
	1719	+ basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID);
	1720	+ basicConfigQuery.setId(String.valueOf(obj));
	1721	+ List<BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
	1722	+ if (CollectionUtils.isNotEmpty(datas)) {
	1723	+ Map<String, String> map = new HashMap<>();
	1724	+ map.put("id", datas.get(0).getId());
	1725	+ map.put("name", datas.get(0).getName());
	1726	+ list.add(map);
	1727	+ }
	1728	+ }
	1729	+
	1730	+ }
	1731	+ }
	1732	+ model.setOtherDiagnose(list);
	1733	+
1714	1734	model.setHandlSuggest(checkModel.getHandlSuggest());
1715	1735	model.setGuideSuggest(checkModel.getGuideSuggest());
1716		-
1717	1736	if (StringUtils.isNotEmpty(checkModel.getCheckDoctor())) {
1718	1737	Users users = usersService.getUsers(Integer.parseInt(checkModel.getCheckDoctor()));
1719	1738	if (users != null) {
...	...	@@ -1837,7 +1856,7 @@
1837	1856	} else if (model.getPtwoDs() >= weight && weight > model.getPoneDs()) {
1838	1857	res = "中+";
1839	1858	} else if (model.getPoneDs() >= weight && weight >= model.getRoneDs()) {
1840		- res = "中";
	1859	+ res = "正常";
1841	1860	} else if (model.getRoneDs() > weight && weight >= model.getRtwoDs()) {
1842	1861	res = "中-";
1843	1862	} else if (model.getRtwoDs() > weight && weight >= model.getRthreeDs()) {
1844	1863
1845	1864
1846	1865
...	...	@@ -2194,15 +2213,15 @@
2194	2213	if (model.getPthreeDs() <= value) {
2195	2214	res = "上";
2196	2215	} else if (model.getPthreeDs() > value && value >= model.getPtwoDs()) {
2197		- res = NORMAL+"上";
	2216	+ res = "中上";
2198	2217	} else if (model.getPtwoDs() > value && value >= model.getPoneDs()) {
2199		- res = NORMAL+"+";
	2218	+ res = "中+";
2200	2219	} else if (model.getPoneDs() > value && value > model.getRoneDs()) {
2201	2220	res = "正常";
2202	2221	} else if (model.getRoneDs() >= value && value > model.getRtwoDs()) {
2203		- res = NORMAL+"-";
	2222	+ res = "中-";
2204	2223	} else if (model.getRtwoDs() >= value && value > model.getRthreeDs()) {
2205		- res = NORMAL+"下";
	2224	+ res = "中下";
2206	2225	} else if (model.getRtwoDs() >= value) {
2207	2226	res = "下";
2208	2227	}
2209	2228
2210	2229
2211	2230
...	...	@@ -2234,15 +2253,15 @@
2234	2253	if (model.getPthreeDs() < value) {
2235	2254	res = "上";
2236	2255	} else if (model.getPthreeDs() >= value && value > model.getPtwoDs()) {
2237		- res = NORMAL+"上";
	2256	+ res = "中上";
2238	2257	} else if (model.getPtwoDs() >= value && value > model.getPoneDs()) {
2239		- res = NORMAL+"+";
	2258	+ res = "中+";
2240	2259	} else if (model.getPoneDs() >= value && value >= model.getRoneDs()) {
2241	2260	res = "正常";
2242	2261	} else if (model.getRoneDs() > value && value >= model.getRtwoDs()) {
2243		- res = NORMAL+"-";
	2262	+ res = "中-";
2244	2263	} else if (model.getRtwoDs() > value && value >= model.getRthreeDs()) {
2245		- res = NORMAL+"下";
	2264	+ res = "中下";
2246	2265	} else if (model.getRtwoDs() > value) {
2247	2266	res = "下";
2248	2267	}
2249	2268
2250	2269
2251	2270
2252	2271
...	...	@@ -2279,15 +2298,15 @@
2279	2298	if (model.getPthreeDs() < value) {
2280	2299	res = "上";
2281	2300	} else if (model.getPthreeDs() >= value && value > model.getPtwoDs()) {
2282		- res = NORMAL+"上";
	2301	+ res = "中上";
2283	2302	} else if (model.getPtwoDs() >= value && value > model.getPoneDs()) {
2284		- res = NORMAL+"+";
	2303	+ res = "中+";
2285	2304	} else if (model.getPoneDs() >= value && value >= model.getRoneDs()) {
2286		- res = NORMAL;
	2305	+ res = "正常";
2287	2306	} else if (model.getRoneDs() > value && value >= model.getRtwoDs()) {
2288		- res = NORMAL+"-";
	2307	+ res = "中-";
2289	2308	} else if (model.getRtwoDs() > value && value >= model.getRthreeDs()) {
2290		- res = NORMAL+"下";
	2309	+ res = "中下";
2291	2310	} else if (model.getRtwoDs() > value) {
2292	2311	res = "下";
2293	2312	}
...	...	@@ -2329,7 +2348,7 @@
2329	2348	} else if (model.getPtwoDs() >= value && value > model.getPoneDs()) {
2330	2349	res = "中+";
2331	2350	} else if (model.getPoneDs() >= value && value >= model.getRoneDs()) {
2332		- res = "中";
	2351	+ res = "正常";
2333	2352	} else if (model.getRoneDs() > value && value >= model.getRtwoDs()) {
2334	2353	res = "中-";
2335	2354	} else if (model.getRtwoDs() > value && value >= model.getRthreeDs()) {

...	...	@@ -5260,6 +5260,31 @@
5260	5260
5261	5261	model.setBuildDiagnose(buildDiagnose);
5262	5262
	5263	+ String checkOtherDiagnose = "";
	5264	+ String checkOtherDiagnoseStr = babyModel.getDiagnose();
	5265	+ if (!com.lyms.platform.common.utils.StringUtils.isEmpty(checkOtherDiagnoseStr)) {
	5266	+ List checkOthers = JsonUtil.toList(checkOtherDiagnoseStr, List.class);
	5267	+ for (int i = 0; i < checkOthers.size(); i++) {
	5268	+ if (checkOthers.get(i) != null) {
	5269	+ BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
	5270	+ basicConfigQuery.setYn(YnEnums.YES.getId());
	5271	+ basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID);
	5272	+ basicConfigQuery.setId(String.valueOf(checkOthers.get(i)));
	5273	+ List<BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
	5274	+ if (CollectionUtils.isNotEmpty(datas)) {
	5275	+ if (i != checkOthers.size() - 1) {
	5276	+ checkOtherDiagnose += datas.get(0).getName() + ",";
	5277	+ } else {
	5278	+ checkOtherDiagnose += datas.get(0).getName();
	5279	+ }
	5280	+ }
	5281	+ }
	5282	+
	5283	+ }
	5284	+ }
	5285	+ model.setCheckOtherDiagnose(checkOtherDiagnose);
	5286	+
	5287	+
5263	5288	//母亲是否高危
5264	5289	if (!com.lyms.platform.common.utils.StringUtils.isEmpty(babyModel.getMcertNo())) {
5265	5290

...	...	@@ -36,6 +36,7 @@
36	36
37	37	//建档诊断
38	38	private String buildDiagnose;
	39	+ private String checkOtherDiagnose;
39	40
40	41	//备注
41	42	private String remark;
...	...	@@ -511,6 +512,14 @@
511	512
512	513
513	514	private List<String> messages;
	515	+
	516	+ public String getCheckOtherDiagnose() {
	517	+ return checkOtherDiagnose;
	518	+ }
	519	+
	520	+ public void setCheckOtherDiagnose(String checkOtherDiagnose) {
	521	+ this.checkOtherDiagnose = checkOtherDiagnose;
	522	+ }
514	523
515	524	public List<String> getMessages() {
516	525	return messages;

...	...	@@ -8,9 +8,8 @@
8	8	*/
9	9	public class BabyCheckResult {
10	10	private String id;
11		- //其它诊断
12		- private List<String> otherDiagnose;
13	11
	12	+
14	13	// 血红蛋白券
15	14	private String hemoglobinCoupon;
16	15
...	...	@@ -183,7 +182,8 @@
183	182
184	183	//诊断
185	184	private List<Map<String, String>> diagnose;
186		-
	185	+ //其它诊断
	186	+ private List<Map<String, String>> otherDiagnose;
187	187	//处理意见
188	188	private String handlSuggest;
189	189
190	190
...	...	@@ -438,11 +438,11 @@
438	438	private Integer okSize;
439	439	private Integer abnormalSize;
440	440
441		- public List<String> getOtherDiagnose() {
	441	+ public List<Map<String, String>> getOtherDiagnose() {
442	442	return otherDiagnose;
443	443	}
444	444
445		- public void setOtherDiagnose(List<String> otherDiagnose) {
	445	+ public void setOtherDiagnose(List<Map<String, String>> otherDiagnose) {
446	446	this.otherDiagnose = otherDiagnose;
447	447	}
448	448