diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java index e0e37b7..df1a9a6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java @@ -450,7 +450,15 @@ public class HealthChargeFacade { Map cnames = new LinkedHashMap<>(); cnames.put("userName", "姓名"); cnames.put("age", "年龄"); - cnames.put("week", "孕周"); + + if (CollectionUtils.isNotEmpty(list) && listData.get(0).get("checkMonth") != null) + { + cnames.put("checkMonth", "检查月龄"); + } + else + { + cnames.put("week", "孕周"); + } cnames.put("type", "报告类型"); cnames.put("status", "结算状态"); cnames.put("source", "数据来源"); diff --git a/platform-transfer/src/main/java/com/lyms/platform/worker/BoneTransferWorker.java b/platform-transfer/src/main/java/com/lyms/platform/worker/BoneTransferWorker.java index 52c77e8..e612e9b 100644 --- a/platform-transfer/src/main/java/com/lyms/platform/worker/BoneTransferWorker.java +++ b/platform-transfer/src/main/java/com/lyms/platform/worker/BoneTransferWorker.java @@ -71,7 +71,7 @@ public class BoneTransferWorker extends TransferAbstract implements ITransfer{ map.put("adultPercent",adultPercent); map.put("agePercent",agePercent); map.put("age",age); - map.put("type",1); // + map.put("type",properties.getType()); // if (map.size() > 0 && PatientID != null) {