jiangjiazhi / regional-platform

Commit bde2841d315c600cfdf1e4e8f76dd3cd6aa66463

Authored by liquanyu almost 6 years ago

Exists in master and in 6 other branches

update

Showing 4 changed files with 9 additions and 10 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/DefaultComputeKulServiceImpl.java

...	...	@@ -5028,6 +5028,7 @@
5028	5028	}
5029	5029
5030	5030
	5031	+
5031	5032	public static void baby35Report(String fileName) {
5032	5033	ApplicationContext applicationContext = new ClassPathXmlApplicationContext("classpath:/spring/applicationContext_biz_patient1.xml");
5033	5034	MongoTemplate mongoTemplate
...	...	@@ -5074,6 +5075,7 @@
5074	5075	}
5075	5076
5076	5077
	5078	+
5077	5079	Sheet s1 = wb.getSheet(1);
5078	5080	System.out.println(s1.getName() + " : ");
5079	5081	int rows1 = s1.getRows();
...	...	@@ -5414,7 +5416,7 @@
5414	5416	// bloodSugar("F:\\血糖报告\\血糖报告\\血糖报告基础数据格式(2).xls");
5415	5417	// zcet("D:\\doc\\高血压报告20180813模板.xls");
5416	5418	// zcet("D:\\doc\\1.xls",false);
5417		-// addBabyBmiHealthConfig("F:\\儿童营养报告\\婴幼儿bmi.xls");
	5419	+ addBabyBmiHealthConfig("F:\\儿童营养报告\\儿童检查报告\\37-60婴幼儿bmi.xls");
5418	5420	// babyConfig("F:\\儿童营养报告\\儿童营养报告模板.xls");
5419	5421	//babyNutritionConfig("F:\\儿童营养报告\\婴幼儿体重与营养管理报告内容及规则\\儿童膳食报告文章2.xls");
5420	5422	//xyPresentation("E:\\血压报告.xls");
...	...	@@ -5442,6 +5444,7 @@
5442	5444	//saveQhdGaoWeiWeight("F:\\秦皇岛高危版体重报告.xls");
5443	5445	// saveQhdWeight("F:\\text.xls");
5444	5446	// baby35Report("C:\\Users\\Administrator\\Desktop\\doc\\秦皇岛3-5月龄膳食报告\\3-5月龄儿童膳食报告内容.xls");
	5447	+// baby35Report("C:\\Users\\Administrator\\Desktop\\doc\\秦皇岛3-5月龄膳食报告\\3-5月龄儿童膳食报告内容.xls");
5445	5448	}
5446	5449
5447	5450	}

...	...	@@ -15,10 +15,6 @@
15	15
16	16	private static org.apache.log4j.Logger log = Logger.getLogger("HTTP-INVOKE");
17	17	public static void main(String[] args) throws Exception {
18		- double result = 44 * 13.2 / 0.6;
19		- int a = ((int)result/100)*100;
20		- System.out.println(result);
21		- System.out.println(a);
22	18	}
23	19
24	20	public static Integer getLevel(Integer total) {

...	...	@@ -56,8 +56,8 @@
56	56	// urls.put("rp-zk-api.healthbaby.com.cn","周口市妇幼保健院");
57	57	// urls.put("area-huaiyang-api.healthbaby.com.cn:12356","淮阳县人民医院");
58	58	urls.put("area-rongcheng-api.healthbaby.com.cn:12356","荣成");
59		- urls.put("area-changyi-api.healthbaby.com.cn:12356","昌邑");
60		- urls.put("area-xtrm-api.healthbaby.com.cn:12356","邢台人民医院系统");
	59	+ // urls.put("area-changyi-api.healthbaby.com.cn:12356","昌邑");
	60	+ // urls.put("area-xtrm-api.healthbaby.com.cn:12356","邢台人民医院系统");
61	61	urls.put("area-zhuchengrenmin-api.healthbaby.com.cn:12356","诸城人民医院");
62	62	urls.put("area-hengshui-api.healthbaby.com.cn:8787","衡水区域");
63	63	}

...	...	@@ -108,10 +108,10 @@
108	108	BigDecimal b1 = new BigDecimal(Double.toString(addWeightStart));
109	109	BigDecimal b2 = new BigDecimal(Double.toString(addWeightEnd));
110	110	BigDecimal bw = null;
111		- if (StringUtils.isEmpty(version)) {
112		- bw = new BigDecimal(Double.toString(beforeWeight));
113		- } else if ("1".equals(version)) {
	111	+ if ("1".equals(version) && bmi >= 25) {
114	112	bw = new BigDecimal(Integer.parseInt(beforeHeight) - 105);
	113	+ } else if (StringUtils.isEmpty(version)) {
	114	+ bw = new BigDecimal(Double.toString(beforeWeight));
115	115	}
116	116
117	117