jiangjiazhi / regional-platform

Commit e9e50e9a7a46d980faed57b379fa34a7dcc5aa17

Authored by shiyang almost 4 years ago

Exists in master and in 6 other branches

update

Showing 2 changed files with 4 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java

...	...	@@ -1197,7 +1197,7 @@
1197	1197	* 前端算出来的月龄model.getMonthAge()直接拿,
1198	1198	* model.getMonthAge()下标0的位置如果是“孕”表示月龄纠正后孩子现在还未出生，这种情况按出生日期计算
1199	1199	*/
1200		- if("216".equals(hospitalId)&&model.getMonthAge().indexOf("孕")!=0){
	1200	+ if("216".equals(hospitalId)&&model.getMonthAge().indexOf("孕")>0){
1201	1201	month=Integer.valueOf(model.getMonthAge().substring(0, model.getMonthAge().indexOf("月")));
1202	1202	}
1203	1203	model.setBirth(babyModel.getBirth());
...	...	@@ -1232,7 +1232,7 @@
1232	1232	* 前端算出来的月龄model.getMonthAge()直接拿,
1233	1233	* model.getMonthAge()下标0的位置如果是“孕”表示月龄纠正后孩子现在还未出生，这种情况按出生日期计算
1234	1234	*/
1235		- if("216".equals(hospitalId)&&model.getMonthAge().indexOf("孕")!=0){
	1235	+ if("216".equals(hospitalId)&&model.getMonthAge().indexOf("孕")>0){
1236	1236	month=Integer.valueOf(model.getMonthAge().substring(0, model.getMonthAge().indexOf("月")));
1237	1237	}
1238	1238	model.setCreateUser(null);
...	...	@@ -1326,7 +1326,7 @@
1326	1326	}else {
1327	1327	redressMonth= "早产纠正月龄："+DateUtil.getBabyMonthAge(dueDate,checkTime);
1328	1328	//大于2岁不在纠正
1329		- if(DateUtil.getBabyMonthAge(dueDate,checkTime).indexOf("岁")!=0){
	1329	+ if(DateUtil.getBabyMonthAge(dueDate,checkTime).indexOf("岁")>0){
1330	1330	Integer age=Integer.valueOf(redressMonth.substring(0, redressMonth.indexOf("岁")));
1331	1331	if(age>=2){
1332	1332	redressMonth=DateUtil.getBabyMonthAge(model.getBirth(), checkTime);

...	...	@@ -122,7 +122,7 @@
122	122	}else {
123	123	redressMonth= DateUtil.getBabyMonthAge(dueDate,new Date());
124	124	//大于2岁不在纠正
125		- if(redressMonth.indexOf("岁")!=0){
	125	+ if(redressMonth.indexOf("岁")>0){
126	126	Integer age=Integer.valueOf(redressMonth.substring(0, redressMonth.indexOf("岁")));
127	127	if(age>=2){
128	128	redressMonth=DateUtil.getBabyMonthAge(model.getBirth(), new Date());