jiangjiazhi / regional-platform

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 29 additions and 6 deletions

...	...	@@ -96,15 +96,17 @@
96	96
97	97	<select id="queryGroupHospitalServiceContent" resultMap="HospitalServiceContentResultMap"
98	98	parameterType="com.lyms.platform.permission.model.HospitalServiceContentQuery">
99		- select hospital_id,group_concat(ser_type) as ser_types,create_date,create_user from hospital_service_content group by hospital_id;
	99	+ select hospital_id,group_concat(ser_type) as ser_types,create_date,create_user from hospital_service_content
100	100	<include refid="HospitalServiceContentCondition"/>
	101	+ group by hospital_id
101	102	<include refid="orderAndLimit"/>
102	103	</select>
103	104
104	105	<select id="queryGroupHospitalServiceContentCount" resultType="int"
105	106	parameterType="com.lyms.platform.permission.model.HospitalServiceContentQuery">
106		- select count(1) from hospital_service_content group by hospital_id;
	107	+ select count(1) from hospital_service_content
107	108	<include refid="HospitalServiceContentCondition"/>
	109	+ group by hospital_id
108	110	</select>
109	111
110	112

...	...	@@ -99,6 +99,7 @@
99	99	}
100	100	return baseResponse;
101	101	} catch (Exception e) {
	102	+ e.printStackTrace();
102	103	BaseResponse baseResponse = new BaseResponse();
103	104	baseResponse.setObject(e.getMessage());
104	105	baseResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);

...	...	@@ -183,11 +183,31 @@
183	183	}
184	184	}
185	185	}
	186	+ if (StringUtils.isNotEmpty(hs.getCreateUser())) {
	187	+ try {
	188	+ Users users = usersService.getUsers(Integer.parseInt(hs.getCreateUser()));
	189	+ if (users != null) {
	190	+ result.setCreateUser(users.getName());
	191	+ }
	192	+ } catch (Exception e) {
	193	+ result.setCreateUser("产检医生");
	194	+ }
	195	+ }
	196	+
	197	+ if(StringUtils.isNotEmpty(hs.getSerTypes())){
	198	+ String serTypes [] = hs.getSerTypes().split(",");
	199	+ StringBuffer stb = new StringBuffer();
	200	+ for(String st:serTypes){
	201	+ String serType = PatientSerEnums.SerTypeEnums.getTitle(Integer.parseInt(st));
	202	+ stb.append(serType+"/");
	203	+ }
	204	+ result.setSerType(stb.toString().substring(0,stb.length()-1));
	205	+ }
	206	+
186	207	result.setCreateDate(DateUtil.getyyyy_MM_dd(hs.getCreateDate()));
187		- String serType = PatientSerEnums.SerTypeEnums.getTitle(hs.getSerType());
188		- result.setSerType(serType);
189		- result.setStatus(HospitalSerStatusEnums.getNameById(hs.getStatus()));
190		- result.setCreateUser(hs.getCreateUser());
	208	+ if(hs.getStatus()!=null){
	209	+ result.setStatus(HospitalSerStatusEnums.getNameById(hs.getStatus()));
	210	+ }
191	211	return result;
192	212	}
193	213