jiangjiazhi / regional-platform

Authored by liquanyu almost 8 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 7 additions and 7 deletions

...	...	@@ -177,7 +177,7 @@
177	177	AND record_time >= date_format(#{recordTimeStart},'%Y-%m-%d')
178	178	</if>
179	179	<if test="recordTimeEnd != null">
180		- AND <![CDATA[ record_time <= date_format(#{recordTimeEnd},'%Y-%m-%d') ]]>
	180	+ AND <![CDATA[ record_time < date_format(#{recordTimeEnd},'%Y-%m-%d') ]]>
181	181	</if>
182	182
183	183	<if test="queryNo != null and queryNo != ''">

...	...	@@ -49,7 +49,7 @@
49	49	String[] dates = recordTime.split(" - ");
50	50	query.setRecordTimeStart(DateUtil.parseYMD(dates[0]));
51	51	if (dates.length == 2) {
52		- query.setRecordTimeEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
	52	+ query.setRecordTimeEnd(DateUtil.addDay(DateUtil.parseYMD(dates[1]),1));
53	53	}
54	54	}
55	55	List<MeasureInfoModel> list = mysqlMeasureInfoService.queryMeasureInfoList(query);
56	56
...	...	@@ -75,10 +75,10 @@
75	75	result.setRecordCount(model.getRecordCount());
76	76	result.setRecordTime(DateUtil.getyyyy_MM_dd(model.getRecordTime()));
77	77	result.setSex(SexEnum.getTextById(model.getSex()));
78		- result.setAge(model.getAge());
	78	+ result.setAge(model.getAge() == null ? "--" : String.valueOf(model.getAge()));
79	79	result.setValueOne(model.getValueOne());
80	80	result.setValueTwo(model.getValueTwo());
81		- result.setVcCardNo(model.getVcCardNo());
	81	+ result.setVcCardNo(model.getVcCardNo() == null ? "--" : model.getVcCardNo());
82	82	result.setWxXode(model.getWxCode());
83	83	result.setPhone(model.getPhone());
84	84	results.add(result);

...	...	@@ -14,7 +14,7 @@
14	14	//性别
15	15	private String sex;
16	16	//年龄
17		- private Integer age;
	17	+ private String age;
18	18	//就诊卡号
19	19	private String vcCardNo;
20	20	//血压/体重
21	21
...	...	@@ -148,11 +148,11 @@
148	148	this.hospitalId = hospitalId;
149	149	}
150	150
151		- public Integer getAge() {
	151	+ public String getAge() {
152	152	return age;
153	153	}
154	154
155		- public void setAge(Integer age) {
	155	+ public void setAge(String age) {
156	156	this.age = age;
157	157	}
158	158	}