jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 39e7462fe5ba03f7d88c5a87428437b1d19511bd

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

修改初诊返回数据bug

Showing 1 changed file with 17 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 39e7462
... ... @@ -364,7 +364,15 @@
364 364 map.put("prodTime", UnitUtils.unitSplice(data.getProdTime(),UnitConstants.CI));
365 365 map.put("delivery", UnitUtils.unitSplice(data.getDelivery(),UnitConstants.CI));
366 366 map.put("planedProd", UnitUtils.unitSplice(data.getPlanedProd(),UnitConstants.CI));
367   - map.put("abortion", UnitUtils.unitSplice(data.getAbortion(),UnitConstants.CI));
  367 + //流产
  368 + String abortion = "";
  369 + abortion = UnitUtils.unitSplice(data.getAbortion(),UnitConstants.CI) == null ? "" : (UnitUtils.unitSplice(data.getAbortion(),UnitConstants.CI) + " (自然:" + data.getAbortionZR() + UnitConstants.CI + " 人工:" +
  370 + data.getAbortionRG() + UnitConstants.CI + ")");
  371 + map.put("abortion", abortion);
  372 +
  373 + /*map.put("abortion", UnitUtils.unitSplice(data.getAbortion(),UnitConstants.CI) + " (自然:" + data.getAbortionZR() + UnitConstants.CI + " 人工:" +
  374 + data.getAbortionRG() + UnitConstants.CI);*/
  375 +
368 376 map.put("stillbirth", UnitUtils.unitSplice(data.getStillbirth(),UnitConstants.CI));
369 377 map.put("stillChan", UnitUtils.unitSplice(data.getStillChan(),UnitConstants.CI));
370 378 map.put("neoDeath", UnitUtils.unitSplice(data.getNeoDeath(),UnitConstants.CI));
371 379  
372 380  
373 381  
... ... @@ -579,14 +587,16 @@
579 587 map.put("id",data.getId());
580 588 map.put("username",patients.getUsername());
581 589 map.put("birth",DateUtil.getyyyy_MM_dd(patients.getBirth()));
582   - map.put("age",UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()),UnitConstants.SUI));
  590 + map.put("age",UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()), UnitConstants.SUI));
583 591 map.put("phone",patients.getPhone());
584   - map.put("fmWeek",patients.getFmWeek()==null ? "": com.lyms.platform.common.utils.StringUtils.dueWeek(patients.getFmWeek()));
  592 + map.put("fmWeek", ResolveUtils.getPregnancyWeek(patients.getLastMenses(), new Date()));
585 593 map.put("dueDate",DateUtil.getyyyy_MM_dd(patients.getDueDate()));
586 594 map.put("mremark",patients.getMremark());
587 595  
588   - getRisk(data.getRiskFactor(),data.getOtherRisk(),map);
  596 + map.put("barCode",data.getBarCode());
589 597  
  598 + getRisk(data.getRiskFactor(), data.getOtherRisk(), map);
  599 +
590 600 //产检基本信息
591 601 map.put("checkDate",DateUtil.getyyyy_MM_dd(data.getCheckDate()));
592 602 map.put("currentDueDate",data.getCurrentDueDate());
... ... @@ -610,7 +620,8 @@
610 620 }
611 621 map.put("hospital", hospital);
612 622 map.put("nextCheckTime",DateUtil.getyyyy_MM_dd(data.getNextCheckTime()));
613   - map.put("cDueWeek", data.getcDueWeek()==null ? "": com.lyms.platform.common.utils.StringUtils.dueWeek(Integer.parseInt(data.getcDueWeek())));
  623 + map.put("cDueWeek",ResolveUtils.getPregnancyWeek(patients.getLastMenses(),data.getCheckDate()));
  624 +// map.put("cDueWeek", data.getcDueWeek()==null ? "": com.lyms.platform.common.utils.StringUtils.dueWeek(Integer.parseInt(data.getcDueWeek())));
614 625  
615 626 /* 复诊信息 */
616 627 map.put("chiefComplaint", data.getChiefComplaint());
... ... @@ -660,7 +671,7 @@
660 671 /* 辅助信息 */
661 672 map.put("hemoglobin", UnitUtils.unitSplice(data.getHemoglobin(), UnitConstants.GL));
662 673 map.put("urineProtein",data.getUrineProtein());
663   - map.put("bloodSugar", UnitUtils.unitSplice(data.getUrineProtein(), UnitConstants.MMOLL));
  674 + map.put("bloodSugar", UnitUtils.unitSplice(data.getBloodSugar(), UnitConstants.MMOLL));
664 675 map.put("bChao",data.getbChao());
665 676  
666 677 /* 诊断指导 */
... ... @@ -1360,8 +1371,6 @@
1360 1371 br.setData(map);
1361 1372 return br;
1362 1373 }
1363   -
1364   -
1365 1374  
1366 1375 }