jiangjiazhi / regional-platform

Authored by liquanyu over 8 years ago

Exists in master and in 8 other branches

Showing 3 changed files with 21 additions and 0 deletions

...	...	@@ -171,6 +171,7 @@
171	171	@RequestParam(value = "nextDate", required = false) String nextDate,
172	172	@RequestParam(value = "expVip", required = false) Integer expVip,
173	173	@RequestParam(value = "serviceType", required = false) Integer serviceType,
	174	+ @RequestParam(value = "serviceStatus", required = false) Integer serviceStatus,
174	175	@RequestParam(value = "name", required = false) String name,
175	176	@RequestParam(value = "highRiskType", required = false) Integer highRiskType,
176	177	@RequestParam(value = "diagnose", required = false) String diagnose,
...	...	@@ -192,6 +193,7 @@
192	193	request.setName(name);
193	194	request.setLimit(limit);
194	195	request.setPage(page);
	196	+ request.setServiceStatus(serviceStatus);
195	197
196	198	return babyBookbuildingFacade.queryBabyList(request,loginState.getId());
197	199	}

...	...	@@ -1523,6 +1523,7 @@
1523	1523	result.setMommnyPhone(StringUtils.emptyDeal(model.getMphone()));
1524	1524	result.setMommnyEncryptPhone(StringUtils.encryPhone(model.getMphone()));
1525	1525	result.setServiceStatus(StringUtils.emptyDeal(model.getServiceStatus() == null ? "" : ServiceStatusEnums.getNameById(model.getServiceStatus())));
	1526	+ result.setServiceType(StringUtils.emptyDeal(model.getServiceType() == null ? "" : ServiceTypeEnums.getTitleById(model.getServiceType())));
1526	1527	result.setNextDate(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getNextDate())));
1527	1528	result.setMonthAge(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), new Date())));
1528	1529	result.setPatientId(model.getParentId());
...	...	@@ -1628,6 +1629,13 @@
1628	1629
1629	1630	if (request.getServiceType() != null && request.getServiceType() != 100) {
1630	1631	babyQuery.setServiceType(request.getServiceType());
	1632	+ }
	1633	+
	1634	+ if (request.getServiceStatus() != null) {
	1635	+ if (!(request.getServiceStatus() == ServiceStatusEnums.STANDARD_ALL.getId() \|\| request.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId()))
	1636	+ {
	1637	+ babyQuery.setServiceStatus(request.getServiceStatus());
	1638	+ }
1631	1639	}
1632	1640
1633	1641	if (request.getExpVip() != null && request.getExpVip() == 1) {

...	...	@@ -33,6 +33,9 @@
33	33	//服务状态
34	34	private String serviceStatus;
35	35
	36	+ //服务类型
	37	+ private String serviceType;
	38	+
36	39	//是否高危
37	40	private String highRisk;
38	41
...	...	@@ -41,6 +44,14 @@
41	44
42	45	//诊断
43	46	private String diagnose;
	47	+
	48	+ public String getServiceType() {
	49	+ return serviceType;
	50	+ }
	51	+
	52	+ public void setServiceType(String serviceType) {
	53	+ this.serviceType = serviceType;
	54	+ }
44	55
45	56	public String getMommnyEncryptPhone() {
46	57	return mommnyEncryptPhone;