jiangjiazhi / regional-platform

Commit 44b83f378ce2329ab5e47d49993e633f3f156278

Authored by jesse.wang almost 3 years ago

Exists in master and in 6 other branches

体重和产检券修改

Showing 3 changed files with 49 additions and 20 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java
platform-common/pom.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java

...	...	@@ -817,6 +817,12 @@
817	817	if (StringUtils.isNotEmpty(peopleNum)) {
818	818	map.put("peopleNum", peopleNum);
819	819	}
	820	+ if (map.get("content").toString().contains("孕中期产科检查")) {
	821	+ map.put("content", "孕中期产科检查、血常规、尿常规");
	822	+ }
	823	+ if (map.get("content").toString().contains("孕晚期产科检查")) {
	824	+ map.put("content", "孕晚期产科检查、血常规、尿常规");
	825	+ }
820	826	map.put("days", 0);
821	827	//滦平县妇幼保健院2100001377
822	828	//滦平县妇幼保健院首次产检券孕0-12周改为孕0-12周+6天

...	...	@@ -44,6 +44,23 @@
44	44	<artifactId>poi-ooxml-schemas</artifactId>
45	45	<version>3.15</version>
46	46	</dependency>
	47	+ <!-- easypoi-->
	48	+ <dependency>
	49	+ <groupId>cn.afterturn</groupId>
	50	+ <artifactId>easypoi-base</artifactId>
	51	+ <version>4.1.0</version>
	52	+ </dependency>
	53	+ <dependency>
	54	+ <groupId>cn.afterturn</groupId>
	55	+ <artifactId>easypoi-web</artifactId>
	56	+ <version>4.1.0</version>
	57	+ </dependency>
	58	+ <dependency>
	59	+ <groupId>cn.afterturn</groupId>
	60	+ <artifactId>easypoi-annotation</artifactId>
	61	+ <version>4.1.0</version>
	62	+ </dependency>
	63	+ <!-- easypoi-->
47	64	</dependencies>
48	65	<build>
49	66	<plugins>

...	...	@@ -1145,26 +1145,32 @@
1145	1145	* 妊娠期高血压标准：收缩压≥140mmHg和（或）舒张压≥90mmHg
1146	1146	* 正常血压标准：收缩压90-139mmHg，舒张压60-89mmHg
1147	1147	*/
1148		- if (Double.valueOf(request.getValueThree()).compareTo(18.5) < 0){
1149		- //BMI值低体重<18.5
1150		- BaseObjectResponse objectResponse = new BaseObjectResponse();
1151		- objectResponse.setErrorcode(ErrorCodeConstants.WEIGHT_EXPIRE);
1152		- objectResponse.setErrormsg("BMI值低体重<18.5");
1153		- return objectResponse;
1154		- }
1155		- if (Double.valueOf(request.getValueThree()).compareTo(23.9) > 0 && Double.valueOf(request.getValueThree()).compareTo(27.9) < 0){
1156		- //BMI值超重24.0-27.9
1157		- BaseObjectResponse objectResponse = new BaseObjectResponse();
1158		- objectResponse.setErrorcode(ErrorCodeConstants.WEIGHT_EXPIRE);
1159		- objectResponse.setErrormsg("BMI值超重24.0-27.9");
1160		- return objectResponse;
1161		- }
1162		- if (Double.valueOf(request.getValueThree()).compareTo(28.0) > 0){
1163		- //BMI值肥胖≥28
1164		- BaseObjectResponse objectResponse = new BaseObjectResponse();
1165		- objectResponse.setErrorcode(ErrorCodeConstants.WEIGHT_EXPIRE);
1166		- objectResponse.setErrormsg("BMI值肥胖≥28");
1167		- return objectResponse;
	1148	+ //重新计算bmi值
	1149	+ try {
	1150	+ Double bmiDs = Double.valueOf(patientWeightService.getBmi(request.getValueOne(), request.getValueTwo()));
	1151	+ if (bmiDs.compareTo(18.5) < 0){
	1152	+ //BMI值低体重<18.5
	1153	+ BaseObjectResponse objectResponse = new BaseObjectResponse();
	1154	+ objectResponse.setErrorcode(ErrorCodeConstants.WEIGHT_EXPIRE);
	1155	+ objectResponse.setErrormsg("BMI值低体重<18.5");
	1156	+ return objectResponse;
	1157	+ }
	1158	+ if (bmiDs.compareTo(23.9) > 0 && bmiDs.compareTo(27.9) < 0){
	1159	+ //BMI值超重24.0-27.9
	1160	+ BaseObjectResponse objectResponse = new BaseObjectResponse();
	1161	+ objectResponse.setErrorcode(ErrorCodeConstants.WEIGHT_EXPIRE);
	1162	+ objectResponse.setErrormsg("BMI值超重24.0-27.9");
	1163	+ return objectResponse;
	1164	+ }
	1165	+ if (bmiDs.compareTo(28.0) > 0){
	1166	+ //BMI值肥胖≥28
	1167	+ BaseObjectResponse objectResponse = new BaseObjectResponse();
	1168	+ objectResponse.setErrorcode(ErrorCodeConstants.WEIGHT_EXPIRE);
	1169	+ objectResponse.setErrormsg("BMI值肥胖≥28");
	1170	+ return objectResponse;
	1171	+ }
	1172	+ } catch (NumberFormatException e) {
	1173	+ e.printStackTrace();
1168	1174	}
1169	1175
1170	1176	BaseObjectResponse objectResponse = new BaseObjectResponse();