Commit 91558f2a99cebee98c6b1f915dc97979e549a1d8

Authored by liquanyu
1 parent 2090a69cb9

update

Showing 2 changed files with 10 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java View file @ 91558f2
... ... @@ -450,7 +450,15 @@
450 450 Map<String, String> cnames = new LinkedHashMap<>();
451 451 cnames.put("userName", "姓名");
452 452 cnames.put("age", "年龄");
453   - cnames.put("week", "孕周");
  453 +
  454 + if (CollectionUtils.isNotEmpty(list) && listData.get(0).get("checkMonth") != null)
  455 + {
  456 + cnames.put("checkMonth", "检查月龄");
  457 + }
  458 + else
  459 + {
  460 + cnames.put("week", "孕周");
  461 + }
454 462 cnames.put("type", "报告类型");
455 463 cnames.put("status", "结算状态");
456 464 cnames.put("source", "数据来源");
platform-transfer/src/main/java/com/lyms/platform/worker/BoneTransferWorker.java View file @ 91558f2
... ... @@ -71,7 +71,7 @@
71 71 map.put("adultPercent",adultPercent);
72 72 map.put("agePercent",agePercent);
73 73 map.put("age",age);
74   - map.put("type",1); //
  74 + map.put("type",properties.getType()); //
75 75  
76 76 if (map.size() > 0 && PatientID != null)
77 77 {