diff --git a/Laravel/app/Services/Admin/YeWu/DeptCheckItemService.php b/Laravel/app/Services/Admin/YeWu/DeptCheckItemService.php index 7598654..279bd56 100644 --- a/Laravel/app/Services/Admin/YeWu/DeptCheckItemService.php +++ b/Laravel/app/Services/Admin/YeWu/DeptCheckItemService.php @@ -118,6 +118,18 @@ public function GetItemList($searchInfo,$page,$pageSize,$userid){ ->where('item_id',$v->id) ->whereIn('s_check_item_device.device_id', $deptDeviceIds) ->get(); + // 解析HIS绑定科室 + $deptNames = []; + if (!empty($v->hisExecDepts)) { + $deptCodes = json_decode($v->hisExecDepts, true); + if (!empty($deptCodes) && is_array($deptCodes)) { + $deptNames = DB::table('s_department') + ->whereIn('department_number', $deptCodes) + ->pluck('department_name') + ->toArray(); + } + } + $list[$k]->his_exec_dept_names = $deptNames; } return \Yz::Return(true, '查询成功', ['list'=>$list,'count'=>$count]); diff --git a/YiJi-admin/src/views/YeWu/DeptCheckItemConfig.vue b/YiJi-admin/src/views/YeWu/DeptCheckItemConfig.vue index 3313637..df087b6 100644 --- a/YiJi-admin/src/views/YeWu/DeptCheckItemConfig.vue +++ b/YiJi-admin/src/views/YeWu/DeptCheckItemConfig.vue @@ -41,6 +41,12 @@ + + +