jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 131141e59cb8651fa857ede517251878e603aa10

Authored by jiangjiazhi
2 parents 16f6260381 afd92dfc8f
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckResponse.java View file @ 131141e
... ... @@ -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 @ 131141e
... ... @@ -285,7 +285,8 @@
285 285 */
286 286 public List<CheckByDate> queryCheckListupdate(String cardNo,int ftype){
287 287  
288   - CheckResponse check1=new CheckResponse();
  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("张三");
314 317  
... ... @@ -362,15 +365,15 @@
362 365 List<CheckResponse> l=new ArrayList<CheckResponse>();
363 366 l.add(check1);
364 367 l.add(check10);
365   - l.add(check9);
  368 + l.add(check9);*/
366 369  
367 370 if(1==ftype){
368 371 List<CheckResponse> result = new ArrayList<>();
369 372  
370 373 List<CheckByDate> CheckByDate=new ArrayList<CheckByDate>();
371   - List<CheckType> CheckType=new ArrayList<CheckType>();
372   - result.addAll(l);
373   - //result.addAll(queryLisCheckList(cardNo));解开
  374 + //List<CheckType> CheckType=new ArrayList<CheckType>();
  375 + //result.addAll(l);
  376 + result.addAll(queryLisCheckList(cardNo));
374 377 //result.addAll(queryPacsCheckList(cardNo));
375 378 List<String> keyList = new ArrayList<>();
376 379 // 去重
... ... @@ -408,7 +411,10 @@
408 411 }
409 412  
410 413 for(String time:keyList){
411   - List<CheckResponse> result2=new ArrayList<>();
  414 + List<CheckType> CheckType=new ArrayList<CheckType>();
  415 + List<CheckResponse> result2=new ArrayList<>();//存放所有检验报告（type=1）
  416 + List<CheckResponse> result3=new ArrayList<>();//存放所有影像报告(type=2)
  417 + List<CheckResponse> result4=new ArrayList<>();//存放所有其他报告
412 418 CheckType jianyan=new CheckType();
413 419 jianyan.setType("检验报告");
414 420 CheckType yingxiang=new CheckType();
415 421  
416 422  
417 423  
... ... @@ -419,21 +425,31 @@
419 425 if(time.equals(DateUtil.getyyyy_MM_dd(chre.getModified()))){
420 426 if(chre.getType() == 1){
421 427 result2.add(chre);
422   - jianyan.setTypeName(result2);
423   - CheckType.add(jianyan);
  428 + //jianyan.setTypeName(result2);
  429 + //CheckType.add(jianyan);
424 430 }else if(chre.getType() == 2){
425   - result2.add(chre);
426   - yingxiang.setTypeName(result2);
427   - CheckType.add(yingxiang);
  431 + result3.add(chre);
  432 + //yingxiang.setTypeName(result3);
  433 + //CheckType.add(yingxiang);
428 434 }else{
429   - result2.add(chre);
430   - other.setTypeName(result2);
431   - CheckType.add(other);
  435 + result4.add(chre);
  436 + //other.setTypeName(result4);
  437 + //CheckType.add(other);
432 438 }
433 439  
434 440 }
435 441 }
436 442  
  443 + jianyan.setTypeName(result2);
  444 + CheckType.add(jianyan);
  445 +
  446 + yingxiang.setTypeName(result3);
  447 + CheckType.add(yingxiang);
  448 +
  449 + other.setTypeName(result4);
  450 + CheckType.add(other);
  451 +
  452 +
437 453 CheckByDate CheckByDate1=new CheckByDate();
438 454 CheckByDate1.setTime(time);
439 455 CheckByDate1.setTypes(CheckType);
440 456  
... ... @@ -443,11 +459,11 @@
443 459 return CheckByDate;
444 460  
445 461 }else{
446   - List<CheckResponse> result = new ArrayList<>();
  462 + List<CheckResponse> result = new ArrayList<CheckResponse>();
447 463 List<CheckByDate> CheckByDate=new ArrayList<CheckByDate>();
448   - List<CheckType> CheckType=new ArrayList<CheckType>();
449   - result.addAll(l);
450   - //result.addAll(queryLisCheckList(cardNo));解开
  464 + //List<CheckType> CheckType=new ArrayList<CheckType>();
  465 + //result.addAll(l);
  466 + result.addAll(queryLisCheckList(cardNo));
451 467 //result.addAll(queryPacsCheckList(cardNo));
452 468 List<String> keyList = new ArrayList<>();
453 469 List<String> listtype=new ArrayList<>();
454 470  
455 471  
456 472  
457 473  
... ... @@ -507,21 +523,27 @@
507 523  
508 524 for(String type:keyList){
509 525  
  526 + List<CheckType> CheckType=new ArrayList<CheckType>();
510 527  
511   -
512 528 for(String typ:listtype){
513 529 List<CheckResponse> result2=new ArrayList<>();
514 530 CheckType CheckType1=new CheckType();
515   - CheckType1.setType(typ);
  531 + //CheckType1.setType(typ);
516 532 for(CheckResponse chre:result){
517 533 if(type.equals(chre.getType().toString()) && typ.equals(chre.getTitle())){
518 534 chre.setTitle(DateUtil.getyyyy_MM_dd(chre.getModified())+" "+chre.getTitle());
519 535 result2.add(chre);
520   - CheckType1.setTypeName(result2);
521   - CheckType.add(CheckType1);
  536 + //CheckType1.setTypeName(result2);
  537 + //CheckType.add(CheckType1);
522 538 }
523 539  
524 540 }
  541 + if(result2.size()>0){
  542 + CheckType1.setType(typ);
  543 + CheckType1.setTypeName(result2);
  544 + CheckType.add(CheckType1);
  545 + }
  546 +
525 547 }
526 548  
527 549  
528 550  
... ... @@ -542,7 +564,15 @@
542 564  
543 565 }
544 566  
  567 + for(String typ:listtype){
545 568  
  569 +
  570 + }
  571 +
  572 +
  573 +
  574 +
  575 +
546 576 return CheckByDate;
547 577 }
548 578  
... ... @@ -575,6 +605,7 @@
575 605 check.setType(1);
576 606 check.setName(lisReport.getName());
577 607 check.setTitle(lisReport.getClassifyName());
  608 + check.setHospitalName("秦皇岛妇幼保健");//新增医院名称字段赋值
578 609 if (lisReport.getAge() != null) {
579 610 check.setAge(lisReport.getAge().toString());
580 611 }