jiangjiazhi / regional-platform

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 9 additions and 3 deletions

...	...	@@ -335,7 +335,9 @@
335	335	if (StringUtils.isNotEmpty(query.getQueryNo())) {//关键字：姓名、联系方式、就诊卡查询babyId
336	336	BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery();
337	337	babyQuery.setQueryNo(query.getQueryNo());
338		- babyQuery.setHospitalId(hospitalId);
	338	+ if (type != null && type == 1) {//转出
	339	+ babyQuery.setHospitalId(hospitalId);
	340	+ }
339	341	List<BabyPatientExtendEarBaby> models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery);
340	342
341	343	//查询建档记录

...	...	@@ -9,6 +9,7 @@
9	9	import com.lyms.platform.common.result.BaseObjectResponse;
10	10	import com.lyms.platform.common.result.BaseResponse;
11	11	import com.lyms.platform.common.utils.DateUtil;
	12	+import com.lyms.platform.common.utils.DefenceUtils;
12	13	import com.lyms.platform.operate.web.request.PatientMarkRequest;
13	14	import com.lyms.platform.operate.web.result.PatienMarkHospResult;
14	15	import com.lyms.platform.permission.model.*;
...	...	@@ -502,7 +503,10 @@
502	503	* @return
503	504	*/
504	505	public BaseResponse updatePatientMarkHospital(PatientMarkHospital ps, int type, Integer id) {
505		- PatientMarkHospitalLog markHospitalLog = new PatientMarkHospitalLog();
	506	+ //根据用户id获取医院ID
	507	+ String hospitalId = autoMatchFacade.getHospitalId(id);
	508	+ ps.setHospitalId(hospitalId);
	509	+
506	510	if (type == 1) {//预约住院
507	511	ps.setMakeDoctor(String.valueOf(id));
508	512	ps.setMakeDate(new Date());
...	...	@@ -591,7 +595,7 @@
591	595	result.setcDueWeek("已分娩");
592	596	}
593	597	result.setCardNo(patients.getCardNo());
594		- result.setPhone(patients.getPhone());
	598	+ result.setPhone( DefenceUtils.getPhone(patients.getPhone()));
595	599	result.setVcCardNo(patients.getVcCardNo());
596	600	result.setAge(DateUtil.getAge(patients.getBirth()) + "岁");
597	601	result.setName(patients.getUsername());