jiangjiazhi / regional-platform | GitLab

Commit 80b07690b6019b98ed63641bb9dd36a3c6d143a6

Authored by liquanyu almost 8 years ago

1 parent 7238480c3b

Exists in master and in 6 other branches

update code

Showing 3 changed files with 5 additions and 2 deletions

platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/LisHandleTask.java

...	...	@@ -309,7 +309,9 @@
309	309	#{hospitalId}
310	310	</foreach>
311	311	</if>
312		-
	312	+ <if test="status != null">
	313	+ AND PUBLISH_TIME >= date_format(#{publishTime},'%Y-%m-%d')
	314	+ </if>
313	315	<if test="status != null">
314	316	AND STATUS=#{status}
315	317	</if>

...	...	@@ -671,6 +671,7 @@
671	671	public Map<String,Object> getNoSendLis(Integer page, Integer limit) {
672	672
673	673	LisReportQuery query = new LisReportQuery();
	674	+ query.setPublishTime(new Date());
674	675	query.setPage(page);
675	676	query.setLimit(limit);
676	677	query.setNeed("true");

...	...	@@ -63,7 +63,7 @@
63	63	map.put("vcCardNo", pat.getVcCardNo());
64	64	map.put("name",pat.getUsername());
65	65	map.put("phone",pat.getPhone());
66		- map.put("checkTime",lisReportModel.getCheckTime() == null ? DateUtil.getyyyy_MM_dd_hms(lisReportModel.getPublishTime())
	66	+ map.put("checkTime",lisReportModel.getPublishTime() == null ? DateUtil.getyyyy_MM_dd_hms(lisReportModel.getCheckTime())
67	67	: DateUtil.getyyyy_MM_dd_hms(lisReportModel.getCheckTime()));
68	68	map.put("patientId",patientId);
69	69	map.put("hospitalId",lisReportModel.getHospitalId());