jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b172c3daf4e2522b7872097ce6b57b36e7424b51

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

秦皇岛冠新公卫接口

Showing 2 changed files with 32 additions and 22 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java View file @ b172c3d
... ... @@ -465,20 +465,20 @@
465 465 Map<String, Object> mapcc = new HashMap<>();
466 466 findProcess(data.getProdprocess(),mapcc);
467 467 if(StringUtils.isNotEmpty(map.get("one"))){
468   - int oShi = map.get("one").toString().indexOf("时");
  468 + int oShi = mapcc.get("one").toString().indexOf("时");
469 469 if(oShi == -1){
470   - int oFen = map.get("one").toString().indexOf("分");
  470 + int oFen = mapcc.get("one").toString().indexOf("分");
471 471 if(-1 != oFen){
472   - map.put("BIRTHTIME1",map.get("one").toString().substring(0,oFen));
  472 + map.put("BIRTHTIME1",mapcc.get("one").toString().substring(0,oFen));
473 473 }
474 474 }else{
475 475 Integer fen = 0;
476   - if(StringUtils.isNotEmpty(map.get("one").toString().substring(0,oShi))){
477   - fen = Integer.parseInt(map.get("one").toString().substring(0,oShi))*60;
  476 + if(StringUtils.isNotEmpty(mapcc.get("one").toString().substring(0,oShi))){
  477 + fen = Integer.parseInt(mapcc.get("one").toString().substring(0,oShi))*60;
478 478 }
479   - int oFen = map.get("one").toString().indexOf("分");
  479 + int oFen = mapcc.get("one").toString().indexOf("分");
480 480 if(-1 != oFen){
481   - Integer fen2 = Integer.parseInt(map.get("one").toString().substring(oShi + 1, oFen));
  481 + Integer fen2 = Integer.parseInt(mapcc.get("one").toString().substring(oShi + 1, oFen));
482 482 map.put("BIRTHTIME1",String.valueOf(fen+fen2));
483 483 }else{
484 484 map.put("BIRTHTIME1",String.valueOf(fen));
485 485  
486 486  
487 487  
488 488  
489 489  
... ... @@ -488,20 +488,20 @@
488 488 }
489 489  
490 490 if(StringUtils.isNotEmpty(map.get("two"))){
491   - int oShi = map.get("two").toString().indexOf("时");
  491 + int oShi = mapcc.get("two").toString().indexOf("时");
492 492 if(oShi == -1){
493   - int oFen = map.get("two").toString().indexOf("分");
  493 + int oFen = mapcc.get("two").toString().indexOf("分");
494 494 if(-1 != oFen){
495   - map.put("BIRTHTIME2",map.get("two").toString().substring(0,oFen));
  495 + map.put("BIRTHTIME2",mapcc.get("two").toString().substring(0,oFen));
496 496 }
497 497 }else{
498 498 Integer fen = 0;
499   - if(StringUtils.isNotEmpty(map.get("two").toString().substring(0,oShi))){
500   - fen = Integer.parseInt(map.get("two").toString().substring(0,oShi))*60;
  499 + if(StringUtils.isNotEmpty(mapcc.get("two").toString().substring(0,oShi))){
  500 + fen = Integer.parseInt(mapcc.get("two").toString().substring(0,oShi))*60;
501 501 }
502   - int oFen = map.get("two").toString().indexOf("分");
  502 + int oFen = mapcc.get("two").toString().indexOf("分");
503 503 if(-1 != oFen){
504   - Integer fen2 = Integer.parseInt(map.get("two").toString().substring(oShi + 1, oFen));
  504 + Integer fen2 = Integer.parseInt(mapcc.get("two").toString().substring(oShi + 1, oFen));
505 505 map.put("BIRTHTIME2",String.valueOf(fen+fen2));
506 506 }else{
507 507 map.put("BIRTHTIME2",String.valueOf(fen));
508 508  
509 509  
510 510  
511 511  
512 512  
... ... @@ -510,21 +510,21 @@
510 510 }
511 511  
512 512 if(StringUtils.isNotEmpty(map.get("three"))){
513   - int oShi = map.get("three").toString().indexOf("时");
  513 + int oShi = mapcc.get("three").toString().indexOf("时");
514 514 if(oShi == -1){
515   - int oFen = map.get("three").toString().indexOf("分");
  515 + int oFen = mapcc.get("three").toString().indexOf("分");
516 516 if(-1 != oFen){
517   - map.put("BIRTHTIME3",map.get("three").toString().substring(0,oFen));
  517 + map.put("BIRTHTIME3",mapcc.get("three").toString().substring(0,oFen));
518 518 }
519 519 }else{
520 520 Integer fen = 0;
521   - if(StringUtils.isNotEmpty(map.get("three").toString().substring(0,oShi))){
522   - fen = Integer.parseInt(map.get("three").toString().substring(0,oShi))*60;
  521 + if(StringUtils.isNotEmpty(mapcc.get("three").toString().substring(0,oShi))){
  522 + fen = Integer.parseInt(mapcc.get("three").toString().substring(0,oShi))*60;
523 523 }
524 524  
525   - int oFen = map.get("three").toString().indexOf("分");
  525 + int oFen = mapcc.get("three").toString().indexOf("分");
526 526 if(-1 != oFen){
527   - Integer fen2 = Integer.parseInt(map.get("three").toString().substring(oShi + 1, oFen));
  527 + Integer fen2 = Integer.parseInt(mapcc.get("three").toString().substring(oShi + 1, oFen));
528 528 map.put("BIRTHTIME3",String.valueOf(fen+fen2));
529 529 }else{
530 530 map.put("BIRTHTIME3",String.valueOf(fen));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QhdJbgwController.java View file @ b172c3d
... ... @@ -119,7 +119,17 @@
119 119 @ResponseBody
120 120 public List<Map<String,String>> qhdCZ(String startDate,String endDate){
121 121 if(StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)){
122   - return qhdJbgwInterface.getChuZhen(startDate,endDate);
  122 + return qhdJbgwInterface.getChuZhen(startDate, endDate);
  123 + }
  124 + return null;
  125 + }
  126 +
  127 +
  128 + @RequestMapping(value = "/qhd/fenmian")
  129 + @ResponseBody
  130 + public List<Map<String,String>> qhdFM(String startDate,String endDate){
  131 + if(StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)){
  132 + return qhdJbgwInterface.getFm(startDate,endDate);
123 133 }
124 134 return null;
125 135 }