jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 28230915c69396121359558a4b20c8eb03a34dc6

Authored by liquanyu
2 parents c4d39556cf 8e066986db
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckByDate.java View file @ 2823091
... ... @@ -11,23 +11,23 @@
11 11 public class CheckByDate {
12 12  
13 13  
14   - private String time;
15   - private List<CheckType> types;
  14 + private String time;
  15 + private List<CheckType> types;
16 16  
17   - public String getTime() {
18   - return time;
19   - }
20   - public void setTime(String time) {
21   - this.time = time;
22   - }
23   - public List<CheckType> getTypes() {
24   - return types;
25   - }
26   - public void setTypes(List<CheckType> types) {
27   - this.types = types;
28   - }
29   -
30   -
31   -
  17 + public String getTime() {
  18 + return time;
  19 + }
  20 +
  21 + public void setTime(String time) {
  22 + this.time = time;
  23 + }
  24 +
  25 + public List<CheckType> getTypes() {
  26 + return types;
  27 + }
  28 +
  29 + public void setTypes(List<CheckType> types) {
  30 + this.types = types;
  31 + }
32 32 }
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java View file @ 2823091
... ... @@ -286,7 +286,7 @@
286 286 public List<CheckByDate> queryCheckListupdate(String cardNo,int ftype){
287 287  
288 288 CheckResponse check1=new CheckResponse();
289   - check1.setModified(DateUtil.parseYMDHMS("1452126368000"));
  289 + check1.setModified(DateUtil.parseYMDHMS("2017-3-31 10:20:58"));
290 290 check1.setType(1);
291 291 check1.setName("张三");
292 292 check1.setTitle("血常规");
... ... @@ -297,7 +297,7 @@
297 297 check1.setDoctor("王医生");
298 298  
299 299 CheckResponse check10=new CheckResponse();
300   - check10.setModified(DateUtil.parseYMDHMS("1452126368000"));
  300 + check10.setModified(DateUtil.parseYMDHMS("2017-3-31 10:20:58"));
301 301 check10.setType(1);
302 302 check10.setName("张三");
303 303 check10.setTitle("肝功能");
... ... @@ -308,7 +308,7 @@
308 308 check10.setDoctor("刘医生");
309 309  
310 310 CheckResponse check9=new CheckResponse();
311   - check9.setModified(DateUtil.parseYMDHMS("1452126368000"));
  311 + check9.setModified(DateUtil.parseYMDHMS("2017-3-31 10:20:58"));
312 312 check9.setType(2);
313 313 check9.setName("张三");
314 314 check9.setTitle("肝功能");
platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/HisService.java View file @ 2823091
... ... @@ -125,6 +125,7 @@
125 125 check10.setApplyDateStr(DateUtil.getyyyy_MM_dd(DateUtil.parseYMDHMS("2017-3-31")));
126 126 check10.setCheckDept("肝科");
127 127 check10.setDoctor("刘医生");
  128 +
128 129  
129 130 CheckResponse check9=new CheckResponse();
130 131 check9.setModified(DateUtil.parseYMDHMS("2017-3-31"));