jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 7269863d68c4eda9b99d4eb99f194545073b3a42

Authored by gengxiaokai
1 parent bb44f775a2
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

更新

Showing 2 changed files with 39 additions and 11 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckResponse.java View file @ 7269863
... ... @@ -24,6 +24,16 @@
24 24 private String title;
25 25 private Date modified;
26 26  
  27 + private String hospitalName;//表示医院名称
  28 +
  29 + public String getHospitalName() {
  30 + return hospitalName;
  31 + }
  32 +
  33 + public void setHospitalName(String hospitalName) {
  34 + this.hospitalName = hospitalName;
  35 + }
  36 +
27 37 public Date getModified() {
28 38 return modified;
29 39 }
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java View file @ 7269863
... ... @@ -286,6 +286,7 @@
286 286 public List<CheckByDate> queryCheckListupdate(String cardNo,int ftype){
287 287  
288 288 CheckResponse check1=new CheckResponse();
  289 + check1.setHospitalName("秦皇岛妇幼保健");
289 290 check1.setModified(DateUtil.parseYMDHMS("2017-3-31 10:20:58"));
290 291 check1.setType(1);
291 292 check1.setName("张三");
... ... @@ -297,6 +298,7 @@
297 298 check1.setDoctor("王医生");
298 299  
299 300 CheckResponse check10=new CheckResponse();
  301 + check10.setHospitalName("秦皇岛妇幼保健");
300 302 check10.setModified(DateUtil.parseYMDHMS("2017-3-31 10:20:58"));
301 303 check10.setType(1);
302 304 check10.setName("张三");
... ... @@ -308,6 +310,7 @@
308 310 check10.setDoctor("刘医生");
309 311  
310 312 CheckResponse check9=new CheckResponse();
  313 + check9.setHospitalName("秦皇岛妇幼保健");
311 314 check9.setModified(DateUtil.parseYMDHMS("2017-3-31 10:20:58"));
312 315 check9.setType(2);
313 316 check9.setName("张三");
... ... @@ -408,7 +411,9 @@
408 411 }
409 412  
410 413 for(String time:keyList){
411   - List<CheckResponse> result2=new ArrayList<>();
  414 + List<CheckResponse> result2=new ArrayList<>();//存放所有检验报告（type=1）
  415 + List<CheckResponse> result3=new ArrayList<>();//存放所有影像报告(type=2)
  416 + List<CheckResponse> result4=new ArrayList<>();//存放所有其他报告
412 417 CheckType jianyan=new CheckType();
413 418 jianyan.setType("检验报告");
414 419 CheckType yingxiang=new CheckType();
415 420  
416 421  
417 422  
... ... @@ -419,21 +424,31 @@
419 424 if(time.equals(DateUtil.getyyyy_MM_dd(chre.getModified()))){
420 425 if(chre.getType() == 1){
421 426 result2.add(chre);
422   - jianyan.setTypeName(result2);
423   - CheckType.add(jianyan);
  427 + //jianyan.setTypeName(result2);
  428 + //CheckType.add(jianyan);
424 429 }else if(chre.getType() == 2){
425   - result2.add(chre);
426   - yingxiang.setTypeName(result2);
427   - CheckType.add(yingxiang);
  430 + result3.add(chre);
  431 + //yingxiang.setTypeName(result3);
  432 + //CheckType.add(yingxiang);
428 433 }else{
429   - result2.add(chre);
430   - other.setTypeName(result2);
431   - CheckType.add(other);
  434 + result4.add(chre);
  435 + //other.setTypeName(result4);
  436 + //CheckType.add(other);
432 437 }
433 438  
434 439 }
435 440 }
436 441  
  442 + jianyan.setTypeName(result2);
  443 + CheckType.add(jianyan);
  444 +
  445 + yingxiang.setTypeName(result3);
  446 + CheckType.add(yingxiang);
  447 +
  448 + other.setTypeName(result4);
  449 + CheckType.add(other);
  450 +
  451 +
437 452 CheckByDate CheckByDate1=new CheckByDate();
438 453 CheckByDate1.setTime(time);
439 454 CheckByDate1.setTypes(CheckType);
440 455  
... ... @@ -517,11 +532,13 @@
517 532 if(type.equals(chre.getType().toString()) && typ.equals(chre.getTitle())){
518 533 chre.setTitle(DateUtil.getyyyy_MM_dd(chre.getModified())+" "+chre.getTitle());
519 534 result2.add(chre);
520   - CheckType1.setTypeName(result2);
521   - CheckType.add(CheckType1);
  535 + //CheckType1.setTypeName(result2);
  536 + //CheckType.add(CheckType1);
522 537 }
523 538  
524 539 }
  540 + CheckType1.setTypeName(result2);
  541 + CheckType.add(CheckType1);
525 542 }
526 543  
527 544  
... ... @@ -575,6 +592,7 @@
575 592 check.setType(1);
576 593 check.setName(lisReport.getName());
577 594 check.setTitle(lisReport.getClassifyName());
  595 + check.setHospitalName("秦皇岛妇幼保健");//新增医院名称字段赋值
578 596 if (lisReport.getAge() != null) {
579 597 check.setAge(lisReport.getAge().toString());
580 598 }