From 7b7da9dd57aa8f28b20623d2b53a04436cd539c8 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 13 Jul 2017 14:31:20 +0800 Subject: [PATCH] update code --- .../platform/permission/model/LisReportQuery.java | 158 ++++++++++----------- .../permission/service/impl/LisServiceImpl.java | 2 +- .../main/resources/mainOrm/master/MasterLis.xml | 4 +- .../platform/operate/web/facade/LisFacade.java | 4 +- .../src/main/webapp/WEB-INF/web.xml | 4 +- 5 files changed, 85 insertions(+), 87 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.java index 02b93e8..839d9c8 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.java @@ -37,11 +37,11 @@ public class LisReportQuery extends BaseQuery { // 患者性别 private String sex; // 送检日期 - private Date applyTime; + private String applyTime; // 检验时间 - private Date checkTime; + private String checkTime; // 报告发布时间 - private Date publishTime; + private String publishTime; // 送检医生 private String applyDoctor; // 送检科室 @@ -49,9 +49,9 @@ public class LisReportQuery extends BaseQuery { // 检验员 private String checker; // 最后修改时间 - private Date modified; + private String modified; // 创建时间 - private Date created; + private String created; // 医院id private String hospitalId; @@ -73,70 +73,6 @@ public class LisReportQuery extends BaseQuery { //检验明细json private String itemJson; - public List getTitles() { - return titles; - } - - public void setTitles(List titles) { - this.titles = titles; - } - - public List getPhones() { - return phones; - } - - public void setPhones(List phones) { - this.phones = phones; - } - - public List getHospitalIds() { - return hospitalIds; - } - - public void setHospitalIds(List hospitalIds) { - this.hospitalIds = hospitalIds; - } - - public List getVcCardNos() { - return vcCardNos; - } - - public void setVcCardNos(List vcCardNos) { - this.vcCardNos = vcCardNos; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public String getItemJson() { - return itemJson; - } - - public void setItemJson(String itemJson) { - this.itemJson = itemJson; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public List getItems() { - return items; - } - - public void setItems(List items) { - this.items = items; - } - public Integer getId() { return id; } @@ -161,6 +97,14 @@ public class LisReportQuery extends BaseQuery { this.title = title; } + public List getTitles() { + return titles; + } + + public void setTitles(List titles) { + this.titles = titles; + } + public String getType() { return type; } @@ -177,6 +121,14 @@ public class LisReportQuery extends BaseQuery { this.vcCardNo = vcCardNo; } + public List getVcCardNos() { + return vcCardNos; + } + + public void setVcCardNos(List vcCardNos) { + this.vcCardNos = vcCardNos; + } + public String getName() { return name; } @@ -209,27 +161,27 @@ public class LisReportQuery extends BaseQuery { this.sex = sex; } - public Date getApplyTime() { + public String getApplyTime() { return applyTime; } - public void setApplyTime(Date applyTime) { + public void setApplyTime(String applyTime) { this.applyTime = applyTime; } - public Date getCheckTime() { + public String getCheckTime() { return checkTime; } - public void setCheckTime(Date checkTime) { + public void setCheckTime(String checkTime) { this.checkTime = checkTime; } - public Date getPublishTime() { + public String getPublishTime() { return publishTime; } - public void setPublishTime(Date publishTime) { + public void setPublishTime(String publishTime) { this.publishTime = publishTime; } @@ -257,19 +209,19 @@ public class LisReportQuery extends BaseQuery { this.checker = checker; } - public Date getModified() { + public String getModified() { return modified; } - public void setModified(Date modified) { + public void setModified(String modified) { this.modified = modified; } - public Date getCreated() { + public String getCreated() { return created; } - public void setCreated(Date created) { + public void setCreated(String created) { this.created = created; } @@ -281,6 +233,54 @@ public class LisReportQuery extends BaseQuery { this.hospitalId = hospitalId; } + public List getHospitalIds() { + return hospitalIds; + } + + public void setHospitalIds(List hospitalIds) { + this.hospitalIds = hospitalIds; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public List getPhones() { + return phones; + } + + public void setPhones(List phones) { + this.phones = phones; + } + + public List getItems() { + return items; + } + + public void setItems(List items) { + this.items = items; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getItemJson() { + return itemJson; + } + + public void setItemJson(String itemJson) { + this.itemJson = itemJson; + } + @Override public String toString() { return "LisReportModel [id=" + id + ", lisId=" + lisId + ", title=" diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java index 0d896d3..23e9bb2 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java @@ -22,7 +22,7 @@ import java.util.concurrent.Future; @Service("lisService") -public class LisServiceImpl extends DataAccessLayerService implements LisService { +public class LisServiceImpl implements LisService { @Autowired private MasterLisMapper masterLisMapper; diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml index 30b2fc4..ff9c219 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml @@ -122,7 +122,7 @@ - AND date_format(CHECK_TIME,'%Y-%m-%d') = date_format(#{checkTime},'%Y-%m-%d') + AND date_format(CHECK_TIME,'%Y-%m-%d') = #{checkTime} @@ -309,7 +309,7 @@ #{hospitalId} - + AND PUBLISH_TIME >= date_format(#{publishTime},'%Y-%m-%d') diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java index 36d6457..e0e7c59 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java @@ -681,7 +681,7 @@ public class LisFacade { public Map getNoSendLis(Integer page, Integer limit) { LisReportQuery query = new LisReportQuery(); - query.setPublishTime(new Date()); + query.setPublishTime(DateUtil.getyyyy_MM_dd(new Date())); query.setPage(page); query.setLimit(limit); query.setNeed("true"); @@ -785,7 +785,7 @@ public class LisFacade { query.setTitles(titles); query.setHospitalId(hospitalId); - query.setCheckTime(DateUtil.parseYMD(checkTime)); + query.setCheckTime(checkTime); List lises = null; if ("216".equals(hospitalId)) { diff --git a/platform-operate-api/src/main/webapp/WEB-INF/web.xml b/platform-operate-api/src/main/webapp/WEB-INF/web.xml index a29a011..a5513ae 100644 --- a/platform-operate-api/src/main/webapp/WEB-INF/web.xml +++ b/platform-operate-api/src/main/webapp/WEB-INF/web.xml @@ -13,7 +13,6 @@ version="2.5" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - - @@ -129,4 +127,4 @@ org.springframework.web.util.Log4jConfigListener - \ No newline at end of file + -- 1.8.3.1