Commit 6ce307d81038bc4f8cf9efd77d3234feb68706ab
1 parent
0c2b842d5f
Exists in
master
and in
6 other branches
秦皇岛基本公卫接口修改
Showing 1 changed file with 47 additions and 14 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java
View file @
6ce307d
| ... | ... | @@ -115,7 +115,7 @@ |
| 115 | 115 | Double wh = Double.parseDouble(aList.get(0).getHeight()) / 100; |
| 116 | 116 | Double shen = wh * wh; |
| 117 | 117 | Double bmi = Double.parseDouble(aList.get(0).getWeight()) / shen; |
| 118 | - map.put("BMI",bmi.toString()); | |
| 118 | + map.put("BMI",String.valueOf(bmi)); | |
| 119 | 119 | } |
| 120 | 120 | String ssy = ""; |
| 121 | 121 | String szy = ""; |
| ... | ... | @@ -234,7 +234,12 @@ |
| 234 | 234 | |
| 235 | 235 | String cDueWeek = ResolveUtils.getPregnancyWeek(patients.getLastMenses(), antExChuModel.getCheckTime()); |
| 236 | 236 | int week = Integer.parseInt(cDueWeek.substring(1, cDueWeek.indexOf("周"))); |
| 237 | - int day = Integer.parseInt(cDueWeek.substring(cDueWeek.indexOf("+")+1, cDueWeek.indexOf("天"))); | |
| 237 | + int status = cDueWeek.indexOf("+"); | |
| 238 | + Integer day = null; | |
| 239 | + if(-1 != status){ | |
| 240 | + day = (int)Integer.parseInt(cDueWeek.substring(cDueWeek.indexOf("+")+1, cDueWeek.indexOf("天"))); | |
| 241 | + } | |
| 242 | + | |
| 238 | 243 | Map<String,String> map = new HashMap<String,String>(); |
| 239 | 244 | //增加孕产登记 |
| 240 | 245 | if("农业户口".equals(getBasicConfig(patients.getPcensusTypeId()))){ |
| ... | ... | @@ -286,7 +291,9 @@ |
| 286 | 291 | map.put("NAME",patients.getUsername()); |
| 287 | 292 | map.put("FOLLOWUPDATE",DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime())); |
| 288 | 293 | map.put("GESTWEEKS",String.valueOf(week)); |
| 289 | - map.put("GESTDAYS",String.valueOf(day)); | |
| 294 | + if(day != null){ | |
| 295 | + map.put("GESTDAYS",String.valueOf(day)); | |
| 296 | + } | |
| 290 | 297 | map.put("AGE",DateUtil.getAge(patients.getBirth()).toString()); |
| 291 | 298 | map.put("HUSBANDNAME",patients.getHusbandName()); |
| 292 | 299 | map.put("HUSBANDTELNO",patients.getHusbandPhone()); |
| ... | ... | @@ -324,7 +331,7 @@ |
| 324 | 331 | } |
| 325 | 332 | map.put("HEIGHT",antExChuModel.getHeight()); |
| 326 | 333 | map.put("WEIGHT",antExChuModel.getWeight()); |
| 327 | - if(antExChuModel.getHeight() != null && antExChuModel.getWeight() != null){ | |
| 334 | + if(StringUtils.isNotEmpty(antExChuModel.getHeight()) && StringUtils.isNotEmpty(antExChuModel.getWeight())){ | |
| 328 | 335 | Double wh = Double.parseDouble(antExChuModel.getHeight()) / 100; |
| 329 | 336 | Double shen = wh * wh; |
| 330 | 337 | Double bmi = Double.parseDouble(antExChuModel.getWeight()) / shen; |
| ... | ... | @@ -404,7 +411,7 @@ |
| 404 | 411 | map.put("ALB",antExChuModel.getAlbumin()); |
| 405 | 412 | map.put("TBI",antExChuModel.getTotalBilirubin()); |
| 406 | 413 | if(antExChuModel.getJhBilirubin() != null && antExChuModel.getTotalBilirubin() != null){ |
| 407 | - int jh = Integer.parseInt(antExChuModel.getTotalBilirubin()) - Integer.parseInt(antExChuModel.getJhBilirubin()); | |
| 414 | + double jh = Double.parseDouble(antExChuModel.getTotalBilirubin()) - Double.parseDouble(antExChuModel.getJhBilirubin()); | |
| 408 | 415 | map.put("DBIL",String.valueOf(jh)); |
| 409 | 416 | } |
| 410 | 417 | map.put("BUN",antExChuModel.getXnsd()); |
| 411 | 418 | |
| ... | ... | @@ -474,15 +481,30 @@ |
| 474 | 481 | } |
| 475 | 482 | map.put("HEIGHT",antExChuModel.getHeight()); |
| 476 | 483 | map.put("WEIGHT",antExChuModel.getWeight()); |
| 477 | - if(antExChuModel.getHeight() != null && antExChuModel.getWeight() != null){ | |
| 484 | + if(StringUtils.isNotEmpty(antExChuModel.getHeight()) && StringUtils.isNotEmpty(antExChuModel.getWeight())){ | |
| 478 | 485 | Double wh = Double.parseDouble(antExChuModel.getHeight()) / 100; |
| 479 | 486 | Double shen = wh * wh; |
| 480 | 487 | Double bmi = Double.parseDouble(antExChuModel.getWeight()) / shen; |
| 481 | 488 | map.put("BMI",bmi.toString()); |
| 482 | 489 | } |
| 483 | - map.put("REGISTERPASTHISTORY",antExChuModel.getPastHistory()); | |
| 484 | - map.put("REGISTERFAMILYHISTORY",antExChuModel.getFamilyHistory()); | |
| 485 | - map.put("GESTATIONSTATUS",antExChuModel.getCestationInfo()); | |
| 490 | + String pastHistory=""; | |
| 491 | + if(StringUtils.isNotEmpty(antExChuModel.getPastHistory())){ | |
| 492 | + Map map1 = JsonUtil.jkstr2Obj(antExChuModel.getPastHistory(), Map.class); | |
| 493 | + pastHistory = FunvCommonUtil.replace(map1, new StringBuilder(), basicConfigService); | |
| 494 | + } | |
| 495 | + map.put("REGISTERPASTHISTORY",pastHistory); | |
| 496 | + String familyHistory=""; | |
| 497 | + if(StringUtils.isNotEmpty(antExChuModel.getFamilyHistory())){ | |
| 498 | + Map map1 = JsonUtil.jkstr2Obj(antExChuModel.getFamilyHistory(), Map.class); | |
| 499 | + familyHistory = FunvCommonUtil.replace(map1, new StringBuilder(), basicConfigService); | |
| 500 | + } | |
| 501 | + map.put("REGISTERFAMILYHISTORY",familyHistory); | |
| 502 | + String cestationInfo=""; | |
| 503 | + if(StringUtils.isNotEmpty(antExChuModel.getCestationInfo())){ | |
| 504 | + Map map1 = JsonUtil.jkstr2Obj(antExChuModel.getCestationInfo(), Map.class); | |
| 505 | + cestationInfo = FunvCommonUtil.replace(map1, new StringBuilder(), basicConfigService); | |
| 506 | + } | |
| 507 | + map.put("GESTATIONSTATUS",cestationInfo); | |
| 486 | 508 | mList.add(map); |
| 487 | 509 | }catch (Exception e){ |
| 488 | 510 | e.printStackTrace(); |
| 489 | 511 | |
| ... | ... | @@ -529,14 +551,20 @@ |
| 529 | 551 | } |
| 530 | 552 | String cDueWeek = ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getCheckDate()); |
| 531 | 553 | int week = Integer.parseInt(cDueWeek.substring(1, cDueWeek.indexOf("周"))); |
| 532 | - int day = Integer.parseInt(cDueWeek.substring(cDueWeek.indexOf("+") + 1, cDueWeek.indexOf("天"))); | |
| 554 | + int status = cDueWeek.indexOf("+"); | |
| 555 | + Integer day = null; | |
| 556 | + if(-1 != status){ | |
| 557 | + day = (int)Integer.parseInt(cDueWeek.substring(cDueWeek.indexOf("+")+1, cDueWeek.indexOf("天"))); | |
| 558 | + } | |
| 533 | 559 | Map<String,String> map = new HashMap<String,String>(); |
| 534 | 560 | map.put("MATERNALFOLLOWUPID",data.getId()); |
| 535 | 561 | map.put("MATERNALINFOID",patients.getId()); |
| 536 | 562 | map.put("NAME",patients.getUsername()); |
| 537 | 563 | map.put("FOLLOWUPDATE",DateUtil.getyyyy_MM_dd(data.getCheckDate())); |
| 538 | 564 | map.put("GESTWEEKS",String.valueOf(week)); |
| 539 | - map.put("GESTDAYS",String.valueOf(day)); | |
| 565 | + if(day != null) { | |
| 566 | + map.put("GESTDAYS", String.valueOf(day)); | |
| 567 | + } | |
| 540 | 568 | map.put("WEIGHT",String.valueOf(data.getWeight())); |
| 541 | 569 | map.put("CHIEFCOMPLAINT",data.getChiefComplaint()); |
| 542 | 570 | map.put("FUNDUSHEIGHT",data.getGongGao()); |
| ... | ... | @@ -700,7 +728,11 @@ |
| 700 | 728 | |
| 701 | 729 | String cDueWeek = data.getDueWeek(); |
| 702 | 730 | int week = Integer.parseInt(cDueWeek.substring(1, cDueWeek.indexOf("周"))); |
| 703 | - int day = Integer.parseInt(cDueWeek.substring(cDueWeek.indexOf("+") + 1, cDueWeek.indexOf("天"))); | |
| 731 | + int status = cDueWeek.indexOf("+"); | |
| 732 | + Integer day = null; | |
| 733 | + if(-1 != status){ | |
| 734 | + day = (int)Integer.parseInt(cDueWeek.substring(cDueWeek.indexOf("+")+1, cDueWeek.indexOf("天"))); | |
| 735 | + } | |
| 704 | 736 | Map<String, String> map = new HashMap<String, String>(); |
| 705 | 737 | map.put("MATERNALCHILDBIRTHID", data.getId()); |
| 706 | 738 | map.put("MATERNALINFOID", patients.getId()); |
| ... | ... | @@ -734,8 +766,9 @@ |
| 734 | 766 | |
| 735 | 767 | map.put("LABORTIME", temp.getDueTime()); |
| 736 | 768 | map.put("GESTTEEKS", String.valueOf(week)); |
| 737 | - map.put("GESTDAYS", String.valueOf(day)); | |
| 738 | - | |
| 769 | + if(day != null) { | |
| 770 | + map.put("GESTDAYS", String.valueOf(day)); | |
| 771 | + } | |
| 739 | 772 | Map<String, Object> mapcc = new HashMap<>(); |
| 740 | 773 | findProcess(data.getProdprocess(), mapcc); |
| 741 | 774 | if (StringUtils.isNotEmpty(mapcc.get("one").toString())) { |