jiangjiazhi / regional-platform

Authored by liquanyu almost 3 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 24 additions and 0 deletions

...	...	@@ -7,10 +7,28 @@
7	7	public class CancersConfig extends BaseModel {
8	8	private String id;
9	9	private String areaId; //区域id
	10	+ private String cityId; //市id
	11	+ private String provinceId; //省域id
10	12	private Integer year;//年度
11	13	private Integer quarter; //季度
12	14	private Integer num; //任务数
13	15	private Integer type;//1 宫颈癌 2 乳腺癌
	16	+
	17	+ public String getCityId() {
	18	+ return cityId;
	19	+ }
	20	+
	21	+ public void setCityId(String cityId) {
	22	+ this.cityId = cityId;
	23	+ }
	24	+
	25	+ public String getProvinceId() {
	26	+ return provinceId;
	27	+ }
	28	+
	29	+ public void setProvinceId(String provinceId) {
	30	+ this.provinceId = provinceId;
	31	+ }
14	32
15	33	public Integer getType() {
16	34	return type;

...	...	@@ -1018,11 +1018,17 @@
1018	1018	for (CancersConfig config : list)
1019	1019	{
1020	1020	Map data = new HashMap();
	1021	+ data.put("id",config.getId());
1021	1022	data.put("year",config.getYear());
1022	1023	data.put("num",config.getNum());
1023	1024	data.put("quarter",config.getQuarter());
1024	1025	data.put("type",config.getType() == 1 ? "宫颈癌" : "乳腺癌");
1025	1026	data.put("areaName",basicConfigService.getOneBasicConfigById(config.getAreaId()).getName());
	1027	+ data.put("cityName",basicConfigService.getOneBasicConfigById(config.getCityId()).getName());
	1028	+ data.put("provinceName",basicConfigService.getOneBasicConfigById(config.getProvinceId()).getName());
	1029	+ data.put("areaId",config.getAreaId());
	1030	+ data.put("cityId",config.getCityId());
	1031	+ data.put("provinceId",config.getProvinceId());
1026	1032	datas.add(data);
1027	1033	}
1028	1034	}