jiangjiazhi / regional-platform | GitLab

Commit ad758780d263498b0876b412f2f5f338b18a05d2

Authored by liquanyu over 9 years ago

1 parent 1920a920b7

Exists in master and in 8 other branches

修改儿童建档

Showing 2 changed files with 4 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java

...	...	@@ -216,7 +216,7 @@
216	216	}
217	217
218	218	/**
219		- * 服务状态
	219	+ * 查询服务状态通过服务类型
220	220	* @return
221	221	*/
222	222	@RequestMapping(value = "/getServiceStatusByPid/{pid}", method = RequestMethod.GET)
...	...	@@ -227,7 +227,7 @@
227	227	}
228	228
229	229	/**
230		- * 获取消息类型
	230	+ * 获取消息类型通过对象类型
231	231	* @param serviceObjId
232	232	* @return
233	233	*/

...	...	@@ -460,12 +460,12 @@
460	460	BabyModelQuery babyQuery = new BabyModelQuery();
461	461	babyQuery.setYn(YnEnums.YES.getId());
462	462	List<BabyModel> models = null;
463		- if (!StringUtils.isEmpty(param.getVcCardNo()))
	463	+ if (!StringUtils.isEmpty(param.getCardNo()))
464	464	{
465	465	babyQuery.setMcertNo(param.getCardNo());
466	466	models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
467	467	}
468		- else if (!StringUtils.isEmpty(param.getCardNo()) && !StringUtils.isEmpty(String.valueOf(param.getHospitalId())))
	468	+ else if (!StringUtils.isEmpty(param.getVcCardNo()) && !StringUtils.isEmpty(String.valueOf(param.getHospitalId())))
469	469	{
470	470	babyQuery.setHospitalId(param.getHospitalId());
471	471	babyQuery.setVcCardNo(param.getVcCardNo());