jiangjiazhi / regional-platform

Authored by liquanyu over 8 years ago

Exists in master and in 8 other branches

Showing 5 changed files with 12 additions and 9 deletions

...	...	@@ -54,7 +54,11 @@
54	54	WritableCellFormat title1 = new WritableCellFormat(font1);
55	55	title1.setAlignment(jxl.format.Alignment.CENTRE);
56	56
	57	+ WritableFont contentFont = new WritableFont(WritableFont.ARIAL, 12, WritableFont.NO_BOLD, false, UnderlineStyle.NO_UNDERLINE, Colour.BLACK);
	58	+ WritableCellFormat contentFormt = new WritableCellFormat(contentFont);
	59	+ contentFormt.setAlignment(jxl.format.Alignment.CENTRE);
57	60
	61	+
58	62	// 设置列宽
59	63	for (int j = 0, columLen = columName.size(); j < columLen; j++)
60	64	{
...	...	@@ -79,7 +83,7 @@
79	83	ws.addCell(new Label(22, 0, "居住地", wcf));
80	84
81	85	ws.mergeCells(5, 0, 12, 0);
82		-
	86	+ ws.addCell(new Label(5, 1, "乙肝表面抗原", title1));
83	87	ws.addCell(new Label(6, 1, "乙肝表面抗体", title1));
84	88	ws.addCell(new Label(7, 1, "乙肝e抗原", title1));
85	89	ws.addCell(new Label(8, 1, "乙肝e抗体", title1));
...	...	@@ -102,8 +106,7 @@
102	106	keyName = ite.next();
103	107	// 第一行列名
104	108	keyORvalue = map.get(keyName) == null?"": map.get(keyName).toString();
105		- keyName = columName.get(keyName);
106		- ws.addCell(new Label(j, 2 + i, keyORvalue));
	109	+ ws.addCell(new Label(j, 2 + i, keyORvalue,contentFormt));
107	110	j++;
108	111	}
109	112	}

...	...	@@ -783,7 +783,7 @@
783	783	}
784	784	}
785	785	out = response.getOutputStream();
786		- Map<String,String> cnames = new HashMap<>();
	786	+ Map<String,String> cnames = new LinkedHashMap<>();
787	787
788	788	//1转入
789	789	if ("1".equals(applyOrderQueryRequest.getAction()))
...	...	@@ -871,7 +871,7 @@
871	871	}
872	872	}
873	873	out = response.getOutputStream();
874		- Map<String,String> cnames = new HashMap<>();
	874	+ Map<String,String> cnames = new LinkedHashMap<>();
875	875
876	876	//1转入
877	877	if ("1".equals(orderQueryRequest.getAction()))

...	...	@@ -1903,8 +1903,7 @@
1903	1903	}
1904	1904	}
1905	1905	OutputStream out = httpServletResponse.getOutputStream();
1906		- Map<String,String> cnames = new HashMap<>();
1907		- cnames.put("highRisk", "是否健康");
	1906	+ Map<String,String> cnames = new LinkedHashMap<>();
1908	1907	cnames.put("sex","性别");
1909	1908	cnames.put("babyName","儿童姓名");
1910	1909	cnames.put("birthday", "儿童生日");
...	...	@@ -1914,6 +1913,7 @@
1914	1913	cnames.put("nextDate","下次预约时间");
1915	1914	cnames.put("monthAge","月龄");
1916	1915	cnames.put("diagnose","高危诊断");
	1916	+ cnames.put("highRisk", "是否健康");
1917	1917	httpServletResponse.setContentType("application/octet-stream");
1918	1918	httpServletResponse.setCharacterEncoding("UTF-8");
1919	1919	httpServletResponse.setHeader("Content-Disposition", "attachment;fileName="+"childDatas.xls");

...	...	@@ -648,7 +648,7 @@
648	648	try {
649	649	BaseListResponse listResponse = null;
650	650	List<Map<String, Object>> datas = new ArrayList<>();
651		- Map<String, String> cnames = new HashMap<>();
	651	+ Map<String, String> cnames = new LinkedHashMap<>();
652	652	if (patientsQueryRequest.getQueryType() != null) {
653	653	// 0 高危孕妇 1 全部孕妇 2全部产妇
654	654	if (patientsQueryRequest.getQueryType() == 0) {

...	...	@@ -261,7 +261,7 @@
261	261	}
262	262	}
263	263	OutputStream out = response.getOutputStream();
264		- Map<String,String> cnames = new HashMap<>();
	264	+ Map<String,String> cnames = new LinkedHashMap<>();
265	265	cnames.put("name", "姓名");
266	266	cnames.put("cDueWeek","当前孕周");
267	267	cnames.put("tireNumber","胎数");