From bde2841d315c600cfdf1e4e8f76dd3cd6aa66463 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 1 Aug 2019 09:54:32 +0800 Subject: [PATCH] update --- .../src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java | 5 ++++- .../src/main/java/com/lyms/platform/operate/web/Test.java | 4 ---- .../com/lyms/platform/operate/web/service/SyncDataTaskService.java | 4 ++-- .../operate/web/service/impl/DefaultComputeKulServiceImpl.java | 6 +++--- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java index fe3ad10..819fd72 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java @@ -5028,6 +5028,7 @@ public class BasicConfigServiceTest { } + public static void baby35Report(String fileName) { ApplicationContext applicationContext = new ClassPathXmlApplicationContext("classpath:/spring/applicationContext_biz_patient1.xml"); MongoTemplate mongoTemplate @@ -5074,6 +5075,7 @@ public class BasicConfigServiceTest { } + Sheet s1 = wb.getSheet(1); System.out.println(s1.getName() + " : "); int rows1 = s1.getRows(); @@ -5414,7 +5416,7 @@ public class BasicConfigServiceTest { // bloodSugar("F:\\血糖报告\\血糖报告\\血糖报告基础数据格式(2).xls"); // zcet("D:\\doc\\高血压报告20180813模板.xls"); // zcet("D:\\doc\\1.xls",false); -// addBabyBmiHealthConfig("F:\\儿童营养报告\\婴幼儿bmi.xls"); + addBabyBmiHealthConfig("F:\\儿童营养报告\\儿童检查报告\\37-60婴幼儿bmi.xls"); // babyConfig("F:\\儿童营养报告\\儿童营养报告模板.xls"); //babyNutritionConfig("F:\\儿童营养报告\\婴幼儿体重与营养管理报告内容及规则\\儿童膳食报告文章2.xls"); //xyPresentation("E:\\血压报告.xls"); @@ -5442,6 +5444,7 @@ public class BasicConfigServiceTest { //saveQhdGaoWeiWeight("F:\\秦皇岛高危版体重报告.xls"); // saveQhdWeight("F:\\text.xls"); // baby35Report("C:\\Users\\Administrator\\Desktop\\doc\\秦皇岛3-5月龄膳食报告\\3-5月龄儿童膳食报告内容.xls"); +// baby35Report("C:\\Users\\Administrator\\Desktop\\doc\\秦皇岛3-5月龄膳食报告\\3-5月龄儿童膳食报告内容.xls"); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java index 27e7970..e5f1460 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java @@ -15,10 +15,6 @@ public class Test { private static org.apache.log4j.Logger log = Logger.getLogger("HTTP-INVOKE"); public static void main(String[] args) throws Exception { - double result = 44 * 13.2 / 0.6; - int a = ((int)result/100)*100; - System.out.println(result); - System.out.println(a); } public static Integer getLevel(Integer total) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java index 447e949..8aba11c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java @@ -56,8 +56,8 @@ public class SyncDataTaskService { // urls.put("rp-zk-api.healthbaby.com.cn","周口市妇幼保健院"); // urls.put("area-huaiyang-api.healthbaby.com.cn:12356","淮阳县人民医院"); urls.put("area-rongcheng-api.healthbaby.com.cn:12356","荣成"); - urls.put("area-changyi-api.healthbaby.com.cn:12356","昌邑"); - urls.put("area-xtrm-api.healthbaby.com.cn:12356","邢台人民医院系统"); + // urls.put("area-changyi-api.healthbaby.com.cn:12356","昌邑"); + // urls.put("area-xtrm-api.healthbaby.com.cn:12356","邢台人民医院系统"); urls.put("area-zhuchengrenmin-api.healthbaby.com.cn:12356","诸城人民医院"); urls.put("area-hengshui-api.healthbaby.com.cn:8787","衡水区域"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/DefaultComputeKulServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/DefaultComputeKulServiceImpl.java index 3bdc280..adba6ca 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/DefaultComputeKulServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/DefaultComputeKulServiceImpl.java @@ -108,10 +108,10 @@ public class DefaultComputeKulServiceImpl implements IComputeKul { BigDecimal b1 = new BigDecimal(Double.toString(addWeightStart)); BigDecimal b2 = new BigDecimal(Double.toString(addWeightEnd)); BigDecimal bw = null; - if (StringUtils.isEmpty(version)) { - bw = new BigDecimal(Double.toString(beforeWeight)); - } else if ("1".equals(version)) { + if ("1".equals(version) && bmi >= 25) { bw = new BigDecimal(Integer.parseInt(beforeHeight) - 105); + } else if (StringUtils.isEmpty(version)) { + bw = new BigDecimal(Double.toString(beforeWeight)); } -- 1.8.3.1