jiangjiazhi / regional-platform

Authored by litao@lymsh.com over 8 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 19 additions and 3 deletions

...	...	@@ -1977,6 +1977,10 @@
1977	1977	if (CollectionUtils.isNotEmpty(antExChuModels)) {
1978	1978	lastTime = DateUtil.getyyyy_MM_dd(antExChuModels.get(0).getCheckTime());
1979	1979	antexListResult.setTireNumber1(antExChuModels.get(0).getTireNumber());
	1980	+
	1981	+ antexListResult.setTreatmentOpinion2Types(mongoUtil.findPlatValues(antExChuModels.get(0).getTreatmentOpinion2Types()));
	1982	+ antexListResult.setTreatmentOpinion2(mongoUtil.findPlatList(antExChuModels.get(0).getTreatmentOpinion2()));
	1983	+
1980	1984	} else {
1981	1985	PatientsQuery patientsQuery1 = new PatientsQuery();
1982	1986	patientsQuery1.setYn(YnEnums.YES.getId());
...	...	@@ -2001,6 +2005,8 @@
2001	2005	if ((days >= 253) && days <= 258) {
2002	2006	antexListResult.setIsH("1");
2003	2007	}
	2008	+
	2009	+
2004	2010	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult);
2005	2011	}
2006	2012

...	...	@@ -21,7 +21,9 @@
21	21	private String id;
22	22
23	23	/** 处理意见 */
24		- private List<Map<String, Object>> treatmentOpinion2;
	24	+ private List<String> treatmentOpinion2;
	25	+ /** 处理意见 */
	26	+ private String treatmentOpinion2Types;
25	27
26	28	private String pid;
27	29	//名字
28	30
...	...	@@ -57,11 +59,19 @@
57	59	//<!---------基本信息----------->
58	60
59	61
60		- public List<Map<String, Object>> getTreatmentOpinion2() {
	62	+ public String getTreatmentOpinion2Types() {
	63	+ return treatmentOpinion2Types;
	64	+ }
	65	+
	66	+ public void setTreatmentOpinion2Types(String treatmentOpinion2Types) {
	67	+ this.treatmentOpinion2Types = treatmentOpinion2Types;
	68	+ }
	69	+
	70	+ public List<String> getTreatmentOpinion2() {
61	71	return treatmentOpinion2;
62	72	}
63	73
64		- public void setTreatmentOpinion2(List<Map<String, Object>> treatmentOpinion2) {
	74	+ public void setTreatmentOpinion2(List<String> treatmentOpinion2) {
65	75	this.treatmentOpinion2 = treatmentOpinion2;
66	76	}
67	77