From facd32dacffc8a21efee790464307cde67fa0a1d Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 14 May 2024 11:35:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=90=8C=20=E5=BB=BA=E6=A1=A3?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2=E5=BD=93=E5=89=8D=E5=8C=BB?= =?UTF-8?q?=E7=94=9F=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/facade/PatientFacade.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index a773a2a..bdc31e8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -13,7 +13,6 @@ import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.result.PageResult; import com.lyms.platform.common.utils.*; -import com.lyms.platform.operate.web.constant.OrganizationConstant; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.service.IPreEugenicsService; @@ -33,7 +32,10 @@ import com.lyms.platform.permission.service.CouponService; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; -import com.lyms.platform.query.*; +import com.lyms.platform.query.AntExChuQuery; +import com.lyms.platform.query.BabyModelQuery; +import com.lyms.platform.query.DataPermissionsModelQuery; +import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.Transformer; import org.slf4j.Logger; @@ -3191,7 +3193,11 @@ public class PatientFacade extends BaseServiceImpl { // } // patientsQuery.setBookbuildingDoctorList(bookbuildingDoctorList); // } - patientsQuery.setBookbuildingDoctor(StringUtils.isEmpty(patientManagerRequest.getBookbuildingDoctor()) ? null : patientManagerRequest.getBookbuildingDoctor()); + if("2100002419".equals(hospitalId)){ + patientsQuery.setBookbuildingDoctor(patientManagerRequest.getOperatorId()==null ? null : patientManagerRequest.getOperatorId().toString()); + }else{ + patientsQuery.setBookbuildingDoctor(StringUtils.isEmpty(patientManagerRequest.getBookbuildingDoctor()) ? null : patientManagerRequest.getBookbuildingDoctor()); + } patientsQuery.setProvinceRegisterId(StringUtils.isEmpty(patientManagerRequest.getProvinceId()) ? null : patientManagerRequest.getProvinceId()); patientsQuery.setCityRegisterId(StringUtils.isEmpty(patientManagerRequest.getCityId()) ? null : patientManagerRequest.getCityId()); patientsQuery.setAreaRegisterId(StringUtils.isEmpty(patientManagerRequest.getAreaId()) ? null : patientManagerRequest.getAreaId()); -- 1.8.3.1