医嘱变更日志记录操作人

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

@@ -391,6 +391,7 @@ public function YuYue()
     {
         date_default_timezone_set('PRC');
         $nowdatetime = date("Y-m-d H:i:s");
+        $do_userid=request('do_user');
         $planid = request('planid');
         $appointment_type = request('appointment_type');//渠道id
         $mainlistid = request('mainlistid');//主表id
@@ -398,7 +399,7 @@ public function YuYue()
         if (!isset($do_type)) return \Yz::echoError1('参数：操作类型 不能为空');
 
         $service = new PlanListService();
-        return $service->YuYue($planid, $appointment_type, $mainlistid, $do_type);
+        return $service->YuYue($planid, $appointment_type, $mainlistid, $do_type,$do_userid);
     }
     //自动预约
     public function AutoYuYue()
@@ -454,10 +455,11 @@ public function CancelYuYue(Request $request)
         $reg_num = request('reg_num');
         $password = request('password');
         $userid = $request->get('userid');//中间件产生的参数
+        $do_userid=request('do_user');
         $query = DB::table('users')->where(['id' => $userid])->get();
         if (password_verify($password, $query[0]->pwd)) {
             $service = new PlanListService();
-            return $service->CancelYuYue($MainListId, $reg_num);
+            return $service->CancelYuYue($MainListId, $reg_num,$do_userid);
         } else {
             return \Yz::echoError1('密码不正确');
         }

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

@@ -373,8 +373,9 @@ public function DoctorCancelYuYue()
     {
         $MainListId = request('MainListId');
         $reg_num = request('reg_num');
+        $do_userid=request('do_user');
         $service = new PlanListService();
-        return  $service->CancelYuYue($MainListId,$reg_num);
+        return  $service->CancelYuYue($MainListId,$reg_num,$do_userid);
     }
     //获取某个患者全部预约记录
     public function GetPersonYuYueList()

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

@@ -184,7 +184,7 @@ public function GetEnablePlan($regnum, $entrustids, $episodeid, $appointment_typ
     }
 
     //开始预约占用名额
-    public function YuYue($planid, $appointment_type, $mainlistids, $do_type)
+    public function YuYue($planid, $appointment_type, $mainlistids, $do_type,$do_user=null)
     {
         date_default_timezone_set('PRC');
         $nowdatetime = date("Y-m-d H:i:s");
@@ -454,7 +454,7 @@ public function YuYue($planid, $appointment_type, $mainlistids, $do_type)
                             'reg_num' => $oldMainInfo->reg_num,
                             'old_status' => $oldMainInfo->list_status,
                             'new_status' => 1,
-                            'create_user' => null,
+                            'create_user' => $do_user,
                             'note' => $note,
                             'data' => json_encode($u_data)
                         ]);
@@ -535,7 +535,7 @@ public function AutoYuYue($regnum,$entrustids,$episodeid,$appointment_type)
         }
     }
 
-    public function CancelYuYue($MainListId, $reg_num)
+    public function CancelYuYue($MainListId, $reg_num,$do_user=null)
     {
         date_default_timezone_set('PRC');
         $nowdatetime = date("Y-m-d H:i:s");
@@ -692,7 +692,7 @@ public function CancelYuYue($MainListId, $reg_num)
                 'reg_num'       => $mainInfo->reg_num,
                 'old_status'    => $mainInfo->list_status,
                 'new_status'    => 0,
-                'create_user'   => null,
+                'create_user'   => $do_user,
                 'note'          => '取消预约',
                 'data'          => json_encode($u_data, JSON_UNESCAPED_UNICODE),
                 'created_at'    => $nowdatetime,

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

@@ -148,10 +148,14 @@
 			type: String
 		},
 		appointment_type: {
-			type: Number
+			type:  [String, Number]
 		},
 		dotype: {
 			type: Number
+		},
+		do_user: {
+			default:'',
+			type: [String, Number]
 		}
 	})
 	let entrustTableRef = ref(null)
@@ -569,7 +573,8 @@
 			mainlistid: selectedMianListId.value,
 			planid: selectedPlanId.value,
 			appointment_type: props.appointment_type,
-			dotype: type, //1预约2改约
+			dotype: type, //1预约2改约,
+			do_user:props.do_user,
 
 		}).then(res => {
 			planLoading.value = false
@@ -619,6 +624,7 @@
 					return DoctorCancelYuYue({
 						MainListId: v.id,
 						reg_num: v.reg_num,
+						do_user:props.do_user,
 					}).then(res => {
 						if (res.status) {
 							ElMessage.success('取消成功')

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

@@ -4,7 +4,7 @@
 			<iframe id="bdIframe" :src="selectedUrl" class="iframe" :key="YuYueKey" scrolling="auto"></iframe>
 		</el-dialog>
 		<el-dialog v-model="YuYueVueDialogVisible" width="100%" @close="closeYuYueDialog()">
-			<YuYue202506 :reg_num="tableSelected[0].reg_num" :entrust_ids="entrust_ids" :key="YuYueKey" :episode_id="tableSelected[0].episodeid" appointment_type="4" :dotype="do_type"></YuYue202506>
+			<YuYue202506 :reg_num="tableSelected[0].reg_num" :entrust_ids="entrust_ids" :key="YuYueKey" :episode_id="tableSelected[0].episodeid" appointment_type="4" :dotype="do_type" :do_user="loginUserinfo.id"></YuYue202506>
 		</el-dialog>
 		<div class="head">
 			<el-row>
@@ -59,8 +59,8 @@
 					<el-input v-model="searchInfo.apply_department" placeholder="申请科室"
 						style="width: 200px;margin-left: 8px;" />
 				</el-form-item>
-				<el-form-item>
-					<el-input v-model="searchInfo.doctor" placeholder="医生"
+				<el-form-item v-if="loginUserinfo">
+					<el-input v-model="searchInfo.doctor" :disabled="loginUserinfo.group==7" placeholder="医生"
 						style="width: 200px;margin-left: 8px;" />
 				</el-form-item>
 				<el-form-item>
@@ -562,7 +562,8 @@
 				CancelYuYue({
 					MainListId: tableSelected.value[0].id,
 					reg_num: tableSelected.value[0].reg_num,
-					password: value
+					do_user:loginUserinfo.value.id,
+					password: value,
 				}).then(res => {
 					loading.value = false
 					if (res.status) {