1. 科室增加上下级绑定关联。

2. 删除掉二级科室（如：CT一室）下的所有诊室
3. 科室列表增加只显示存在执行诊室的科室的开关。默认开启。
4. 主工作列表可以看到全部本身以及子诊室的预约信息
5. 主工作列表执行诊室顺序显示逻辑：距离当前开立检查医嘱时间最近，有可用的预约号源，数量多，排在最前，如果都有每次随机

Laravel/app/Http/Controllers/API/Admin/YeWu/DepartmentController.php

@@ -44,7 +44,27 @@ public function Del()
         $service = new DepartmentService();
         return $service->Del($id);
     }
-
+    //获取科室已关联的子科室ID列表
-
+    public function GetChildren()
+    {
+        $department_id = request('department_id');
+        $service = new DepartmentService();
+        return $service->GetChildren($department_id);
+    }
+    //获取可作为诊室的叶子节点科室列表
+    public function GetLeafList()
+    {
+        $department_id = request('department_id');
+        $service = new DepartmentService();
+        return $service->GetLeafList($department_id);
+    }
+    //保存科室关联诊室关系
+    public function SaveChildren()
+    {
+        $department_id = request('department_id');
+        $children_ids = request('children_ids', []);
+        $service = new DepartmentService();
+        return $service->SaveChildren($department_id, $children_ids);
+    }
 
 }

Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php

@@ -136,10 +136,18 @@ public function GetList(Request $request)
 
             $list=$list->where(['reservation_department'=>$department->department_name]);
         }else{
-
+            //获取当前科室及所有子科室的 department_number
-            $list = $list->where(function ($q) use($department) {
+            $deptNumbers = DB::table('s_department')
-                $q->where(['RISRAcceptDeptCode'=>$department->department_number])
+                ->where('is_del', 0)
-                    ->orWhere('reservation_department_code', $department->department_number);
+                ->where(function($q) use ($department_id) {
+                    $q->where('id', $department_id)
+                      ->orWhere('pid', $department_id);
+                })
+                ->pluck('department_number');
+
+            $list = $list->where(function ($q) use($deptNumbers) {
+                $q->whereIn('RISRAcceptDeptCode', $deptNumbers)
+                    ->orWhereIn('reservation_department_code', $deptNumbers);
             });
         }
         if ($searchInfo['dateRange']!=null and count($searchInfo['dateRange']) == 2) {

Laravel/app/Http/Controllers/API/His/DepartmentController.php

@@ -38,4 +38,58 @@ public function GetDepartmentList(){
         }
         return \Yz::JsonError("调用His接口失败");
     }
+    //根据入参数据同步科室（不调用HIS接口）
+    public function SyncDepartmentFromData()
+    {
+        $data = request('data');
+        $password = request('password');
+
+        //调试输出
+        \Log::debug('SyncDepartmentFromData 入参', [
+            'password' => $password,
+            'data_type' => gettype($data),
+            'data' => $data
+        ]);
+
+        //校验password
+        if ($password !== '324F883D-D501-40AD-8740-98536606906D') {
+            return \Yz::JsonError('密钥验证失败，password: '.$password);
+        }
+
+        if (empty($data) || !is_array($data)) {
+            return \Yz::JsonError('数据不能为空，data类型: '.gettype($data));
+        }
+
+        $up_count = 0;
+        foreach ($data as $i => $item) {
+            //调试输出每条数据
+            \Log::debug('SyncDepartmentFromData 处理第'.$i.'条', ['item' => $item]);
+
+            if (!isset($item['deptCode']) || !isset($item['deptName'])) {
+                \Log::error('SyncDepartmentFromData 字段缺失', ['index' => $i, 'item' => $item]);
+                continue;
+            }
+
+            $dpt = DB::table('s_department')
+                ->where('department_number', $item['deptCode'])
+                ->first();
+
+            if (!$dpt) {
+                DB::table('s_department')->insert([
+                    'department_number' => $item['deptCode'],
+                    'department_name'   => $item['deptName'],
+                    'department_status' => 1,
+                    'is_del'            => 0,
+                ]);
+                $up_count++;
+            } else {
+                DB::table('s_department')
+                    ->where('department_number', $item['deptCode'])
+                    ->update(['department_name' => $item['deptName']]);
+                $up_count++;
+            }
+        }
+
+        return \Yz::JsonReturn(true, "同步完成，更新{$up_count}条数据", ['up_count' => $up_count]);
+    }
 }

Laravel/app/Services/Admin/YeWu/DepartmentService.php

@@ -31,13 +31,26 @@ public function GetList($searchInfo,$page,$pageSize,$userid=null,$group=null)
       if(!empty($searchInfo['name'])){
           $list=  $list->where('department_name','like','%'.$searchInfo['name'].'%');
       }
+      //只显示执行科室（有科室资源的科室）
+      if(!empty($searchInfo['only_execute'])){
+          $hasResourceDeptIds = DB::table('s_department_resources')
+              ->where('is_del', 0)
+              ->distinct()
+              ->pluck('department_id');
+          $list = $list->whereIn('id', $hasResourceDeptIds);
+      }
+      //只显示一级科室（pid=0的顶级科室）
+      if(!empty($searchInfo['only_first_level'])){
+          $list = $list->where('pid', 0);
+      }
       $c=$list->count();
       $l=$list ->orderBy('id','desc')->skip(($page-1)*$pageSize)
         ->take($pageSize)->get() ;
-      //查询科室下的资源总数
+      //查询科室下的资源总数和子科室数量
         foreach ($l as $k=>$v){
             $l[$k]->user_list=DB::table('users')->where(['department_id'=>$v->id,'status'=>1])->get();
             $l[$k]->resource_count=DB::table('s_department_resources')->where(['department_id'=>$v->id,'is_del'=>0])->count();
+            $l[$k]->children_count=DB::table('s_department')->where(['pid'=>$v->id,'is_del'=>0])->count();
         }
       return \Yz::Return(true, '查询成功', ['list'=>$l,'count'=>$c]);
   }
@@ -80,6 +93,8 @@ public function Save($info)
   }
   public function Del($id)
   {
+      //将子科室的pid置0
+      DB::table('s_department')->where('pid',$id)->where('is_del',0)->update(['pid'=>0]);
       $c= DB::table('s_department')->where('id',$id)->update(['is_del'=>1]);
       if(!$c){
           return \Yz::Return(false, '删除失败', []);
@@ -87,4 +102,56 @@ public function Del($id)
           return \Yz::Return(true, '删除成功', []);
       }
   }
+  //获取科室已关联的子科室ID列表
+  public function GetChildren($department_id)
+  {
+      $ids = DB::table('s_department')
+          ->where('pid', $department_id)
+          ->where('is_del', 0)
+          ->pluck('id');
+      return \Yz::Return(true, '查询成功', ['ids' => $ids]);
+  }
+  //获取可作为诊室的叶子节点科室列表（空闲的叶子节点：pid=0且无子科室）
+  public function GetLeafList($department_id)
+  {
+      $subIds = DB::table('s_department')
+          ->where('pid', '>', 0)
+          ->where('is_del', 0)
+          ->pluck('pid');
+
+      //已关联的子科室IDs（供右侧显示）
+      $childrenIds = DB::table('s_department')
+          ->where('pid', $department_id)
+          ->where('is_del', 0)
+          ->pluck('id');
+
+      $list = DB::table('s_department')
+          ->where('is_del', 0)
+          ->where('id', '!=', $department_id)
+          ->where(function($query) use ($subIds, $childrenIds) {
+              $query->where(function($q) use ($subIds) {
+                  $q->where('pid', 0)->whereNotIn('id', $subIds);
+              })->orWhereIn('id', $childrenIds);
+          })
+          ->select('id', 'department_name')
+          ->get();
+      return \Yz::Return(true, '查询成功', ['list' => $list]);
+  }
+  //保存科室关联诊室关系
+  public function SaveChildren($department_id, $children_ids)
+  {
+      //先清空旧关联
+      DB::table('s_department')
+          ->where('pid', $department_id)
+          ->where('is_del', 0)
+          ->update(['pid' => 0]);
+
+      //设置新关联
+      if (!empty($children_ids)) {
+          DB::table('s_department')
+              ->whereIn('id', $children_ids)
+              ->update(['pid' => $department_id]);
+      }
+      return \Yz::Return(true, '保存成功', []);
+  }
 }

Laravel/app/Services/Admin/YeWu/PlanListService.php

@@ -243,7 +243,13 @@ public function GetEnablePlan($regnum, $entrustids, $episodeid, $appointment_typ
         usort($pl1, function($a, $b) {
             $timeA = $a->date . ' ' . ($a->start_time ?? $a->end_time); // 兼容性处理
             $timeB = $b->date . ' ' . ($b->start_time ?? $b->end_time);
-            return $timeA <=> $timeB;
+            if ($timeA !== $timeB) {
+                return $timeA <=> $timeB;
+            }
+            // 相同时间，按可用号源数量降序
+            $availableA = ($a->count - $a->used_count);
+            $availableB = ($b->count - $b->used_count);
+            return $availableB <=> $availableA;
         });
 
 // 取出时间最早的那一个（未过期）

Laravel/routes/api.php

@@ -69,6 +69,9 @@
     Route::post('admin/SaveDepartment','App\Http\Controllers\API\Admin\YeWu\DepartmentController@Save');//保存科室信息
     Route::post('admin/DelDepartment','App\Http\Controllers\API\Admin\YeWu\DepartmentController@Del');//删除科室信息
     Route::post('admin/GetEnableDepartmentList','App\Http\Controllers\API\Admin\YeWu\DepartmentController@GetEnableList');//获取启用的科室列表
+    Route::post('admin/GetDepartmentChildren','App\Http\Controllers\API\Admin\YeWu\DepartmentController@GetChildren');//获取科室已关联的子科室列表
+    Route::post('admin/GetLeafDepartmentList','App\Http\Controllers\API\Admin\YeWu\DepartmentController@GetLeafList');//获取可作为诊室的叶子节点科室列表
+    Route::post('admin/SaveDepartmentChildren','App\Http\Controllers\API\Admin\YeWu\DepartmentController@SaveChildren');//保存科室关联诊室关系
     Route::post('admin/SaveDepartmentResource','App\Http\Controllers\API\Admin\YeWu\DepartmentResourceController@Save');//保存科室资源信息
     Route::post('admin/DepartmentResourceGetList','App\Http\Controllers\API\Admin\YeWu\DepartmentResourceController@GetList');//获取科室资源list
     Route::post('admin/DepartmentResourceGetEnableList','App\Http\Controllers\API\Admin\YeWu\DepartmentResourceController@GetEnableList');//获取可用科室资源
@@ -140,6 +143,7 @@
     Route::post('admin/updateCheckItem','App\Http\Controllers\API\His\CheckItemController@UpdateCheckItem');//调用his更新检查项目
     Route::post('admin/UpdateItemClass','App\Http\Controllers\API\His\CheckItemController@UpdateItemClass');//调用his更新检查项目分类
     Route::post('admin/HisGetDepartmentList','App\Http\Controllers\API\His\DepartmentController@GetDepartmentList');//获取his科室列表
+    Route::post('admin/SyncDepartmentFromData','App\Http\Controllers\API\His\DepartmentController@SyncDepartmentFromData');//根据入参数据同步科室
     Route::post('admin/HisGetUserList','App\Http\Controllers\API\His\UserController@GetUserList');//获取his用户列表
     Route::post('admin/SyncDrugList','App\Http\Controllers\API\His\DrugController@SyncDrugList');//同步药品列表
     Route::post('admin/SyncUndrugList','App\Http\Controllers\API\His\DrugController@SyncUndrugList');//同步非药品列表

YiJi-admin/src/api/api.js

@@ -181,6 +181,18 @@ export const SaveDepartment = (data = {}) => {
 export const GetEnableDepartmentList = (data = {}) => {
   return axios({ url: import.meta.env.VITE_APP_API + 'v1/admin/GetEnableDepartmentList', data: data })
 }
+//admin获取科室已关联的子科室ID列表
+export const GetDepartmentChildren = (data = {}) => {
+  return axios({ url: import.meta.env.VITE_APP_API + 'v1/admin/GetDepartmentChildren', data: data })
+}
+//admin获取可作为诊室的叶子节点科室列表
+export const GetLeafDepartmentList = (data = {}) => {
+  return axios({ url: import.meta.env.VITE_APP_API + 'v1/admin/GetLeafDepartmentList', data: data })
+}
+//admin保存科室关联诊室关系
+export const SaveDepartmentChildren = (data = {}) => {
+  return axios({ url: import.meta.env.VITE_APP_API + 'v1/admin/SaveDepartmentChildren', data: data })
+}
 
 //admin保存科室资源信息
 export const SaveDepartmentResource = (data = {}) => {

YiJi-admin/src/components/Yewu/DepartmentResourcesSave.vue

@@ -1,19 +1,19 @@
 <template>
 	<div>
-		<el-dialog v-model="dialogVisible" title="诊室信息" width="30%"  @close="close()">
+		<el-dialog v-model="dialogVisible" title="排班信息" width="30%"  @close="close()">
 			<el-form :model="ResourcesInfo" label-width="110px" v-loading="loading" style="padding-right: 40px;">
 				<el-form-item label="所属科室:">
 					<el-select  :filterable="true" clearable v-model="ResourcesInfo.department_id" placeholder="选择科室">
 						<el-option v-for="(item,index) in EnableDepartmentList" :key="index" :label="item.department_name" :value="item.id" /> 
 					</el-select> 
 				</el-form-item>
-				<el-form-item label="诊室名称:">
+				<el-form-item label="排班名称:">
 					<el-input v-model="ResourcesInfo.department_resources_name" />
 				</el-form-item>
-				<el-form-item label="诊室位置:">
+				<el-form-item label="资源位置:">
 					<el-input v-model="ResourcesInfo.department_resources_addr" />
 				</el-form-item>
-				<el-form-item label="诊室状态:">
+				<el-form-item label="状态:">
 					<el-switch v-model="ResourcesInfo.department_resources_status"  active-text="可用" inactive-text="关闭"
 						:active-value="1" :inactive-value="0" />
 				</el-form-item>

YiJi-admin/src/components/Yewu/YuYue202506.vue

@@ -2,18 +2,18 @@
 	<div class="YuYue202506">
 
 		<div class="patientInfo" v-if="patientInfo">
-			<div class="item"><span class="name">{{patientInfo.user_name}}</span>（{{patientInfo.user_sex_label}} {{patientInfo.age}}岁）</div>
+			<div class="item"><span class="name">{{patientInfo.user_name}}</span>({{patientInfo.user_sex_label}} {{patientInfo.age}}岁)</div>
-			<div class="item">登记号：<span class="value">{{patientInfo.reg_num}} </span></div>
+			<div class="item">登记号:<span class="value">{{patientInfo.reg_num}} </span></div>
-			<div class="item">电话：<span class="value">{{patientInfo.user_phone}}</span></div>
+			<div class="item">电话:<span class="value">{{patientInfo.user_phone}}</span></div>
-			<div class="item" v-if="patientInfo.warddesc">病区：<span class="value">{{patientInfo.warddesc}}</span></div>
+			<div class="item" v-if="patientInfo.warddesc">病区:<span class="value">{{patientInfo.warddesc}}</span></div>
-			<div class="item" v-if="patientInfo.bedname">床号：<span class="value">{{patientInfo.bedname}}</span></div>
+			<div class="item" v-if="patientInfo.bedname">床号:<span class="value">{{patientInfo.bedname}}</span></div>
-			<div class="item">诊断：<span class="value">{{patientInfo.diagnosisName}}</span></div>
+			<div class="item">诊断:<span class="value">{{patientInfo.diagnosisName}}</span></div>
 		</div>
 		<div v-else>
 			获取患者信息失败
 		</div>
 		<div class="entrustList">
-			<el-alert v-if="hasDifferentBookedDates" title="患者所有检查项目未预约至同一天，请注意是否需手动调整预约" type="danger" :closable="false" show-icon style="margin-bottom: 8px;" />
+			<el-alert v-if="hasDifferentBookedDates" title="患者所有检查项目未预约至同一天,请注意是否需手动调整预约" type="danger" :closable="false" show-icon style="margin-bottom: 8px;" />
 			<el-table :data="entrustTableDate" style="width: 100%;" height="300" row-key="id" v-loading="loading"
 				ref="entrustTableRef" :row-class-name="setRowClassName" @selection-change="handleSelectionChange">
 				<el-table-column type="selection" width="50" :selectable="selectable" />
@@ -105,7 +105,7 @@
 							}" @click="PlanClick(item2.id)"><span
 								v-if="index2=='time_range'">{{item2}}</span><span>{{item2.use_count}}</span></td>
 					</tr>
-					
+
 				</table>
 				<div  v-if="selectedRows.length==0">
 					<el-empty description="请选择项目" />
@@ -147,7 +147,7 @@
 	import {
 		ref,
 		onMounted,
-		watch,computed 
+		watch,computed
 	} from 'vue'
 	import {
 		getMainDetail,
@@ -184,7 +184,7 @@
 		},
 		special_privileges:{
 			type: Array,
-			 default: () => [] 
+			 default: () => []
 		}
 	})
 	let entrustTableRef = ref(null)
@@ -210,7 +210,7 @@
 	let TanChuangMsgDialogVisible=ref(false)
 	const getWeekday = (date1) => {
 		let days = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
-		const date = new Date(date1); // 注意：格式可能因浏览器而异
+		const date = new Date(date1); // 注意:格式可能因浏览器而异
 		const dayOfWeek = date.getDay();
 		return days[dayOfWeek]
 	}
@@ -236,7 +236,7 @@
 			selectedMianListId.value.push(v.id)
 			selectedEntrustId.value.push(v.entrust_id)
 		})
-		
+
 		//遍历已经勾选的项目 如果号源id都相同则 获取可以选定的号源id.------------vvvv
 		const allPlanIdsSame = selectedRows.value.every(
 		  (v) => v.roster_id === selectedRows.value[0]?.roster_id
@@ -244,7 +244,7 @@
 		if (allPlanIdsSame) {
 		  selectedPlanId.value = selectedRows.value[0]?.roster_id;
 		  if(selectedPlanId.value!==0 && selectedPlanId.value){
-			 
+
 			  startDate.value=selectedRows.value[0]?.reservation_date
 			  if(checkDateDifference15Day(getTodayDate(),selectedRows.value[0]?.reservation_date) && !!selectedRows.value[0]?.reservation_date){
 				date_list.value=getDatesAfter(selectedRows.value[0]?.reservation_date)
@@ -257,17 +257,17 @@
 		  selectedPlanId.value = 0;
 		}
 		//--------------------------------------------------------------^^^^^
-		
+
 		lastSelection.value.forEach(lastRow => {
 			if (!selectedRows.value.find(s => s === lastRow)) {
 				handleType.value = 'cancel'
 			}
-		}); 
+		});
-		if(selectedRows.value.length==0){//如果全部取消了，则恢复状态
+		if(selectedRows.value.length==0){//如果全部取消了,则恢复状态
 			handleType.value = 'add'
 			lastSelection.value=[]
 		}
-		 
+
 		console.log(handleType.value)
 		if (selectedEntrustId.value.length > 0 && isHandlingSelection.value) {
 			if (handleType.value === 'add' && selectedRows.value[0].list_status==0) {
@@ -349,20 +349,20 @@
 									//date_list.value = getDatesAfter(entrustTableDate.value[i].reservation_date)
 									activeZhenShi.value=entrustTableDate.value[i].department_resources?.department_resources_name
 								}
-								
+
-								
+
 								break;
 							}
 						}
 					}
 
-                  if(onMountedStatus.value){//如果是第一次进入，弹窗提示异常项目的状态
+                  if(onMountedStatus.value){//如果是第一次进入,弹窗提示异常项目的状态
 					  onMountedStatus.value=false;
 					  if(TanChuangMsg.value.length>0){
 						  console.log('22222222222222',TanChuangMsg.value)
 						  TanChuangMsgDialogVisible.value=true;
 					  }
-					  
+
 				  }
 				}
 			} else {
@@ -373,7 +373,7 @@
 	}
 
 	const FindAllMatchItem = () => {
-	
+
 		let list = []
 		//selectedRows.value.reverse();
 		let length=selectedRows.value.length
@@ -471,7 +471,7 @@
 					const timeSlots = Array.from(timeSlotsSet).sort(); // 排序可选
 
 					// Step 2: 构建表格数据
-				
+
 
 					timeSlots.forEach(timeRange => {
 						const row = {
@@ -489,9 +489,6 @@
 							if (matchingPlan) {
 								if (matchingPlan.count - matchingPlan.used_count >= zhanWeiCount && matchingPlan.plan_enable===true) {
 									plan_enable = true
-									if(selectedPlanId.value == 0 || selectedPlanId.value == '' || selectedPlanId.value==null && matchingPlan.id==res.data.earliestPlan){
-										selectedPlanId.value=matchingPlan.id
-									}
 								}
 								if(is_emergency===true && matchingPlan.plan_enable===true && canEmergency.value==true){
 									plan_enable = true
@@ -512,7 +509,18 @@
 
 						planTableData.value.push(row);
 					});
- 
+
+					// 默认选中第一个有号源的 plan（按后端排序：时间最近、号源最多）
+					selectedPlanId.value = 0
+					const firstAvailable = plans.find(v =>
+						v.department_resources_name == activeZhenShi.value &&
+						(v.count - v.used_count) >= zhanWeiCount &&
+						v.plan_enable === true
+					);
+					if (firstAvailable) {
+						selectedPlanId.value = firstAvailable.id
+					}
+
 				}
 			} else {
 				ElMessage.error(res.msg)
@@ -547,7 +555,7 @@
 				end_time: record.end_time,
 				remaining_count: record.remaining_count,
 				status: record.status
-				// 如果需要，可以在这里添加其他字段
+				// 如果需要,可以在这里添加其他字段
 			});
 		});
 
@@ -555,6 +563,7 @@
 	}
 	const zhenshiClick = (zhenshi) => {
 		activeZhenShi.value = zhenshi
+		selectedPlanId.value = 0
 		GetEnablePlanFunc()
 	}
 	const PlanClick = (planid) => {
@@ -601,10 +610,10 @@
 			ElMessage.error("请选择号源")
 			return false;
 		}
-	 
+
-		let msg='确定预约此时间吗？'
+		let msg='确定预约此时间吗?'
 		if(type==2){
-			msg='确定改约至此时间吗？'
+			msg='确定改约至此时间吗?'
 		}
 		ElMessageBox.confirm(
 				msg,
@@ -663,11 +672,11 @@
 			}
 		})
 	}
-	//取消预约（此界面取消预约，不验证密码）
+	//取消预约(此界面取消预约,不验证密码)
 	const CancelYuYueFunc = () => {
 
 		ElMessageBox.confirm(
-				'确定取消预约吗？',
+				'确定取消预约吗?',
 				'提示', {
 					confirmButtonText: '确定',
 					cancelButtonText: '取消',
@@ -724,11 +733,11 @@
 			OrderNoList: selectedEntrustId.value,
 		}).then(res => {
 			if(res.status){
-				 
+
 			}
 		})
 	}
-	//打印申请单 
+	//打印申请单
 	let shenqingdan_list = ref([])
 	const print_shenqingdan = () => {
 		getMainDetail({
@@ -742,7 +751,7 @@
 				shenqingdan_list.value = res.data.info
 				shenqingdan_list.value.forEach((v, i) => {
 					if (v.maininfo.list_status != 1) {
-						ElMessage.error(v.maininfo.entrust + " 不可打印，请重新选择")
+						ElMessage.error(v.maininfo.entrust + " 不可打印,请重新选择")
 						enable = false
 					}
 				})
@@ -796,38 +805,38 @@
 	      if (!datePattern.test(dateString)) {
 	        return false;
 	      }
-	
+
 	      // 创建 Date 对象并检查是否为有效日期
 	      const date = new Date(dateString);
-	      return date.toString() !== "Invalid Date" && 
+	      return date.toString() !== "Invalid Date" &&
 	             !isNaN(date.getTime());
 	    }
-	
+
 	  function  checkDateDifference15Day(date1, date2) {
 	      // 校验日期格式是否正确
 	      if (!isValidDate(date1) || !isValidDate(date2)) {
-	        console.error("日期格式不正确，请使用 YYYY-MM-DD");
+	        console.error("日期格式不正确,请使用 YYYY-MM-DD");
 	        return false; // 或者抛出异常、提示用户等
 	      }
-	
+
 	      const startDate = new Date(date1);
 	      const endDate = new Date(date2);
-	
+
-	      // 计算时间差（毫秒）
+	      // 计算时间差(毫秒)
 	      const diffInMs = endDate - startDate;
-	
+
 	      // 转换为天数
 	      const diffInDays = diffInMs / (1000 * 60 * 60 * 24);
-	
+
 	      return diffInDays > 15;
 	    }
 		function getTodayDate() {
 		  const today = new Date();
-		
+
-		  const year = today.getFullYear(); // 年份，如 2025
+		  const year = today.getFullYear(); // 年份,如 2025
-		  const month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始，所以要 +1
+		  const month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始,所以要 +1
 		  const day = String(today.getDate()).padStart(2, '0'); // 日期
-		
+
 		  return `${year}-${month}-${day}`;
 		}
 	let onMountedStatus=ref(false)

YiJi-admin/src/router/index.js

@@ -150,7 +150,7 @@ const router = createRouter({
 				name: 'YewuDepartmentResources',
 				component: () => import('../views/YeWu/DepartmentResources.vue'),
 				meta: {
-					title: '诊室管理'
+					title: '排班管理'
 				}
 			},{
 				path: '/yewu/deviceCheckItemBind',

YiJi-admin/src/views/YeWu/DepartmentConfig.vue

@@ -14,6 +14,12 @@
 				</el-form-item>
 				<el-button @click="GetList()" style="margin-left: 10px;">查询</el-button>
 				<el-button v-if="isAdmin" type="primary" @click="add()" style="margin-left: 10px;">添加科室</el-button>
+				<el-form-item>
+					<el-checkbox v-model="searchInfo.only_execute" @change="GetList" style="margin-left: 15px;">只显示执行科室</el-checkbox>
+				</el-form-item>
+				<el-form-item>
+					<el-checkbox v-model="searchInfo.only_first_level" @change="GetList" style="margin-left: 15px;">只显示一级科室</el-checkbox>
+				</el-form-item>
 			</el-row>
 		</div>
 		<el-table :data="tableData" style="width: 100%;" row-key="id" :row-style="{'height':'60px'}"
@@ -41,11 +47,19 @@
 					</div>
 				</template>
 			</el-table-column>
-			<el-table-column label="科室资源" v-if="isAdmin">
+			<el-table-column label="排班资源" v-if="isAdmin">
 				<template #default="scope">
-					<div class="zi_button" @click="goto1(scope.row.id)">科室资源 (共 <span
+					<div class="zi_button" @click="goto1(scope.row.id)">排班资源 (共 <span
 							style="color: #dd377f;">{{scope.row.resource_count}}</span> 个)</div>
-					<div v-if="scope.row.department_status==1" class="zi_button2" @click="addResource(scope.row)">添加资源
+					<div v-if="scope.row.department_status==1" class="zi_button2" @click="addResource(scope.row)">添加排班
+					</div>
+				</template>
+			</el-table-column>
+			<el-table-column label="关联诊室" width="200" v-if="isAdmin">
+				<template #default="scope">
+					<div style="display: flex; flex-direction: column; align-items: flex-start; gap: 6px; padding: 4px 0;">
+						<el-button size="small" @click="openLinkDialog(scope.row)">关联诊室</el-button>
+						<span style="color: #00aaff; font-size: 12px;">已关联 {{scope.row.children_count}} 个</span>
 					</div>
 				</template>
 			</el-table-column>
@@ -113,6 +127,24 @@
 		</el-dialog>
 		<DepartmentResourcesSave :departmentId="departmentInfo.id" v-if="AddResourcesShow"
 			@closeAddResources="closeAddResources"></DepartmentResourcesSave>
+		<el-dialog v-model="linkDialogVisible" title="关联诊室" width="60%">
+			<el-transfer
+				class="dept-transfer"
+				v-model="selectedChildren"
+				:data="leafDepartmentList"
+				:props="{ key: 'id', label: 'department_name' }"
+				filterable
+				filter-placeholder="输入科室名称搜索"
+				:titles="['可选诊室', '已关联诊室']"
+				style="display: flex; justify-content: center;"
+			/>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="linkDialogVisible = false">取消</el-button>
+					<el-button type="primary" @click="saveChildren">确定</el-button>
+				</span>
+			</template>
+		</el-dialog>
 	</div>
 </template>
 
@@ -126,7 +158,10 @@
 		SaveDepartment,
 		DelDepartmentInfo,
 		SaveSystemUserInfo,
-		getGroupList
+		getGroupList,
+		GetDepartmentChildren,
+		GetLeafDepartmentList,
+		SaveDepartmentChildren
 	} from '@/api/api.js'
 	import { ElMessage, ElMessageBox } from 'element-plus'
 	import DepartmentResourcesSave from '@/components/Yewu/DepartmentResourcesSave.vue'
@@ -145,6 +180,8 @@
 	let searchInfo = ref({
 		status: null,
 		name: '',
+		only_execute: true,
+		only_first_level: true,
 	})
 	let tableData = ref([])
 	let currentPage = ref(1) //当前页码
@@ -310,6 +347,57 @@
 	const gotoUserList=(row)=>{
 		window.location.href = "./#/adminUserList?departmentId=" + row.id
 	}
+	//关联诊室
+	let linkDialogVisible = ref(false);
+	let currentLinkDepartment = ref(null);
+	let leafDepartmentList = ref([]);
+	let selectedChildren = ref([]);
+
+	const openLinkDialog = (row) => {
+		currentLinkDepartment.value = row
+		selectedChildren.value = []
+		linkDialogVisible.value = true
+		//获取叶子节点列表
+		GetLeafDepartmentList({
+			department_id: row.id
+		}).then(res => {
+			if (res.status) {
+				leafDepartmentList.value = res.data.list
+			} else {
+				ElMessage.error(res.msg)
+			}
+		})
+		//获取已关联的子科室列表
+		GetDepartmentChildren({
+			department_id: row.id
+		}).then(res => {
+			if (res.status) {
+				selectedChildren.value = res.data.ids.map(Number)
+			} else {
+				ElMessage.error(res.msg)
+			}
+		})
+	}
+
+	const saveChildren = () => {
+		loading.value = true
+		SaveDepartmentChildren({
+			department_id: currentLinkDepartment.value.id,
+			children_ids: selectedChildren.value
+		}).then(res => {
+			loading.value = false
+			if (res.status) {
+				linkDialogVisible.value = false
+				ElMessage({
+					message: '关联成功',
+					type: 'success',
+				})
+				GetList()
+			} else {
+				ElMessage.error(res.msg)
+			}
+		})
+	}
 	onMounted(() => {
 		getGroup()
 		GetList()
@@ -339,4 +427,11 @@
 	.adduser{
 		 
 	}
+	:deep(.dept-transfer .el-transfer-panel) {
+		width: 280px;
+	}
+	:deep(.dept-transfer .el-transfer__buttons) {
+		display: flex;
+		align-items: center;
+	}
 </style>

YiJi-admin/src/views/YeWu/DepartmentResources.vue

@@ -17,10 +17,10 @@
 					</el-select>
 				</el-form-item>
 				<el-form-item>
-					<el-input v-model="searchInfo.name" placeholder="请输入资源名称" style="margin-left: 10px;" />
+					<el-input v-model="searchInfo.name" placeholder="请输入排班名称" style="margin-left: 10px;" />
 				</el-form-item>
 				<el-button style="margin-left: 10px;" @click="GetList">查询</el-button>
-				<el-button type="primary" style="margin-left: 10px;" @click="addResource()">添加资源</el-button>
+				<el-button type="primary" style="margin-left: 10px;" @click="addResource()">添加排班</el-button>
 			</el-row>
 		</div>
 		<el-table :data="tableData" style="width: 100%;" row-key="id"  
@@ -28,7 +28,7 @@
 			<el-table-column prop="id" label="Id" width="100" />
 			<el-table-column prop="department_name" label="所属科室" />
 			<el-table-column prop="department_id" label="科室id" v-if="false" />
-			<el-table-column prop="department_resources_name" label="资源名称" />
+			<el-table-column prop="department_resources_name" label="排班名称" />
 			<el-table-column prop="department_resources_addr" label="资源位置" />
 			<el-table-column prop="department_resources_status" label="状态" width="100">
 				<template #default="scope">