changpengfei / talkonline

Authored by shiyang about 3 years ago

Exists in master

Showing 3 changed files with 7 additions and 5 deletions

...	...	@@ -14,6 +14,7 @@
14	14	import org.springframework.validation.annotation.Validated;
15	15	import org.springframework.web.bind.annotation.*;
16	16
	17	+import java.util.Date;
17	18	import java.util.List;
18	19
19	20	/**
...	...	@@ -42,9 +43,9 @@
42	43	query.eq("up_type", hisInfo.getUpType());
43	44	}
44	45	if(StringUtil.isNotEmpty(hisInfo.getSynthesisQuery())){
45		- query.and(wrapper -> wrapper .like("name", hisInfo.getName())
46		- .or().eq("phone", hisInfo.getPhone())
47		- .or().eq("idCard", hisInfo.getIdcard()));
	46	+ query.and(wrapper -> wrapper .like("name", hisInfo.getSynthesisQuery())
	47	+ .or().eq("phone", hisInfo.getSynthesisQuery())
	48	+ .or().eq("idCard", hisInfo.getSynthesisQuery()));
48	49	}
49	50	if(StringUtil.isNotEmpty(hisInfo.getStartCreatedtime())){
50	51	query.ge("createdtime", hisInfo.getStartCreatedtime());
...	...	@@ -71,6 +72,7 @@
71	72	baseResponse.setErrormsg(result);
72	73	}else {
73	74	lymsHisInfo.setUpType(1);
	75	+ lymsHisInfo.setUpTime(new Date());
74	76	final boolean b = lymsHisInfoService.updateById(lymsHisInfo);
75	77	if(b){
76	78	baseResponse.setErrorcode(0);

...	...	@@ -96,7 +96,7 @@
96	96	/**
97	97	* 上传时间
98	98	*/
99		- @TableField(value = "up_time",fill = FieldFill.UPDATE)
	99	+ @TableField(value = "up_time")
100	100	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
101	101	private Date upTime;
102	102

...	...	@@ -114,7 +114,7 @@
114	114	}
115	115	}
116	116	//如果有疾病在数据库中不存在,则都不予上传
117		- if(diagnoses.length-1!=diagnoseIds.size()){
	117	+ if(diagnoses.length!=diagnoseIds.size()){
118	118	return "疾病不存在，请在设置-字典管理中添加疾病："+lymsHisInfo.getDiagnose();
119	119	}
120	120	//患者(身份证)