主工作列表 优化

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

@@ -150,12 +150,18 @@ public function GetList(Request $request)
                     ->orWhereIn('reservation_department_code', $deptNumbers);
             });
         }
+        $dateType = $searchInfo['dateType'] ?? 'reservation_date';
         if ($searchInfo['dateRange']!=null and count($searchInfo['dateRange']) == 2) {
-            $list = $list->where(function ($q) use($searchInfo) {
+            if ($dateType === 'both') {
-                $q->whereBetween('s_list.entrust_date', $searchInfo['dateRange'])
+                $list = $list->where(function ($q) use($searchInfo) {
-                    ->orWhereBetween('s_list.reservation_date', $searchInfo['dateRange']);
+                    $q->whereBetween('s_list.entrust_date', $searchInfo['dateRange'])
-            });
+                        ->orWhereBetween('s_list.reservation_date', $searchInfo['dateRange']);
-
+                });
+            } elseif ($dateType === 'entrust_date') {
+                $list = $list->whereBetween('s_list.entrust_date', $searchInfo['dateRange']);
+            } else {
+                $list = $list->whereBetween('s_list.reservation_date', $searchInfo['dateRange']);
+            }
         }
         if (isset($searchInfo['list_status'])) {
             $list = $list->where('s_list.list_status', $searchInfo['list_status']);

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

@@ -86,10 +86,10 @@
 				<el-form-item label="科室编号:">
 					<el-input v-model="departmentInfo.department_number" :disabled="!isAdmin" />
 				</el-form-item>
-				<!-- <el-form-item label="自动生成天数:">
+				<el-form-item label="自动生成天数:" v-if="departmentInfo.pid == 0 && departmentInfo.appointment_enabled == 1">
 					<el-input-number v-model="departmentInfo.auto_gen_days" :min="1" :max="90" />
 					<span style="color: #aaa; margin-left: 10px; font-size: 12px;">*定时任务自动生成N天后的号源</span>
-				</el-form-item> -->
+				</el-form-item>
 				<el-form-item label="科室状态:" v-if="isAdmin">
 					<el-switch v-model="departmentInfo.department_status" active-text="正常" inactive-text="关闭"
 						:active-value="1" :inactive-value="0" />
@@ -226,7 +226,9 @@
 		department_name: '',
 		department_number: '',
 		department_status: null,
-		appointment_enabled: 0
+		appointment_enabled: 0,
+		auto_gen_days: 15,
+		pid: 0
 	})
 	const Edit = (row) => {
 		dialogVisible.value = true
@@ -235,7 +237,9 @@
 			department_name: row.department_name,
 			department_number: row.department_number,
 			department_status: row.department_status,
-			appointment_enabled: row.appointment_enabled ?? 0
+			appointment_enabled: row.appointment_enabled ?? 0,
+			auto_gen_days: row.auto_gen_days ?? 15,
+			pid: row.pid ?? 0
 		}
 	}
 	const Save = () => {
@@ -260,7 +264,9 @@
 			department_name: '',
 			department_number: '',
 			department_status: 1,
-			appointment_enabled: 0
+			appointment_enabled: 0,
+			auto_gen_days: 15,
+			pid: 0
 		}
 	}
 	//添加账号

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

@@ -8,12 +8,20 @@
 		</el-dialog>
 		<div class="head">
 			<el-row>
+				<el-form-item>
+					<el-select v-model="searchInfo.dateType" placeholder="时间筛选类型"
+						style="margin-left: 8px;width: 150px;">
+						<el-option label="预约日期" value="reservation_date" />
+						<el-option label="医嘱日期" value="entrust_date" />
+						<el-option label="同时生效" value="both" />
+					</el-select>
+				</el-form-item>
 				<el-form-item>
 					<el-date-picker style="margin-left: 8px; width: 150px" v-model="searchInfo.dateRange[0]"
 						type="date" placeholder="开始时间" value-format="YYYY-MM-DD" />
-				<span style="margin: 0 4px;">至</span>
+					<span style="margin: 0 4px;">至</span>
-				<el-date-picker style="width: 150px" v-model="searchInfo.dateRange[1]"
+					<el-date-picker style="width: 150px" v-model="searchInfo.dateRange[1]"
-						type="date" placeholder="结束时间" value-format="YYYY-MM-DD" />
+							type="date" placeholder="结束时间" value-format="YYYY-MM-DD" />
 				</el-form-item>
 				<el-form-item>
 					<el-select :filterable="true" clearable v-model="searchInfo.list_status" placeholder="状态"
@@ -103,7 +111,16 @@
 					<el-tag v-if="scope.row.list_status===3" class="ml-2" type="warning">完成</el-tag>
 				</template>
 			</el-table-column>
-			<el-table-column prop="reg_num" label="登记号" width="100" />
+			<el-table-column label="门诊号" width="120">
+				<template #default="scope">
+					<span v-if="scope.row.patient_type != 0">{{ scope.row.reg_num }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="住院号" width="120">
+				<template #default="scope">
+					<span v-if="scope.row.patient_type == 0">{{ scope.row.episodeid?.slice(-10) }}</span>
+				</template>
+			</el-table-column>
 			<el-table-column prop="user_name" label="姓名" />
 			<el-table-column prop="user_sex" label="性别" width="60">
 				<template #default="scope">
@@ -316,6 +333,7 @@
 	let loading = ref(false)
 	let entrust_ids=ref('')
 	let searchInfo = ref({
+		dateType: 'reservation_date',
 		dateRange: [],
 		list_status: null,
 		patient_type: null,