From e12a71a839cb5b69c36a518e4395c7852244be1a Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 17 Oct 2017 14:31:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B9=90=E9=99=B5=E4=BD=8F=E9=99=A2Bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/HighriskChangeHospitalController.java | 4 +++- .../platform/operate/web/facade/PatientMarkHospServiceFacade.java | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java index 00b3164..a2b2f83 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java @@ -335,7 +335,9 @@ public class HighriskChangeHospitalController extends BaseController { if (StringUtils.isNotEmpty(query.getQueryNo())) {//关键字：姓名、联系方式、就诊卡 查询babyId BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery(); babyQuery.setQueryNo(query.getQueryNo()); - babyQuery.setHospitalId(hospitalId); + if (type != null && type == 1) {//转出 + babyQuery.setHospitalId(hospitalId); + } List models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery); //查询建档记录 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java index 0a1f195..94fd9f4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java @@ -9,6 +9,7 @@ import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.DefenceUtils; import com.lyms.platform.operate.web.request.PatientMarkRequest; import com.lyms.platform.operate.web.result.PatienMarkHospResult; import com.lyms.platform.permission.model.*; @@ -502,7 +503,10 @@ public class PatientMarkHospServiceFacade { * @return */ public BaseResponse updatePatientMarkHospital(PatientMarkHospital ps, int type, Integer id) { - PatientMarkHospitalLog markHospitalLog = new PatientMarkHospitalLog(); + //根据用户id获取医院ID + String hospitalId = autoMatchFacade.getHospitalId(id); + ps.setHospitalId(hospitalId); + if (type == 1) {//预约住院 ps.setMakeDoctor(String.valueOf(id)); ps.setMakeDate(new Date()); @@ -591,7 +595,7 @@ public class PatientMarkHospServiceFacade { result.setcDueWeek("已分娩"); } result.setCardNo(patients.getCardNo()); - result.setPhone(patients.getPhone()); + result.setPhone( DefenceUtils.getPhone(patients.getPhone())); result.setVcCardNo(patients.getVcCardNo()); result.setAge(DateUtil.getAge(patients.getBirth()) + "岁"); result.setName(patients.getUsername()); -- 1.8.3.1