diff --git a/Laravel/app/Services/Admin/YeWu/CheckItemService.php b/Laravel/app/Services/Admin/YeWu/CheckItemService.php
index 39b82ac..5bf6dbe 100644
--- a/Laravel/app/Services/Admin/YeWu/CheckItemService.php
+++ b/Laravel/app/Services/Admin/YeWu/CheckItemService.php
@@ -55,6 +55,22 @@ public function GetItemList($searchInfo,$page,$pageSize){
});
}
}
+ //只显示参与预约科室的项目
+ if (!empty($searchInfo['appointmentDeptOnly'])) {
+ $deptNumbers = DB::table('s_department')
+ ->where('appointment_enabled', 1)
+ ->where('is_del', 0)
+ ->where('department_status', 1)
+ ->pluck('department_number')
+ ->toArray();
+ if (!empty($deptNumbers)) {
+ $list->where(function($q) use ($deptNumbers) {
+ foreach ($deptNumbers as $num) {
+ $q->orWhere('hisExecDepts', 'like', '%"' . $num . '"%');
+ }
+ });
+ }
+ }
$count = $list->count();
$list= $list
->leftJoin('s_appointment_type', 's_check_item.reservation_method', '=', 's_appointment_type.id')
diff --git a/YiJi-admin/src/views/YeWu/CheckItemConfig.vue b/YiJi-admin/src/views/YeWu/CheckItemConfig.vue
index 1fd77fb..1b7d38c 100644
--- a/YiJi-admin/src/views/YeWu/CheckItemConfig.vue
+++ b/YiJi-admin/src/views/YeWu/CheckItemConfig.vue
@@ -27,6 +27,7 @@
+ 只显示参与预约科室的项目
@@ -315,7 +316,8 @@
orderField: '',
orderDirection: '',
hisExecDepts: '1',
- deviceBind: ''
+ deviceBind: '',
+ appointmentDeptOnly: false
})
//选中的项目信息
let selectedItemInfo = ref({