Commit 7b7da9dd57aa8f28b20623d2b53a04436cd539c8

Authored by liquanyu
1 parent 3b3285e884

update code

Showing 5 changed files with 85 additions and 87 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.java View file @ 7b7da9d
... ... @@ -37,11 +37,11 @@
37 37 // 患者性别
38 38 private String sex;
39 39 // 送检日期
40   - private Date applyTime;
  40 + private String applyTime;
41 41 // 检验时间
42   - private Date checkTime;
  42 + private String checkTime;
43 43 // 报告发布时间
44   - private Date publishTime;
  44 + private String publishTime;
45 45 // 送检医生
46 46 private String applyDoctor;
47 47 // 送检科室
48 48  
... ... @@ -49,9 +49,9 @@
49 49 // 检验员
50 50 private String checker;
51 51 // 最后修改时间
52   - private Date modified;
  52 + private String modified;
53 53 // 创建时间
54   - private Date created;
  54 + private String created;
55 55 // 医院id
56 56 private String hospitalId;
57 57  
... ... @@ -73,70 +73,6 @@
73 73 //检验明细json
74 74 private String itemJson;
75 75  
76   - public List<String> getTitles() {
77   - return titles;
78   - }
79   -
80   - public void setTitles(List<String> titles) {
81   - this.titles = titles;
82   - }
83   -
84   - public List<String> getPhones() {
85   - return phones;
86   - }
87   -
88   - public void setPhones(List<String> phones) {
89   - this.phones = phones;
90   - }
91   -
92   - public List<String> getHospitalIds() {
93   - return hospitalIds;
94   - }
95   -
96   - public void setHospitalIds(List<String> hospitalIds) {
97   - this.hospitalIds = hospitalIds;
98   - }
99   -
100   - public List<String> getVcCardNos() {
101   - return vcCardNos;
102   - }
103   -
104   - public void setVcCardNos(List<String> vcCardNos) {
105   - this.vcCardNos = vcCardNos;
106   - }
107   -
108   - public Integer getStatus() {
109   - return status;
110   - }
111   -
112   - public void setStatus(Integer status) {
113   - this.status = status;
114   - }
115   -
116   - public String getItemJson() {
117   - return itemJson;
118   - }
119   -
120   - public void setItemJson(String itemJson) {
121   - this.itemJson = itemJson;
122   - }
123   -
124   - public String getPhone() {
125   - return phone;
126   - }
127   -
128   - public void setPhone(String phone) {
129   - this.phone = phone;
130   - }
131   -
132   - public List<LisReportItemModel> getItems() {
133   - return items;
134   - }
135   -
136   - public void setItems(List<LisReportItemModel> items) {
137   - this.items = items;
138   - }
139   -
140 76 public Integer getId() {
141 77 return id;
142 78 }
... ... @@ -161,6 +97,14 @@
161 97 this.title = title;
162 98 }
163 99  
  100 + public List<String> getTitles() {
  101 + return titles;
  102 + }
  103 +
  104 + public void setTitles(List<String> titles) {
  105 + this.titles = titles;
  106 + }
  107 +
164 108 public String getType() {
165 109 return type;
166 110 }
... ... @@ -177,6 +121,14 @@
177 121 this.vcCardNo = vcCardNo;
178 122 }
179 123  
  124 + public List<String> getVcCardNos() {
  125 + return vcCardNos;
  126 + }
  127 +
  128 + public void setVcCardNos(List<String> vcCardNos) {
  129 + this.vcCardNos = vcCardNos;
  130 + }
  131 +
180 132 public String getName() {
181 133 return name;
182 134 }
183 135  
184 136  
185 137  
186 138  
187 139  
... ... @@ -209,27 +161,27 @@
209 161 this.sex = sex;
210 162 }
211 163  
212   - public Date getApplyTime() {
  164 + public String getApplyTime() {
213 165 return applyTime;
214 166 }
215 167  
216   - public void setApplyTime(Date applyTime) {
  168 + public void setApplyTime(String applyTime) {
217 169 this.applyTime = applyTime;
218 170 }
219 171  
220   - public Date getCheckTime() {
  172 + public String getCheckTime() {
221 173 return checkTime;
222 174 }
223 175  
224   - public void setCheckTime(Date checkTime) {
  176 + public void setCheckTime(String checkTime) {
225 177 this.checkTime = checkTime;
226 178 }
227 179  
228   - public Date getPublishTime() {
  180 + public String getPublishTime() {
229 181 return publishTime;
230 182 }
231 183  
232   - public void setPublishTime(Date publishTime) {
  184 + public void setPublishTime(String publishTime) {
233 185 this.publishTime = publishTime;
234 186 }
235 187  
236 188  
237 189  
238 190  
... ... @@ -257,19 +209,19 @@
257 209 this.checker = checker;
258 210 }
259 211  
260   - public Date getModified() {
  212 + public String getModified() {
261 213 return modified;
262 214 }
263 215  
264   - public void setModified(Date modified) {
  216 + public void setModified(String modified) {
265 217 this.modified = modified;
266 218 }
267 219  
268   - public Date getCreated() {
  220 + public String getCreated() {
269 221 return created;
270 222 }
271 223  
272   - public void setCreated(Date created) {
  224 + public void setCreated(String created) {
273 225 this.created = created;
274 226 }
275 227  
... ... @@ -279,6 +231,54 @@
279 231  
280 232 public void setHospitalId(String hospitalId) {
281 233 this.hospitalId = hospitalId;
  234 + }
  235 +
  236 + public List<String> getHospitalIds() {
  237 + return hospitalIds;
  238 + }
  239 +
  240 + public void setHospitalIds(List<String> hospitalIds) {
  241 + this.hospitalIds = hospitalIds;
  242 + }
  243 +
  244 + public String getPhone() {
  245 + return phone;
  246 + }
  247 +
  248 + public void setPhone(String phone) {
  249 + this.phone = phone;
  250 + }
  251 +
  252 + public List<String> getPhones() {
  253 + return phones;
  254 + }
  255 +
  256 + public void setPhones(List<String> phones) {
  257 + this.phones = phones;
  258 + }
  259 +
  260 + public List<LisReportItemModel> getItems() {
  261 + return items;
  262 + }
  263 +
  264 + public void setItems(List<LisReportItemModel> items) {
  265 + this.items = items;
  266 + }
  267 +
  268 + public Integer getStatus() {
  269 + return status;
  270 + }
  271 +
  272 + public void setStatus(Integer status) {
  273 + this.status = status;
  274 + }
  275 +
  276 + public String getItemJson() {
  277 + return itemJson;
  278 + }
  279 +
  280 + public void setItemJson(String itemJson) {
  281 + this.itemJson = itemJson;
282 282 }
283 283  
284 284 @Override
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java View file @ 7b7da9d
... ... @@ -22,7 +22,7 @@
22 22  
23 23  
24 24 @Service("lisService")
25   -public class LisServiceImpl extends DataAccessLayerService implements LisService {
  25 +public class LisServiceImpl implements LisService {
26 26  
27 27 @Autowired
28 28 private MasterLisMapper masterLisMapper;
platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml View file @ 7b7da9d
... ... @@ -122,7 +122,7 @@
122 122 </if>
123 123  
124 124 <if test="checkTime != null">
125   - AND date_format(CHECK_TIME,'%Y-%m-%d') = date_format(#{checkTime},'%Y-%m-%d')
  125 + AND date_format(CHECK_TIME,'%Y-%m-%d') = #{checkTime}
126 126 </if>
127 127  
128 128 <if test="titles != null and titles.size() !=0 ">
... ... @@ -309,7 +309,7 @@
309 309 #{hospitalId}
310 310 </foreach>
311 311 </if>
312   - <if test="status != null">
  312 + <if test="publishTime != null">
313 313 AND PUBLISH_TIME >= date_format(#{publishTime},'%Y-%m-%d')
314 314 </if>
315 315 <if test="status != null">
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java View file @ 7b7da9d
... ... @@ -681,7 +681,7 @@
681 681 public Map<String,Object> getNoSendLis(Integer page, Integer limit) {
682 682  
683 683 LisReportQuery query = new LisReportQuery();
684   - query.setPublishTime(new Date());
  684 + query.setPublishTime(DateUtil.getyyyy_MM_dd(new Date()));
685 685 query.setPage(page);
686 686 query.setLimit(limit);
687 687 query.setNeed("true");
... ... @@ -785,7 +785,7 @@
785 785  
786 786 query.setTitles(titles);
787 787 query.setHospitalId(hospitalId);
788   - query.setCheckTime(DateUtil.parseYMD(checkTime));
  788 + query.setCheckTime(checkTime);
789 789 List<LisReportModel> lises = null;
790 790 if ("216".equals(hospitalId))
791 791 {
platform-operate-api/src/main/webapp/WEB-INF/web.xml View file @ 7b7da9d
... ... @@ -13,7 +13,6 @@
13 13 version="2.5"
14 14 xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
15 15 <!--start跨域开始-->
16   -
17 16 <!--
18 17 <filter>
19 18 <filter-name>CorsFilter</filter-name>
... ... @@ -48,7 +47,6 @@
48 47 <url-pattern>/*</url-pattern>
49 48 </filter-mapping>
50 49 -->
51   -
52 50 <!--end跨域结束-->
53 51  
54 52 <servlet-mapping>