jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 5a24b1d0f9191af333afab47b988ca9a85dcdecb

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

ulpdate

Showing 1 changed file with 207 additions and 206 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java View file @ 5a24b1d
... ... @@ -55,7 +55,7 @@
55 55  
56 56  
57 57 public void syncLisReportTimer() {
58   - Date date = new Date();
  58 + Date date = new Date();
59 59 queryLisReport(new Date(date.getTime()-1000*60*60));
60 60 }
61 61  
... ... @@ -274,8 +274,8 @@
274 274  
275 275 return resultList;
276 276 }
277   -
278   -
  277 +
  278 +
279 279 /**
280 280 * gxk 新建接口(与queryCheckList接口显示格式不同)
281 281 * 根据日期或检查项目分类调用的方法
... ... @@ -284,9 +284,9 @@
284 284 * @return
285 285 */
286 286 public List<CheckByDate> queryCheckListupdate(String cardNo,int ftype){
287   -
288   - CheckResponse check1=new CheckResponse();
289   - check1.setModified(DateUtil.parseYMDHMS("2017-3-31"));
  287 +
  288 + CheckResponse check1=new CheckResponse();
  289 + check1.setModified(DateUtil.parseYMDHMS("1452126368000"));
290 290 check1.setType(1);
291 291 check1.setName("张三");
292 292 check1.setTitle("血常规");
293 293  
... ... @@ -295,9 +295,9 @@
295 295 check1.setApplyDateStr(DateUtil.getyyyy_MM_dd(DateUtil.parseYMDHMS("2017-3-31")));
296 296 check1.setCheckDept("血科");
297 297 check1.setDoctor("王医生");
298   -
  298 +
299 299 CheckResponse check10=new CheckResponse();
300   - check10.setModified(DateUtil.parseYMDHMS("2017-3-31"));
  300 + check10.setModified(DateUtil.parseYMDHMS("1452126368000"));
301 301 check10.setType(1);
302 302 check10.setName("张三");
303 303 check10.setTitle("肝功能");
304 304  
... ... @@ -306,9 +306,9 @@
306 306 check10.setApplyDateStr(DateUtil.getyyyy_MM_dd(DateUtil.parseYMDHMS("2017-3-31")));
307 307 check10.setCheckDept("肝科");
308 308 check10.setDoctor("刘医生");
309   -
  309 +
310 310 CheckResponse check9=new CheckResponse();
311   - check9.setModified(DateUtil.parseYMDHMS("2017-3-31"));
  311 + check9.setModified(DateUtil.parseYMDHMS("1452126368000"));
312 312 check9.setType(2);
313 313 check9.setName("张三");
314 314 check9.setTitle("肝功能");
315 315  
316 316  
317 317  
... ... @@ -317,23 +317,23 @@
317 317 check9.setApplyDateStr(DateUtil.getyyyy_MM_dd(DateUtil.parseYMDHMS("2017-3-31")));
318 318 check9.setCheckDept("肝科");
319 319 check9.setDoctor("刘医生");
320   -
  320 +
321 321 CheckItemResponse check2=new CheckItemResponse();
322 322 check2.setName("白细胞");
323 323 check2.setCode("0101001");
324 324 check2.setRefer("4.00--10.00");
325 325 check2.setResult("13.68");
326 326 check2.setSpecial("H");
327   -
  327 +
328 328 CheckItemResponse check3=new CheckItemResponse();
329   -
  329 +
330 330 check3.setName("超敏 C反应蛋白");
331 331 check3.setCode("0101501");
332 332 check3.setRefer("0--5");
333 333 check3.setResult("3.2");
334 334 check3.setSpecial("M");
335 335 check3.setUnit("mg/L");
336   -
  336 +
337 337 CheckItemResponse check4=new CheckItemResponse();
338 338 check4.setName("大便性状");
339 339 check4.setCode("0103003");
... ... @@ -341,7 +341,7 @@
341 341 check4.setResult("稀便");
342 342 check4.setSpecial("M");
343 343 check4.setUnit("");
344   -
  344 +
345 345 CheckItemResponse check5=new CheckItemResponse();
346 346 check5.setName("大便颜色");
347 347 check5.setCode("0103002");
... ... @@ -349,7 +349,7 @@
349 349 check5.setResult("黄色");
350 350 check5.setSpecial("M");
351 351 check5.setUnit("");
352   -
  352 +
353 353 List<CheckItemResponse> listc=new ArrayList<CheckItemResponse>();
354 354 listc.add(check2);
355 355 listc.add(check3);
356 356  
357 357  
358 358  
359 359  
... ... @@ -359,200 +359,201 @@
359 359 check1.setItemList(listc);
360 360 check10.setItemList(listc2);
361 361 check9.setItemList(listc2);
362   - List<CheckResponse> l=new ArrayList<CheckResponse>();
  362 + List<CheckResponse> l=new ArrayList<CheckResponse>();
363 363 l.add(check1);
364 364 l.add(check10);
365 365 l.add(check9);
366   -
367   - if(1==ftype){
368   - List<CheckResponse> result = new ArrayList<>();
369   -
370   - List<CheckByDate> CheckByDate=new ArrayList<CheckByDate>();
371   - List<CheckType> CheckType=new ArrayList<CheckType>();
372   - result.addAll(l);
373   - //result.addAll(queryLisCheckList(cardNo));解开
374   - //result.addAll(queryPacsCheckList(cardNo));
375   - List<String> keyList = new ArrayList<>();
376   - // 去重
377   - List<CheckResponse> list = new ArrayList<>();
378   - Date tempDate = null;
379   - for (CheckResponse check:result) {
380   - if (check.getModified() != null && check.getModified().equals(tempDate)) {
381   - continue;
382   - }
383   - list.add(check);
384   - tempDate = check.getModified();
385   - }
386   - // 排序
387   - Collections.sort(list, new Comparator() {
388   - public int compare(Object a, Object b) {
389   - if (((CheckResponse)a).getModified() == null) {
390   - return -1;
391   - }
392   - if (((CheckResponse)b).getModified() == null) {
393   - return -1;
394   - }
395   - if (((CheckResponse)a).getModified().before(((CheckResponse)a).getModified())) {
396   - return 1;
397   - }
398   - return -1;
399   - }
400   - });
401   -
402   - for (CheckResponse check:list) {
403   - String ymd = DateUtil.getyyyy_MM_dd(check.getModified());
404   - if (!keyList.contains(ymd)) {
405   - keyList.add(ymd);
406   - }
407   -
408   - }
409   -
410   - for(String time:keyList){
411   - List<CheckResponse> result2=new ArrayList<>();
412   - CheckType jianyan=new CheckType();
413   - jianyan.setType("检验报告");
414   - CheckType yingxiang=new CheckType();
415   - yingxiang.setType("影像报告");
416   - CheckType other=new CheckType();
417   - other.setType("其它报告");
418   - for(CheckResponse chre:result){
419   - if(time.equals(DateUtil.getyyyy_MM_dd(chre.getModified()))){
420   - if(chre.getType() == 1){
421   - result2.add(chre);
422   - jianyan.setTypeName(result2);
423   - CheckType.add(jianyan);
424   - }else if(chre.getType() == 2){
425   - result2.add(chre);
426   - yingxiang.setTypeName(result2);
427   - CheckType.add(yingxiang);
428   - }else{
429   - result2.add(chre);
430   - other.setTypeName(result2);
431   - CheckType.add(other);
432   - }
433   - }
434   - }
435   -
436   - CheckByDate CheckByDate1=new CheckByDate();
437   - CheckByDate1.setTime(time);
438   - CheckByDate1.setTypes(CheckType);
439   - CheckByDate.add(CheckByDate1);
440   - }
441 366  
442   - return CheckByDate;
443   -
444   - }else{
445   - List<CheckResponse> result = new ArrayList<>();
446   - List<CheckByDate> CheckByDate=new ArrayList<CheckByDate>();
447   - List<CheckType> CheckType=new ArrayList<CheckType>();
448   - result.addAll(l);
449   - //result.addAll(queryLisCheckList(cardNo));解开
450   - //result.addAll(queryPacsCheckList(cardNo));
451   - List<String> keyList = new ArrayList<>();
452   - List<String> listtype=new ArrayList<>();
453   - List<CheckResponse> listt = new ArrayList<>();
454   - // 去重
455   - List<CheckResponse> list = new ArrayList<>();
456   - Integer num=0;
457   - for(CheckResponse check:result){
458   - if(check.getType()!=null && check.getType()==num){
459   - continue;
460   - }
461   - list.add(check);
462   - num=check.getType();
463   - }
464   - String t=null;
465   - for(CheckResponse check:result){
466   - if(check.getTitle()!=null && check.getTitle().equals(t)){
467   - continue;
468   - }
469   - listt.add(check);
470   - t=check.getTitle();
471   - }
472   -
473   -
474   - // 排序
475   - Collections.sort(list, new Comparator() {
476   - public int compare(Object a, Object b) {
477   - if (((CheckResponse)a).getModified() == null) {
478   - return -1;
479   - }
480   - if (((CheckResponse)b).getModified() == null) {
481   - return -1;
482   - }
483   - if (((CheckResponse)a).getModified().before(((CheckResponse)a).getModified())) {
484   - return 1;
485   - }
486   - return -1;
487   - }
488   - });
489   -
490   - for (CheckResponse check:list) {
491   - Integer ymd = check.getType();
492   - if (!keyList.contains(ymd.toString())) {
493   - keyList.add(ymd.toString());
494   - }
495   -
496   - }
497   - for(CheckResponse check:listt){
498   - String ty=check.getTitle();
499   - if(!listtype.contains(ty)){
500   - listtype.add(ty);
501   - }
502   - }
503   -
504   -
505   -
506   -
507   - for(String type:keyList){
508   -
509   -
510   -
511   - for(String typ:listtype){
512   - List<CheckResponse> result2=new ArrayList<>();
513   - CheckType CheckType1=new CheckType();
514   - CheckType1.setType(typ);
515   - for(CheckResponse chre:result){
516   - if(type.equals(chre.getType().toString()) && typ.equals(chre.getTitle())){
517   - chre.setTitle(DateUtil.getyyyy_MM_dd(chre.getModified())+" "+chre.getTitle());
518   - result2.add(chre);
519   - CheckType1.setTypeName(result2);
520   - CheckType.add(CheckType1);
521   - }
522   -
523   - }
524   - }
525   -
526   -
527   - CheckByDate CheckByDate1=new CheckByDate();
528   - if("1".equals(type)){
529   - CheckByDate1.setTime("检验报告");
530   - CheckByDate1.setTypes(CheckType);
531   - CheckByDate.add(CheckByDate1);
532   - }else if("2".equals(type)){
533   - CheckByDate1.setTime("影像报告");
534   - CheckByDate1.setTypes(CheckType);
535   - CheckByDate.add(CheckByDate1);
536   - }else{
537   - CheckByDate1.setTime("其它报告");
538   - CheckByDate1.setTypes(CheckType);
539   - CheckByDate.add(CheckByDate1);
540   - }
541   -
542   - }
543   -
544   -
545   - return CheckByDate;
546   - }
547   -
  367 + if(1==ftype){
  368 + List<CheckResponse> result = new ArrayList<>();
  369 +
  370 + List<CheckByDate> CheckByDate=new ArrayList<CheckByDate>();
  371 + List<CheckType> CheckType=new ArrayList<CheckType>();
  372 + result.addAll(l);
  373 + //result.addAll(queryLisCheckList(cardNo));解开
  374 + //result.addAll(queryPacsCheckList(cardNo));
  375 + List<String> keyList = new ArrayList<>();
  376 + // 去重
  377 + List<CheckResponse> list = new ArrayList<>();
  378 + Date tempDate = null;
  379 + for (CheckResponse check:result) {
  380 + if (check.getModified() != null && check.getModified().equals(tempDate)) {
  381 + continue;
  382 + }
  383 + list.add(check);
  384 + tempDate = check.getModified();
  385 + }
  386 + // 排序
  387 + Collections.sort(list, new Comparator() {
  388 + public int compare(Object a, Object b) {
  389 + if (((CheckResponse)a).getModified() == null) {
  390 + return -1;
  391 + }
  392 + if (((CheckResponse)b).getModified() == null) {
  393 + return -1;
  394 + }
  395 + if (((CheckResponse)a).getModified().before(((CheckResponse)a).getModified())) {
  396 + return 1;
  397 + }
  398 + return -1;
  399 + }
  400 + });
  401 +
  402 + for (CheckResponse check:list) {
  403 + String ymd = DateUtil.getyyyy_MM_dd(check.getModified());
  404 + if (!keyList.contains(ymd)) {
  405 + keyList.add(ymd);
  406 + }
  407 +
  408 + }
  409 +
  410 + for(String time:keyList){
  411 + List<CheckResponse> result2=new ArrayList<>();
  412 + CheckType jianyan=new CheckType();
  413 + jianyan.setType("检验报告");
  414 + CheckType yingxiang=new CheckType();
  415 + yingxiang.setType("影像报告");
  416 + CheckType other=new CheckType();
  417 + other.setType("其它报告");
  418 + for(CheckResponse chre:result){
  419 + if(time.equals(DateUtil.getyyyy_MM_dd(chre.getModified()))){
  420 + if(chre.getType() == 1){
  421 + result2.add(chre);
  422 + jianyan.setTypeName(result2);
  423 + CheckType.add(jianyan);
  424 + }else if(chre.getType() == 2){
  425 + result2.add(chre);
  426 + yingxiang.setTypeName(result2);
  427 + CheckType.add(yingxiang);
  428 + }else{
  429 + result2.add(chre);
  430 + other.setTypeName(result2);
  431 + CheckType.add(other);
  432 + }
  433 +
  434 + }
  435 + }
  436 +
  437 + CheckByDate CheckByDate1=new CheckByDate();
  438 + CheckByDate1.setTime(time);
  439 + CheckByDate1.setTypes(CheckType);
  440 + CheckByDate.add(CheckByDate1);
  441 + }
  442 +
  443 + return CheckByDate;
  444 +
  445 + }else{
  446 + List<CheckResponse> result = new ArrayList<>();
  447 + List<CheckByDate> CheckByDate=new ArrayList<CheckByDate>();
  448 + List<CheckType> CheckType=new ArrayList<CheckType>();
  449 + result.addAll(l);
  450 + //result.addAll(queryLisCheckList(cardNo));解开
  451 + //result.addAll(queryPacsCheckList(cardNo));
  452 + List<String> keyList = new ArrayList<>();
  453 + List<String> listtype=new ArrayList<>();
  454 + List<CheckResponse> listt = new ArrayList<>();
  455 + // 去重
  456 + List<CheckResponse> list = new ArrayList<>();
  457 + Integer num=0;
  458 + for(CheckResponse check:result){
  459 + if(check.getType()!=null && check.getType()==num){
  460 + continue;
  461 + }
  462 + list.add(check);
  463 + num=check.getType();
  464 + }
  465 + String t=null;
  466 + for(CheckResponse check:result){
  467 + if(check.getTitle()!=null && check.getTitle().equals(t)){
  468 + continue;
  469 + }
  470 + listt.add(check);
  471 + t=check.getTitle();
  472 + }
  473 +
  474 +
  475 + // 排序
  476 + Collections.sort(list, new Comparator() {
  477 + public int compare(Object a, Object b) {
  478 + if (((CheckResponse)a).getModified() == null) {
  479 + return -1;
  480 + }
  481 + if (((CheckResponse)b).getModified() == null) {
  482 + return -1;
  483 + }
  484 + if (((CheckResponse)a).getModified().before(((CheckResponse)a).getModified())) {
  485 + return 1;
  486 + }
  487 + return -1;
  488 + }
  489 + });
  490 +
  491 + for (CheckResponse check:list) {
  492 + Integer ymd = check.getType();
  493 + if (!keyList.contains(ymd.toString())) {
  494 + keyList.add(ymd.toString());
  495 + }
  496 +
  497 + }
  498 + for(CheckResponse check:listt){
  499 + String ty=check.getTitle();
  500 + if(!listtype.contains(ty)){
  501 + listtype.add(ty);
  502 + }
  503 + }
  504 +
  505 +
  506 +
  507 +
  508 + for(String type:keyList){
  509 +
  510 +
  511 +
  512 + for(String typ:listtype){
  513 + List<CheckResponse> result2=new ArrayList<>();
  514 + CheckType CheckType1=new CheckType();
  515 + CheckType1.setType(typ);
  516 + for(CheckResponse chre:result){
  517 + if(type.equals(chre.getType().toString()) && typ.equals(chre.getTitle())){
  518 + chre.setTitle(DateUtil.getyyyy_MM_dd(chre.getModified())+" "+chre.getTitle());
  519 + result2.add(chre);
  520 + CheckType1.setTypeName(result2);
  521 + CheckType.add(CheckType1);
  522 + }
  523 +
  524 + }
  525 + }
  526 +
  527 +
  528 + CheckByDate CheckByDate1=new CheckByDate();
  529 + if("1".equals(type)){
  530 + CheckByDate1.setTime("检验报告");
  531 + CheckByDate1.setTypes(CheckType);
  532 + CheckByDate.add(CheckByDate1);
  533 + }else if("2".equals(type)){
  534 + CheckByDate1.setTime("影像报告");
  535 + CheckByDate1.setTypes(CheckType);
  536 + CheckByDate.add(CheckByDate1);
  537 + }else{
  538 + CheckByDate1.setTime("其它报告");
  539 + CheckByDate1.setTypes(CheckType);
  540 + CheckByDate.add(CheckByDate1);
  541 + }
  542 +
  543 + }
  544 +
  545 +
  546 + return CheckByDate;
  547 + }
  548 +
548 549 }
549   -
550   -
551   -
552   -
553   -
554   -
555 550  
  551 +
  552 +
  553 +
  554 +
  555 +
  556 +
556 557 public List<CheckResponse> queryLisCheckList(String cardNo) {
557 558 List<CheckResponse> result = new ArrayList<>();
558 559 if (StringUtils.isNotBlank(cardNo)) {
... ... @@ -684,7 +685,7 @@
684 685 QueryRunner queryRunner = new QueryRunner();
685 686  
686 687 try {
687   - // List<DiagnosisInfo> list = queryRunner.query(conn, "select cyzdmc as diagnosisItem from ZY_BRSYK where blh= '"+blNo+"'", new BeanListHandler<DiagnosisInfo>(DiagnosisInfo.class));
  688 + // List<DiagnosisInfo> list = queryRunner.query(conn, "select cyzdmc as diagnosisItem from ZY_BRSYK where blh= '"+blNo+"'", new BeanListHandler<DiagnosisInfo>(DiagnosisInfo.class));
688 689 List<DiagnosisInfo> list = queryRunner.query(conn, "select ZDMC as diagnosisItem from JHMK_BRZDQK where ZYHM = '"+blNo+"'", new BeanListHandler<DiagnosisInfo>(DiagnosisInfo.class));
689 690 if (CollectionUtils.isNotEmpty(list)) {
690 691 // for (DiagnosisInfo info:list) {