From 4e7df22c6f76696c0b58fb9a4853b87c948488c0 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 15 May 2024 17:53:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=90=8C=20=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E6=9D=83=E9=99=90=E9=9C=80=E6=B1=82=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/query/AntExRecordQuery.java | 12 ++++++++++++ .../com/lyms/platform/query/PatientsQuery.java | 12 ++++++++++++ .../operate/web/facade/AntExRecordFacade.java | 22 +++++++++++++++++++++- .../operate/web/facade/MatDeliverFacade.java | 22 +++++++++++++++++++++- .../platform/operate/web/facade/PatientFacade.java | 21 ++++++++++++++++++++- 5 files changed, 86 insertions(+), 3 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java index 01d8a2e..698485b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java @@ -441,6 +441,7 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery //产检医生id private String cId; + private List cIdList; private Date buildTimeStart; private Date buildTimeEnd; @@ -545,6 +546,14 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery this.cId = cId; } + public List getcIdList() { + return cIdList; + } + + public void setcIdList(List cIdList) { + this.cIdList = cIdList; + } + public Integer getStatus() { return status; } @@ -743,6 +752,9 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery if (StringUtils.isNotEmpty(cId)) { condition = condition.and("checkDoctor", cId, MongoOper.IS); } + if (CollectionUtils.isNotEmpty(cIdList)) { + condition = condition.and("checkDoctor", cIdList, MongoOper.IN); + } if (StringUtils.isNotEmpty(fId)) { condition = condition.and("fId", fId, MongoOper.IS); } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 14dc443..1dbed34 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -417,6 +417,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { //分娩医生 private String deliverDoctor; + private List deliverDoctorList; //秦皇岛定制字段：是否产筛 0：未产筛 1：已产筛 public Integer productionSieveType; @@ -492,6 +493,14 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { this.deliverDoctor = deliverDoctor; } + public List getDeliverDoctorList() { + return deliverDoctorList; + } + + public void setDeliverDoctorList(List deliverDoctorList) { + this.deliverDoctorList = deliverDoctorList; + } + public String getBreastType() { return breastType; } @@ -962,6 +971,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (StringUtils.isNotEmpty(deliverDoctor)) { condition = condition.and("deliverDoctor", deliverDoctor, MongoOper.IS); } + if (CollectionUtils.isNotEmpty(deliverDoctorList)) { + condition = condition.and("deliverDoctor", deliverDoctorList, MongoOper.IN); + } //筛选乳房列表是否做过检查0,1。false为了查出数据中没有该字段的。 Criteria c2 = MongoCondition.newInstance().getCriteria(); if (StringUtils.isNotEmpty(breastType)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 1fb5750..fb12183 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -218,7 +218,27 @@ public class AntExRecordFacade { } //产检医生 if("2100002419".equals(hospitalId)){//大同 - antExRecordQuery.setcId(userId == null ? "" : userId.toString()); + Users u = usersService.getUsers(userId); + //产科网络 及 医务科 看全科室的 + if("2100004954".equals(u.getDeptId()) || "2100004955".equals(u.getDeptId())){ + if(StringUtils.isNotEmpty(antExManagerQueryRequest.getCheckDoctor())){ + antExRecordQuery.setcId(antExManagerQueryRequest.getCheckDoctor()); + } + }else if("4".equals(u.getZhiChenId())){//主任看本科室 + List cIdList = new ArrayList<>(); + UsersQuery usersQuery = new UsersQuery(); + usersQuery.setDeptId(u.getDeptId()); + usersQuery.setYn(YnEnums.YES.getId()); + List usersList = usersService.queryUsers(usersQuery); + if (CollectionUtils.isNotEmpty(usersList)) { + for (Users users : usersList) { + cIdList.add(users.getId().toString()); + } + } + antExRecordQuery.setcIdList(cIdList); + }else{ + antExRecordQuery.setcId(userId == null ? "" : userId.toString()); + } }else{ if(StringUtils.isNotEmpty(antExManagerQueryRequest.getCheckDoctor())){ antExRecordQuery.setcId(antExManagerQueryRequest.getCheckDoctor()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index c9b377b..d4116e6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -2704,7 +2704,27 @@ public class MatDeliverFacade { //隆化需求按接诊医生查询 //&&"2100001605".equals(hid) 去掉，前台入参有这个参数 if("2100002419".equals(hid)){//大同 - patientsQuery.setDeliverDoctor(childbirthManagerRequest.getOperatorId() == null ? "" : childbirthManagerRequest.getOperatorId().toString()); + Users u = usersService.getUsers(childbirthManagerRequest.getOperatorId()); + //产科网络 及 医务科 看全科室的 + if("2100004954".equals(u.getDeptId()) || "2100004955".equals(u.getDeptId())){ + if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())) { + patientsQuery.setDeliverDoctor(childbirthManagerRequest.getDeliverDoctor()); + } + }else if("4".equals(u.getZhiChenId())){//主任看本科室 + List deliverDoctorList = new ArrayList<>(); + UsersQuery usersQuery = new UsersQuery(); + usersQuery.setDeptId(u.getDeptId()); + usersQuery.setYn(YnEnums.YES.getId()); + List usersList = usersService.queryUsers(usersQuery); + if (CollectionUtils.isNotEmpty(usersList)) { + for (Users users : usersList) { + deliverDoctorList.add(users.getId().toString()); + } + } + patientsQuery.setDeliverDoctorList(deliverDoctorList); + }else{ + patientsQuery.setDeliverDoctor(childbirthManagerRequest.getOperatorId() == null ? "" : childbirthManagerRequest.getOperatorId().toString()); + } }else{ if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())) { patientsQuery.setDeliverDoctor(childbirthManagerRequest.getDeliverDoctor()); 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 bdc31e8..be631b8 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 @@ -28,6 +28,7 @@ import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; import com.lyms.platform.permission.model.Users; +import com.lyms.platform.permission.model.UsersQuery; import com.lyms.platform.permission.service.CouponService; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; @@ -3194,7 +3195,25 @@ public class PatientFacade extends BaseServiceImpl { // patientsQuery.setBookbuildingDoctorList(bookbuildingDoctorList); // } if("2100002419".equals(hospitalId)){ - patientsQuery.setBookbuildingDoctor(patientManagerRequest.getOperatorId()==null ? null : patientManagerRequest.getOperatorId().toString()); + Users u = usersService.getUsers(patientManagerRequest.getOperatorId()); + //产科网络 及 医务科 看全科室的 + if("2100004954".equals(u.getDeptId()) || "2100004955".equals(u.getDeptId())){ + patientsQuery.setBookbuildingDoctor(StringUtils.isEmpty(patientManagerRequest.getBookbuildingDoctor()) ? null : patientManagerRequest.getBookbuildingDoctor()); + }else if("4".equals(u.getZhiChenId())){//主任看本科室 + List bookbuildingDoctorList = new ArrayList<>(); + UsersQuery usersQuery = new UsersQuery(); + usersQuery.setDeptId(u.getDeptId()); + usersQuery.setYn(YnEnums.YES.getId()); + List usersList = usersService.queryUsers(usersQuery); + if (CollectionUtils.isNotEmpty(usersList)) { + for (Users users : usersList) { + bookbuildingDoctorList.add(users.getId().toString()); + } + } + patientsQuery.setBookbuildingDoctorList(bookbuildingDoctorList); + }else{ + patientsQuery.setBookbuildingDoctor(patientManagerRequest.getOperatorId()==null ? null : patientManagerRequest.getOperatorId().toString()); + } }else{ patientsQuery.setBookbuildingDoctor(StringUtils.isEmpty(patientManagerRequest.getBookbuildingDoctor()) ? null : patientManagerRequest.getBookbuildingDoctor()); } -- 1.8.3.1