jiangjiazhi / regional-platform | GitLab

Commit f3dd2fb256cbd0b38c2ec3b3ed5fb146dfb9783c

Authored by liquanyu over 7 years ago

1 parent 8323fe26bb

Exists in master and in 6 other branches

update code

Showing 4 changed files with 10 additions and 5 deletions

platform-biz-service/src/main/resources/mainOrm/master/MeasureInfoMapper.xml
platform-dal/src/main/java/com/lyms/platform/query/MeasureInfoQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java

...	...	@@ -174,6 +174,10 @@
174	174	AND <![CDATA[ record_time <= date_format(#{recordTimeEnd},'%Y-%m-%d') ]]>
175	175	</if>
176	176
	177	+ <if test="queryNo != null and queryNo != ''">
	178	+ and (phone = #{queryNo,jdbcType=VARCHAR} or cert_no = #{queryNo,jdbcType=VARCHAR} or user_name = #{queryNo,jdbcType=VARCHAR})
	179	+ </if>
	180	+
177	181	</where>
178	182	</sql>
179	183	</mapper>

...	...	@@ -38,7 +38,7 @@
38	38
39	39	//脉搏/身高
40	40	private String valueTwo;
41		- //值类型： 1 身高、体重 2 血压和脉搏
	41	+ //值类型： 1 体重、身高 2 血压和脉搏
42	42	private Integer valueType;
43	43	//记录时间
44	44	private Date recordTimeStart;

...	...	@@ -35,11 +35,11 @@
35	35	@RequestParam("page") Integer page,
36	36	@RequestParam("limit") Integer limit,
37	37	@RequestParam("valueType") Integer valueType,
38		- @RequestParam(value = "certNo", required = false) String certNo,
	38	+ @RequestParam(value = "vcCardNo", required = false) String vcCardNo,
39	39	@RequestParam(value = "recordTime", required = false) String recordTime,
40	40	@RequestParam(value = "age", required = false) Integer age
41	41	) {
42		- return measureInfoFacade.queryMeasureInfoList(queryNo,valueType,certNo,recordTime,age,page,limit);
	42	+ return measureInfoFacade.queryMeasureInfoList(queryNo,valueType,vcCardNo,recordTime,age,page,limit);
43	43	}
44	44
45	45

...	...	@@ -28,7 +28,7 @@
28	28
29	29
30	30	public BaseListResponse queryMeasureInfoList(String queryNo,
31		- Integer valueType, String certNo,
	31	+ Integer valueType, String vcCardNo,
32	32	String recordTime, Integer age,
33	33	Integer page, Integer limit) {
34	34
...	...	@@ -38,7 +38,8 @@
38	38	query.setLimit(limit);
39	39	query.setPage(page);
40	40	query.setAge(age);
41		- query.setCertNo(certNo);
	41	+ query.setVcCardNo(vcCardNo);
	42	+ query.setSort(" created desc ");
42	43	if (StringUtils.isNotEmpty(recordTime)) {
43	44	String[] dates = recordTime.split(" - ");
44	45	query.setRecordTimeStart(DateUtil.parseYMD(dates[0]));