diff --git a/src/views/HosInformation.vue b/src/views/HosInformation.vue
index 2aad5ae..e22ca2b 100644
--- a/src/views/HosInformation.vue
+++ b/src/views/HosInformation.vue
@@ -367,7 +367,7 @@
                             <!-- getDateCellClass 控制单独医院 的类名-->
                             <div class="calendar-date" v-if="isFutureOrToday(date)"
                                 @click="handleDateClick(data.day, $event, date, data)"
-                                :class="[hosList.length == 1 ? getDateCellClass(data.day) : '', (isConflictDate(data.day) && !is_allow_coincide) ? 'conflict-date' : '',!isCurrentMonth(date) ? 'not-current-month' : '' ]">
+                                :class="[hosList.length == 1 ? getDateCellClass(data.day) : '', (isConflictDate(data.day) && !is_allow_coincide) ? 'conflict-date' : '', !isCurrentMonth(date) ? 'not-current-month' : '']">
                                 <div class="date-header flex-between">
                                     <div class="flex gap12">
                                         <span class="date-text">{{ getDayNumber(data.day) }}</span>
@@ -624,8 +624,6 @@
                     <span class="" style="width: 50px;margin-right: 24px;">上午班</span>
                     <div class="select-container">
                         <div class="selected-hospitals-display" @click="toggleAfternoonDropdown('morn')">
-                            <!-- {{ getAfternoonSelectedNames('morningSelectedHospitals') }} -->
-                            <!-- {{ morningSelectedNames }} -->
                             <div class="flex">
                                 <span v-if="isMorningConflict" class="conflictTip">冲突</span>
                                 <div class="overHostext">{{ morningText }}</div>
@@ -639,7 +637,6 @@
                                 <div class="flex-between option-content">
                                     <span style="color:#333">{{ item.name }}{{ item.morning_plan }}</span>
                                     <div class="checkbox-wrapper" @click.stop>
-                                        <!-- :disabled="!is_allow_coincide && morningSelectedHospitals.length >= 1 && !morningSelectedHospitals.includes(item.hid)" -->
                                         <el-checkbox :key="forceTime"
                                             @change="handleWorkCheckDirect(item, $event, 'morningSelectedHospitals')"
                                             :checked="item.morning_plan == '1' ? true : false"></el-checkbox>
@@ -657,8 +654,6 @@
                             <div class="flex">
                                 <span v-if="isAfternoonConflict" class="conflictTip">冲突</span>
                                 <div class="overHostext">{{ afterText }}</div>
-                                <!-- {{ getAfternoonSelectedNames('afternoonSelectedHospitals') }} -->
-                                <!-- {{ afternoonSelectedNames }} -->
                             </div>
                             <i :class="['el-icon-arrow-down', { 'is-reverse': isAfternoonDropdownOpen }]"></i>
                         </div>
@@ -666,11 +661,9 @@
                             class="hidden-select" @visible-change="handleAfternoonVisibleChange">
                             <el-option v-for="item in hosList" :key="item.hid" :label="item.name" disabled
                                 :value="item.hid">
-                                <!-- v-show="isMorningCheckboxVisible(item.hid)" -->
                                 <div class="flex-between option-content">
                                     <span style="color:#333">{{ item.name }}</span>
                                     <div class="checkbox-wrapper" @click.stop>
-                                        <!-- :disabled="!is_allow_coincide && afternoonSelectedHospitals.length >= 1 && !afternoonSelectedHospitals.includes(item.hid)" -->
                                         <el-checkbox :key="forceTime"
                                             @change="handleWorkCheckDirect(item, $event, 'afternoonSelectedHospitals')"
                                             :checked="item.afternoon_plan == '1' ? true : false"></el-checkbox>
@@ -705,20 +698,24 @@
             </el-form>
         </GuipDialog>
 
-        <!-- <GuipDialog :dialogVisible="visitDialogVisible" :title="visitDialogTitle" :show-close-button="true" width="599"
-            :show-cancel-button="visitShowCancelBtn" @confirm="handleVisitConfirm" :confirmText="visitConfirmText" @cancel="handleVisitCancel" @close="handleVisitClose"
-           >
-            <div class="flex conflictTitle">
-                您设置的 <b>北京大学第一医院 </b>【每周排班】，与以下现有出诊安排冲突，请调整后再保存：
+        <GuipDialog :dialogVisible="visitDialogVisible" :title="visitDialogTitle" :show-close-button="true" width="599"
+            :show-cancel-button="visitShowCancelBtn" @confirm="handleVisitConfirm" :confirmText="visitConfirmText"
+            @cancel="handleVisitCancel" @close="handleVisitClose">
+            <div class="flex conflictTitle mb24">
+                您设置的 <span>{{ form.h_realname }} </span>【每周排班】，与以下现有出诊安排冲突，请调整后再保存：
             </div>
-            <div>
-                <p>2025年11月6日（周二）下午 14:00-15:00</p>
-                <div class="flex">
-                    <span class="conflictTip">冲突</span>
-                    <div>华佗太原针灸方药诊所临时出诊、北京协和医院固定排班</div>
+            <div class="visitContent">
+                <div class="hosPlanItem mb24" v-for="(conflict, index) in hasConflictresult" :key="index">
+                    <p>{{ conflict.date }} {{ conflict.conflictShift }}</p>
+                    <div class="flex">
+                        <span class="conflictTip">冲突</span>
+                        <div>{{ conflict.hospital }}({{ conflict.type === 'fixed' ?
+                            '固定排班' :
+                            '临时出诊' }})</div>
+                    </div>
                 </div>
             </div>
-        </GuipDialog> -->
+        </GuipDialog>
         <GuipDialog :dialogVisible="dialogVisible" :title="dialogTitle" :show-close-button="true" width="762"
             :show-cancel-button="true" @confirm="handleConfirm" @cancel="handleCancel" @close="handleClose"
             @dialogVisibleChange="dialogVisibleChange">
@@ -736,7 +733,9 @@
         </GuipDialog>
 
         <SetAliPay payType="3" :visible="isShowAddAliPay" @update:visible="handleEvent" @update:data="handleUpdateEvent"
-        :isExistSelfSupplys="isExistSelfSupplys" :doctor_id="doctor_id" :depart_id="depart_id" :checkAliPay="checkAliPay"></SetAliPay>
+            :isExistSelfSupplys="isExistSelfSupplys" :doctor_id="doctor_id" :depart_id="depart_id"
+            :checkAliPay="checkAliPay">
+        </SetAliPay>
     </div>
 </template>
 <script>
@@ -937,8 +936,8 @@ export default {
             payTypeAlipay: PAY_TYPE_ALIPAY,
             selectWxpay: null,
             selectAlipay: null,
-            isShowAddAliPay:false,
-            checkAliPay:null,
+            isShowAddAliPay: false,
+            checkAliPay: null,
             onLinePay: null,
             addPayType: -1,
             isShowAddPay: false,
@@ -984,7 +983,7 @@ export default {
             calendarList1: [],
             calendarList: {}, // 用于存储格式化后的排班数据
             rawScheduleData: null, // 存储原始排班数据
-            is_allow_coincide: true,//是否允许时段重合
+            is_allow_coincide: false,//是否允许时段重合
             conflictDates: [], // 存储有冲突的日期
             conflictCount: 0, // 冲突天数统计
             tempAdjustments: {}, // 存储临时调诊数据 {日期: {医院ID: {原班次, 新班次, 状态}}}
@@ -1015,14 +1014,15 @@ export default {
             isAfternoonDropdownOpen: false,//下午班下拉是否展开
             isMornDropdownOpen: false,//上午班下拉是否展开
             visitDialogTitle: '出诊安排重叠，请确认',//出诊冲突框标题
-            visitDialogVisible: true,//出诊冲突提示框
-            visitShowCancelBtn: false,//出诊冲突框是否显示取消按钮
-            visitConfirmText: '确定',//出诊冲突框确认按钮文字
+            visitDialogVisible: false,//出诊冲突提示框
+            visitShowCancelBtn: true,//出诊冲突框是否显示取消按钮
+            visitConfirmText: '确定并保存',//出诊冲突框确认按钮文字
             hasConflictresult: [],
             hasConflict: false, // 控制冲突提示显示
             originalMorningSelected: [], // 保存原始上午选中状态
             originalAfternoonSelected: [], // 保存原始下午选中状态
             forceTime: Date.now(),
+            isRangeConflict: false, // 控制冲突提示显示 
         }
     },
     created() {
@@ -1058,7 +1058,7 @@ export default {
                 this.doctor_id = newVal.doctor_id;
                 this.depart_id = newVal.depart_id;
                 this.getAreaData();
-                if(this.depart_id) {
+                if (this.depart_id) {
                     this.fetchDoctorData();
                     this.fetchPackData();
                     this.fetchProjectData();
@@ -1155,15 +1155,48 @@ export default {
     },
     methods: {
         // 出诊冲突提示-确认
-        handleVisitConfirm(){
+        handleVisitConfirm() {
+            if (!this.is_allow_coincide) {
+                this.saveWorkTimeDirect();
+            }
+            this.visitDialogVisible = false;
+        },
+        async saveWorkTimeDirect() {
+            const { display_work_days, planDays, worktime_no_fixed, worktimes } = this.houseCallSettingForm;
+            var worktimesArray = Object.entries(worktimes).map(([key, value]) => ({
+                type: parseInt(key),
+                plan: value.plan
+            }));
+
+            const params = {
+                doctor_id: this.doctor_id,
+                depart_id: this.depart_id,
+                worktime_no_fixed: worktime_no_fixed,
+                week_visit_plan: JSON.stringify(worktimesArray)
+            }
+
+            if (display_work_days == 1 && planDays > 0) {
+                params.display_work_days = planDays
+            }
 
+            await this.$http('POST', '/api/admin/set_depart_worktime', {
+                ...params
+            }).then(response => {
+                if (response.code == 0) {
+                    this.$Message.success(response.msg || '设置成功')
+                    this.getDoctorHosPreview();
+                }
+            }).catch(error => {
+                console.error(error, 'error')
+            })
         },
         // 出诊冲突提示框-取消
-        handleVisitCancel(){
-
+        handleVisitCancel() {
+            this.handleVisitClose()
         },
         // 出诊冲突提示框-关闭
-        handleVisitClose(){
+        handleVisitClose() {
+            this.visitDialogVisible = false;
 
         },
         isMorningCheckboxVisible(hospitalId) {
@@ -1217,12 +1250,12 @@ export default {
         handleEvent(data) {
             this.isShowAddAliPay = data;
         },
-        handleUpdateEvent(data){
+        handleUpdateEvent(data) {
             this.bindAlipayId = data.payid;
             this.selectAlipay = data;
         },
-        goToAddPay(pay_type){
-            if(pay_type == this.payTypeWeixin) {
+        goToAddPay(pay_type) {
+            if (pay_type == this.payTypeWeixin) {
                 this.$router.push(`/setPaymentForm?doctor_id=${this.doctor_id}&depart_id=${this.depart_id}`);
                 return
             }
@@ -1291,14 +1324,6 @@ export default {
         },
 
         handleWorkCheckDirect(item, checked, workHosType) {
-            // console.log('checkbox变化:', {
-            //     item: item.name,
-            //     checked,
-            //     workHosType,
-            //     currentMorning: [...this.morningSelectedHospitals],
-            //     currentAfternoon: [...this.afternoonSelectedHospitals]
-            // });
-
             if (checked) {
                 this.selectMorningHospital(item.hid, workHosType);
             } else {
@@ -1309,12 +1334,6 @@ export default {
 
 
         selectMorningHospital(hospitalId, workHosType) {
-            // console.log('selectMorningHospital 开始:', {
-            //     hospitalId,
-            //     workHosType,
-            //     morningSelected: [...this.morningSelectedHospitals],
-            //     afternoonSelected: [...this.afternoonSelectedHospitals]
-            // });
 
             // 如果不允许重合，实现互斥选择
             if (!this.is_allow_coincide) {
@@ -1377,16 +1396,6 @@ export default {
                 }
             }
 
-            // console.log('selectMorningHospital 结束:', {
-            //     morningSelected: [...this.morningSelectedHospitals],
-            //     afternoonSelected: [...this.afternoonSelectedHospitals],
-            //     hosList: this.hosList.map(h => ({
-            //         name: h.name,
-            //         morning_plan: h.morning_plan,
-            //         afternoon_plan: h.afternoon_plan
-            //     }))
-            // });
-
             this.updateSelectedText();
             this.checkConflicts();
         },
@@ -1550,7 +1559,6 @@ export default {
 
             this.updateSelectedText();
             this.checkConflicts(); // 初始化时检查冲突
-            // console.log('初始化完成:', this.morningText, this.afternoonSelectedHospitals);
         },
         checkConflicts() {
             if (this.is_allow_coincide) {
@@ -1639,8 +1647,6 @@ export default {
 
                 if (response.code === 0) {
                     this.$message.success('临时调整保存成功');
-                    // this.afternoonSelectedHospitals = [];
-                    // this.morningSelectedHospitals = [];
                     this.$nextTick(() => {
                         this.morningSelectedHospitals = [];
                         this.afternoonSelectedHospitals = [];
@@ -1702,7 +1708,7 @@ export default {
         //     });
         // },
 
-        // 形成出诊文案
+        // tooltip的出诊文案
         getWorkTimeDisplayText(hospital, dateStr, hospitalId) {
             const hospitalData = this.rawScheduleData[hospitalId];
             if (!hospitalData) return hospital.workTime;
@@ -1715,11 +1721,11 @@ export default {
             }
 
             // 检查是否有冲突
-            const schedule = this.getDateSchedule(dateStr);
-            const hasConflict = schedule && schedule._conflicts && schedule._conflicts.length > 0;
-            const isInConflict = hasConflict && schedule._conflicts.some(conflict =>
-                conflict.hospitals.some(h => h.startsWith(`${hospitalId}_`))
-            );
+            // const schedule = this.getDateSchedule(dateStr);
+            // const hasConflict = schedule && schedule._conflicts && schedule._conflicts.length > 0;
+            // const isInConflict = hasConflict && schedule._conflicts.some(conflict =>
+            //     conflict.hospitals.some(h => h.startsWith(`${hospitalId}_`))
+            // );
 
             const planTextMap = {
                 '1': '上午班',
@@ -1743,18 +1749,18 @@ export default {
             }
 
             // 添加冲突标识
-            const conflictMark = isInConflict ? ' ⚠️' : '';
+            // const conflictMark = isInConflict ? ' ⚠️' : '';
 
             if (hospital.isCancelled) {
-                return `${workTimeText} (固定${planTextMap[hospital.originalPlan] || ''})${conflictMark}`;
+                return `${workTimeText} (固定${planTextMap[hospital.originalPlan] || ''})`;
             }
 
             const hasTempAdjustment = temp_change_worktime && temp_change_worktime[dateStr];
             if (hasTempAdjustment) {
-                return `${workTimeText} (临时${planText})${conflictMark}`;
+                return `${workTimeText} (临时${planText})`;
             }
 
-            return `${workTimeText} (固定${planText})${conflictMark}`;
+            return `${workTimeText} (固定${planText})`;
         },
         getColorTagClass(dateStr, hospitalId, shiftType) {
 
@@ -2076,207 +2082,181 @@ export default {
         },
         // 修改 getDoctorHosPreview 方法
         async getDoctorHosPreview() {
-            // await this.$http('POST', '/api/admin/get_departs_worktimes', {
-            //     doctor_id: this.doctor_id,
-            // }).then(response => {
-            //     const list = response.msg;
-            //     console.log(list, '原始数据===');
-            let list = this.rawScheduleData = {
-                "7": {
-                    "h_depart_name": "北京大学第三医院针灸科",
-                    "worktime_no_fixed": 0,
-                    "display_work_days": 0,
-                    "morning_worktime": "09:00-12:00",
-                    "afternoon_worktime": "14:00-16:00",
-                    "worktime_list": {
-                        "1": {
-                            "id": "379",
-                            "doctor_id": "3",
-                            "depart_id": "7",
-                            "week_day": "1",
-                            "plan": "0",
-                            "work_paln_desc": "不可预约"
-                        },
-                        "2": {
-                            "id": "380",
-                            "doctor_id": "3",
-                            "depart_id": "7",
-                            "week_day": "2",
-                            "plan": "0",
-                            "work_paln_desc": "不可预约"
-                        },
-                        "3": {
-                            "id": "381",
-                            "doctor_id": "3",
-                            "depart_id": "7",
-                            "week_day": "3",
-                            "plan": "1",
-                            "work_paln_desc": "上午可约"
-                        },
-                        "4": {
-                            "id": "382",
-                            "doctor_id": "3",
-                            "depart_id": "7",
-                            "week_day": "4",
-                            "plan": "3",
-                            "work_paln_desc": "全天可约"
-                        },
-                        "5": {
-                            "id": "383",
-                            "doctor_id": "3",
-                            "depart_id": "7",
-                            "week_day": "5",
-                            "plan": "0",
-                            "work_paln_desc": "不可预约"
-                        },
-                        "6": {
-                            "id": "384",
-                            "doctor_id": "3",
-                            "depart_id": "7",
-                            "week_day": "6",
-                            "plan": "0",
-                            "work_paln_desc": "不可预约"
-                        },
-                        "7": {
-                            "id": "385",
-                            "doctor_id": "3",
-                            "depart_id": "7",
-                            "week_day": "7",
-                            "plan": "0",
-                            "work_paln_desc": "不可预约"
-                        }
-                    },
-                    "temp_change_worktime": {
-                        "2025-11-10": {
-                            "id": "57",
-                            "doctor_id": "3",
-                            "depart_id": "7",
-                            "morning_plan": "1",
-                            "afternoon_plan": "0",
-                            "date": "2025-11-10",
-                            "plan": 1,
-                            "work_paln_desc": "上午可约",
-                            "date_paln_desc": "11.10上午"
-                        },
-                        "2025-11-12": {
-                            "id": "58",
-                            "doctor_id": "3",
-                            "depart_id": "7",
-                            "morning_plan": "0",
-                            "afternoon_plan": "0",
-                            "date": "2025-11-12",
-                            "plan": 0,
-                            "work_paln_desc": "不可预约",
-                            "date_paln_desc": "11.12休息"
-                        }
-                    }
-                },
-                "4": {
-                    "h_depart_name": "武丽娜中医针灸中医科",
-                    "worktime_no_fixed": 0,
-                    "display_work_days": 0,
-                    "worktime_list": {
-                        "1": {
-                            "id": "92",
-                            "doctor_id": "3",
-                            "depart_id": "4",
-                            "week_day": "1",
-                            "plan": "1",
-                            "work_paln_desc": "上午可约"
-                        },
-                        "2": {
-                            "id": "93",
-                            "doctor_id": "3",
-                            "depart_id": "4",
-                            "week_day": "2",
-                            "plan": "3",
-                            "work_paln_desc": "全天可约"
-                        },
-                        "3": {
-                            "id": "94",
-                            "doctor_id": "3",
-                            "depart_id": "4",
-                            "week_day": "3",
-                            "plan": "2",
-                            "work_paln_desc": "下午可约"
-                        },
-                        "4": {
-                            "id": "95",
-                            "doctor_id": "3",
-                            "depart_id": "4",
-                            "week_day": "4",
-                            "plan": "1",
-                            "work_paln_desc": "上午可约"
-                        },
-                        "5": {
-                            "id": "96",
-                            "doctor_id": "3",
-                            "depart_id": "4",
-                            "week_day": "5",
-                            "plan": "3",
-                            "work_paln_desc": "全天可约"
-                        },
-                        "6": {
-                            "id": "97",
-                            "doctor_id": "3",
-                            "depart_id": "4",
-                            "week_day": "6",
-                            "plan": "3",
-                            "work_paln_desc": "全天可约"
-                        },
-                        "7": {
-                            "id": "98",
-                            "doctor_id": "3",
-                            "depart_id": "4",
-                            "week_day": "7",
-                            "plan": "0",
-                            "work_paln_desc": "不可预约"
-                        }
-                    },
-                    "temp_change_worktime": {
-                        "2025-11-08": {
-                            "id": "55",
-                            "doctor_id": "3",
-                            "depart_id": "4",
-                            "morning_plan": "0",
-                            "afternoon_plan": "0",
-                            "date": "2025-11-08",
-                            "plan": 0,
-                            "work_paln_desc": "不可预约",
-                            "date_paln_desc": "11.8休息"
-                        }
-                    }
-                },
-            }
-
-            //     if (response.code == 0) {
-            // 处理医院列表
-            this.hosList = Object.keys(list).map(item => {
-                return {
-                    hid: item,
-                    h_depart_name: list[item].h_depart_name
-                }
-            });
-            // 存储一份副本，用于后续操作
-            this.hosListCopy = JSON.parse(JSON.stringify(this.hosList))
+            await this.$http('POST', '/api/admin/get_departs_worktimes', {
+                doctor_id: this.doctor_id,
+            }).then(response => {
+                const list = response.msg;
+
+                console.log(list, '原始数据===');
+                //     let list = this.rawScheduleData = {
+                //         "4": {
+                //     "h_depart_name": "武丽娜中医针灸8中医科",
+                //     "worktime_no_fixed": 0,
+                //     "display_work_days": 0,
+                //     "morning_worktime": "09:00-12:00",
+                //     "afternoon_worktime": "12:00-23:00",
+                //     "worktime_list": {
+                //         "1": {
+                //             "id": "92",
+                //             "doctor_id": "3",
+                //             "depart_id": "4",
+                //             "week_day": "1",
+                //             "plan": "2",
+                //             "work_paln_desc": "下午可约"
+                //         },
+                //         "2": {
+                //             "id": "93",
+                //             "doctor_id": "3",
+                //             "depart_id": "4",
+                //             "week_day": "2",
+                //             "plan": "3",
+                //             "work_paln_desc": "全天可约"
+                //         },
+                //         "3": {
+                //             "id": "94",
+                //             "doctor_id": "3",
+                //             "depart_id": "4",
+                //             "week_day": "3",
+                //             "plan": "2",
+                //             "work_paln_desc": "下午可约"
+                //         },
+                //         "4": {
+                //             "id": "95",
+                //             "doctor_id": "3",
+                //             "depart_id": "4",
+                //             "week_day": "4",
+                //             "plan": "1",
+                //             "work_paln_desc": "上午可约"
+                //         },
+                //         "5": {
+                //             "id": "96",
+                //             "doctor_id": "3",
+                //             "depart_id": "4",
+                //             "week_day": "5",
+                //             "plan": "3",
+                //             "work_paln_desc": "全天可约"
+                //         },
+                //         "6": {
+                //             "id": "97",
+                //             "doctor_id": "3",
+                //             "depart_id": "4",
+                //             "week_day": "6",
+                //             "plan": "3",
+                //             "work_paln_desc": "全天可约"
+                //         },
+                //         "7": {
+                //             "id": "98",
+                //             "doctor_id": "3",
+                //             "depart_id": "4",
+                //             "week_day": "7",
+                //             "plan": "0",
+                //             "work_paln_desc": "不可预约"
+                //         }
+                //     },
+                //     "temp_change_worktime": {
+                //         "2025-11-13": {
+                //             "id": "60",
+                //             "doctor_id": "3",
+                //             "depart_id": "4",
+                //             "morning_plan": "0",
+                //             "afternoon_plan": "0",
+                //             "date": "2025-11-13",
+                //             "plan": 0,
+                //             "work_paln_desc": "不可预约",
+                //             "date_paln_desc": "11.13休息"
+                //         }
+                //     }
+                // },
+                // "6": {
+                //     "h_depart_name": "北京地坛医院针灸科",
+                //     "worktime_no_fixed": 1,
+                //     "display_work_days": 3,
+                //     "morning_worktime": "08:00-11:00",
+                //     "afternoon_worktime": "13:00-16:00",
+                //     "worktime_list": {
+                //         "2025-11-13": {
+                //             "id": "47",
+                //             "doctor_id": "3",
+                //             "depart_id": "6",
+                //             "morning_plan": "1",
+                //             "afternoon_plan": "0",
+                //             "date": "2025-11-13",
+                //             "plan": 1,
+                //             "work_paln_desc": "上午可约",
+                //             "date_paln_desc": "11.13上午"
+                //         },
+                //         "2025-11-14": {
+                //             "id": "48",
+                //             "doctor_id": "3",
+                //             "depart_id": "6",
+                //             "morning_plan": "1",
+                //             "afternoon_plan": "0",
+                //             "date": "2025-11-14",
+                //             "plan": 1,
+                //             "work_paln_desc": "上午可约",
+                //             "date_paln_desc": "11.14上午"
+                //         },
+                //         "2025-11-15": {
+                //             "id": "49",
+                //             "doctor_id": "3",
+                //             "depart_id": "6",
+                //             "morning_plan": "1",
+                //             "afternoon_plan": "0",
+                //             "date": "2025-11-15",
+                //             "plan": 1,
+                //             "work_paln_desc": "上午可约",
+                //             "date_paln_desc": "11.15上午"
+                //         },
+                //         "2025-11-16": {
+                //             "id": "50",
+                //             "doctor_id": "3",
+                //             "depart_id": "6",
+                //             "morning_plan": "1",
+                //             "afternoon_plan": "0",
+                //             "date": "2025-11-16",
+                //             "plan": 1,
+                //             "work_paln_desc": "上午可约",
+                //             "date_paln_desc": "11.16上午"
+                //         },
+                //         "2025-11-17": {
+                //             "id": "51",
+                //             "doctor_id": "3",
+                //             "depart_id": "6",
+                //             "morning_plan": "1",
+                //             "afternoon_plan": "0",
+                //             "date": "2025-11-17",
+                //             "plan": 1,
+                //             "work_paln_desc": "上午可约",
+                //             "date_paln_desc": "11.17上午"
+                //         },
+                //     }
+                // },
+                //     }
 
-            // 保存原始数据
-            // this.rawScheduleData = list;
+                if (response.code == 0) {
+                    // 处理医院列表
+                    this.hosList = Object.keys(list).map(item => {
+                        return {
+                            hid: item,
+                            h_depart_name: list[item].h_depart_name
+                        }
+                    });
+                    // 存储一份副本，用于后续操作
+                    this.hosListCopy = JSON.parse(JSON.stringify(this.hosList))
 
-            // 初始化当前月份的排班数据
-            this.generateMonthSchedule(this.currentDay);
+                    // 保存原始数据
+                    this.rawScheduleData = JSON.parse(JSON.stringify(list));
 
-            this.hosLength = Object.keys(list).length;
+                    // 初始化当前月份的排班数据
+                    this.generateMonthSchedule(this.currentDay);
+                    this.countMonthlyConflicts();
 
-            // 立即生成排班并检测冲突
-            await this.$nextTick();
-            this.generateMonthSchedule(this.currentDay);
-            this.countMonthlyConflicts();
+                    this.hosLength = Object.keys(list).length;
 
-            //     }
-            // }).catch(error => {
-            //     console.error(error, 'error')
-            // })
+                }
+            }).catch(error => {
+                console.error(error, 'error')
+            })
         },
         // 根据月份生成排班数据
         generateMonthSchedule(date) {
@@ -2463,7 +2443,7 @@ export default {
                     }
                 }
 
-                // 关键修改：即使 finalPlan 为 "0"，也要处理临时调整的情况
+                //即使 finalPlan 为 "0"，也要处理临时调整的情况
                 if (isTempAdjust || finalPlan !== "0") {
                     const workDesc = temp_change_worktime && temp_change_worktime[dateStr] ?
                         temp_change_worktime[dateStr].work_paln_desc :
@@ -2484,6 +2464,7 @@ export default {
         },
         // 检查排班冲突
         checkScheduleConflicts(daySchedule) {
+            console.log(daySchedule, 'daySchedule===检查排班冲突');
 
             if (!this.is_allow_coincide) return;
 
@@ -2537,35 +2518,460 @@ export default {
                     message: `下午班冲突: ${Array.from(timeSlotConflicts.afternoon).map(h => h.split('_')[1]).join('、')}`
                 });
             }
-            console.log(daySchedule,'daySchedule====');
+            console.log(daySchedule, 'daySchedule====');
         },
 
 
-
+        // setDepartWorkTime 设置出诊安排的时候，需要根据当前选择的排班时间段来判断是否和已有的排班存在冲突；
         async setDepartWorkTime() {
-            const { display_work_days, planDays, worktime_no_fixed, worktimes } = this.houseCallSettingForm;
-            var worktimesArray = Object.entries(worktimes).map(([key, value]) => ({
-                type: parseInt(key),
-                plan: value.plan
-            }));
+            // const { display_work_days, planDays, worktime_no_fixed,worktimes } = this.houseCallSettingForm;
+            const { display_work_days, planDays, worktime_no_fixed } = this.houseCallSettingForm;
+            const worktimes = {
+                "1": {
+                    "id": "92",
+                    "doctor_id": "3",
+                    "depart_id": "4",
+                    "week_day": "1",
+                    "plan": "1",
+                    "work_paln_desc": "上午可约"
+                },
+                "2": {
+                    "id": "93",
+                    "doctor_id": "3",
+                    "depart_id": "4",
+                    "week_day": "2",
+                    "plan": "3",
+                    "work_paln_desc": "全天可约"
+                },
+                "3": {
+                    "id": "94",
+                    "doctor_id": "3",
+                    "depart_id": "4",
+                    "week_day": "3",
+                    "plan": "0",
+                    "work_paln_desc": "休息"
+                },
+                "4": {
+                    "id": "95",
+                    "doctor_id": "3",
+                    "depart_id": "4",
+                    "week_day": "4",
+                    "plan": "3",
+                    "work_paln_desc": "全天可约"
+                },
+                "5": {
+                    "id": "96",
+                    "doctor_id": "3",
+                    "depart_id": "4",
+                    "week_day": "5",
+                    "plan": "3",
+                    "work_paln_desc": "全天可约"
+                },
+                "6": {
+                    "id": "97",
+                    "doctor_id": "3",
+                    "depart_id": "4",
+                    "week_day": "6",
+                    "plan": "3",
+                    "work_paln_desc": "全天可约"
+                },
+                "7": {
+                    "id": "98",
+                    "doctor_id": "3",
+                    "depart_id": "4",
+                    "week_day": "7",
+                    "plan": "3",
+                    "work_paln_desc": "全天可约"
+                }
+            };
             const params = {
                 doctor_id: this.doctor_id,
                 depart_id: this.depart_id,
                 worktime_no_fixed: worktime_no_fixed,
-                week_visit_plan: JSON.stringify(worktimesArray)
+                week_visit_plan: JSON.stringify(this.formatWorktimesArray(worktimes))
             }
+
             if (display_work_days == 1 && planDays > 0) {
                 params.display_work_days = planDays
             }
-            await this.$http('POST', '/api/admin/set_depart_worktime', {
-                ...params
-            }).then(response => {
-                if (response.code == 0) {
-                    this.$Message.success(response.msg || '设置成功')
+
+            // 检查冲突：当前设置医院的新排班 vs 其他医院的现有排班
+            const conflictResults = this.checkScheduleConflict(worktimes, worktime_no_fixed);
+
+            console.log('冲突检测结果:', conflictResults);
+
+            // 为固定出诊并且存在冲突时展示弹出框
+            if (conflictResults.hasConflict && worktime_no_fixed == 0) {
+                this.visitDialogVisible = true;
+                this.hasConflictresult = conflictResults.conflicts;
+                this.visitDialogTitle = '出诊安排冲突，请确认';
+                this.visitConfirmText = '确定并保存';
+                return;
+            }
+
+            // 没有冲突或允许重合，直接保存
+            // await this.saveWorkTimeDirect(params);
+        },
+        // 格式化 worktimes 数据
+        formatWorktimesArray(worktimes) {
+            return Object.entries(worktimes).map(([key, value]) => ({
+                type: parseInt(key),
+                plan: value.plan
+            }));
+        },
+
+        // 检查排班冲突
+        checkScheduleConflict(newWorktimes, worktime_no_fixed) {
+            const conflicts = [];
+            let hasConflict = false;
+
+            if (!this.rawScheduleData) {
+                return { hasConflict: false, conflicts: [] };
+            }
+
+            console.log('开始冲突检测，当前设置医院:', this.depart_id);
+            console.log('新排班设置:', newWorktimes);
+            console.log('所有医院数据:', this.rawScheduleData);
+
+            // 遍历所有其他医院的排班数据
+            Object.keys(this.rawScheduleData).forEach(hospitalId => {
+                // 跳过当前正在设置的医院 (depart_id=4)
+                if (hospitalId === this.depart_id.toString()) {
+                    console.log('跳过当前医院:', hospitalId);
+                    return;
                 }
-            }).catch(error => {
-                console.error(error, 'error')
-            })
+
+                const hospital = this.rawScheduleData[hospitalId];
+                console.log(`检查医院 ${hospitalId}: ${hospital.h_depart_name}`, hospital);
+
+                // 根据排班类型检查冲突
+                const hospitalConflicts = this.checkHospitalConflict(newWorktimes, hospital, worktime_no_fixed);
+                console.log(`医院 ${hospitalId} 的冲突:`, hospitalConflicts);
+
+                if (hospitalConflicts.length > 0) {
+                    conflicts.push(...hospitalConflicts);
+                    hasConflict = true;
+                }
+            });
+
+            console.log('最终冲突结果:', { hasConflict, conflicts });
+            return { hasConflict, conflicts };
+        },
+        // 检查单个医院的冲突
+        checkHospitalConflict(newWorktimes, hospital) {
+            const conflicts = [];
+
+            if (hospital.worktime_no_fixed === 0) {
+                // 对方是固定排班
+                conflicts.push(...this.checkVsFixedHospital(newWorktimes, hospital));
+            } else {
+                // 对方是非固定排班
+                conflicts.push(...this.checkVsNonFixedHospital(newWorktimes, hospital));
+            }
+
+            return conflicts;
+        },
+        // 检查与非固定排班医院的冲突
+        checkVsNonFixedHospital(newWorktimes, hospital) {
+    const conflicts = [];
+
+    console.log('检查非固定排班医院冲突:', hospital.h_depart_name, hospital.worktime_list);
+
+    if (!hospital.worktime_list) return conflicts;
+
+    // 遍历非固定排班医院的所有具体日期排班
+    Object.keys(hospital.worktime_list).forEach(dateStr => {
+        const hospitalPlan = hospital.worktime_list[dateStr];
+        if (!hospitalPlan || hospitalPlan.plan === '0') return;
+
+        // 获取该日期是星期几
+        const date = new Date(dateStr);
+        const dayOfWeek = date.getDay() === 0 ? 7 : date.getDay();
+        const weekDayKey = dayOfWeek.toString();
+
+        // 找到对应的新排班
+        const newSchedule = newWorktimes[weekDayKey];
+        if (!newSchedule || newSchedule.plan === '0') return;
+
+        console.log(`日期${dateStr}(周${dayOfWeek}): 新排班=${newSchedule.plan}, 医院排班=${hospitalPlan.plan}`);
+
+        // 获取冲突的具体时段
+        const conflictShift = this.getConflictShift(newSchedule.plan, hospitalPlan.plan);
+        if (conflictShift) {
+            console.log(`发现冲突: ${dateStr} 新${newSchedule.plan} vs 医院${hospitalPlan.plan}, 冲突时段: ${conflictShift}`);
+            conflicts.push(this.createConflictInfo(
+                dateStr,
+                hospital.h_depart_name,
+                newSchedule.plan,
+                conflictShift, // 这里改为冲突时段而不是医院排班
+                '非固定排班',
+                hospitalPlan.work_paln_desc,
+                // this.weekPlan[dayOfWeek],//这个还需呀修改
+
+            ));
+        }
+    });
+
+    return conflicts;
+},
+getConflictShift(newPlan, existingPlan) {
+    const planMap = {
+        '0': '休息',
+        '1': '上午',
+        '2': '下午',
+        '3': '全天班'
+    };
+
+    // 如果一方是全天班，冲突时段就是另一方的班次
+    if (newPlan === '3') {
+        return planMap[existingPlan]; // 当前设置全天，冲突时段就是对方医院的班次
+    }
+    if (existingPlan === '3') {
+        return planMap[newPlan]; // 对方医院全天，冲突时段就是当前设置的班次
+    }
+    
+    // 相同班次冲突
+    if (newPlan === existingPlan) {
+        return planMap[newPlan];
+    }
+    
+    return null; // 无冲突
+},
+        // 检查与固定排班医院的冲突
+        checkVsFixedHospital(newWorktimes, hospital) {
+            const conflicts = [];
+
+            console.log('检查固定排班医院冲突:', hospital.h_depart_name, hospital.worktime_list);
+
+            // 遍历新设置的每周排班
+            Object.keys(newWorktimes).forEach(weekDay => {
+                const newPlan = newWorktimes[weekDay].plan;
+                if (newPlan === '0') {
+                    return; // 休息不检查冲突
+                }
+
+                // 检查医院在该工作日的排班
+                const hospitalPlan = hospital.worktime_list && hospital.worktime_list[weekDay];
+                console.log(`周${weekDay}: 新排班=${newPlan}, 医院排班=`, hospitalPlan);
+
+                if (hospitalPlan && hospitalPlan.plan !== '0') {
+                    // 获取冲突的具体时段
+                    const conflictShift = this.getConflictShift(newPlan, hospitalPlan.plan);
+                    if (conflictShift) {
+                        console.log(`发现冲突: 周${weekDay} 新${newPlan} vs 医院${hospitalPlan.plan}, 冲突时段: ${conflictShift}`);
+                        conflicts.push(this.createConflictInfo(
+                            `每${this.getWeekDayName(parseInt(weekDay))}`,
+                            hospital.h_depart_name,
+                            newPlan,
+                            conflictShift, // 这里改为冲突时段而不是医院排班
+                            '固定排班',
+                            hospitalPlan.work_paln_desc
+                        ));
+                    }
+                }
+            });
+
+            return conflicts;
+        },
+        checkFixedVsAll(newWorktimes, hospital) {
+            const conflicts = [];
+
+            // 遍历新设置的每周排班
+            Object.keys(newWorktimes).forEach(weekDay => {
+                const newPlan = newWorktimes[weekDay].plan;
+                if (newPlan === '0') return; // 休息不检查冲突
+
+                // 检查医院在该工作日的排班
+                const hospitalPlan = this.getHospitalPlanForWeekDay(hospital, parseInt(weekDay));
+                if (hospitalPlan && hospitalPlan.plan !== '0') {
+                    if (this.isPlanConflict(newPlan, hospitalPlan.plan)) {
+                        conflicts.push(this.createConflictInfo(
+                            `周${this.getWeekDayName(parseInt(weekDay))}`,
+                            hospital.h_depart_name,
+                            newPlan,
+                            hospitalPlan.plan,
+                            hospital.worktime_no_fixed === 0 ? '固定排班' : '非固定排班',
+                            hospitalPlan.work_paln_desc
+                        ));
+                    }
+                }
+            });
+
+            return conflicts;
+        },
+        // 获取医院在特定工作日的排班
+        getHospitalPlanForWeekDay(hospital, weekDay) {
+            if (hospital.worktime_no_fixed === 0 && hospital.worktime_list) {
+                // 固定排班
+                return hospital.worktime_list[weekDay.toString()];
+            } else if (hospital.worktime_no_fixed === 1 && hospital.worktime_list) {
+                // 非固定排班 - 需要检查所有具体日期
+                // 这里简化处理，实际应该检查所有相关日期
+                return null;
+            }
+            return null;
+        },
+        checkNonFixedVsAll(newWorktimes, hospital) {
+            const conflicts = [];
+            const futureDates = this.generateFutureDates(30); // 检查未来30天
+
+            futureDates.forEach(dateInfo => {
+                const { dateStr, dayOfWeek } = dateInfo;
+
+                // 找到对应的新排班
+                const newSchedule = newWorktimes[dayOfWeek.toString()];
+                if (!newSchedule || newSchedule.plan === '0') return;
+
+                // 获取医院在该日期的排班
+                const hospitalSchedule = this.getHospitalScheduleForDate(hospital, dateStr, dayOfWeek);
+                if (hospitalSchedule && hospitalSchedule.plan !== '0') {
+                    if (this.isPlanConflict(newSchedule.plan, hospitalSchedule.plan)) {
+                        conflicts.push(this.createConflictInfo(
+                            dateStr,
+                            hospital.h_depart_name,
+                            newSchedule.plan,
+                            hospitalSchedule.plan,
+                            hospital.worktime_no_fixed === 0 ? '固定排班' : '非固定排班',
+                            hospitalSchedule.work_paln_desc
+                        ));
+                    }
+                }
+            });
+
+            return conflicts;
+        },
+        // 创建冲突信息
+        createConflictInfo(date, hospitalName, newPlan, conflictShift, scheduleType, workDesc) {
+    const planMap = {
+        '0': '休息',
+        '1': '上午班',
+        '2': '下午班',
+        '3': '全天班'
+    };
+
+    const conflict = {
+        date: date,
+        hospital: hospitalName,
+        newPlan: planMap[newPlan],
+        conflictShift: conflictShift, // 改为冲突时段
+        scheduleType: scheduleType,
+        workDesc: workDesc,
+        // displayText: `${date} ${planMap[newPlan]} 与 ${hospitalName} ${conflictShift} 冲突`
+    };
+
+    console.log('创建冲突信息:', conflict);
+    return conflict;
+},
+        // 检查非固定排班冲突
+        checkNonFixedConflict(newWorktimes, hospital, conflicts) {
+            let hasConflict = false;
+            const futureDates = this.generateFutureDates(30); // 检查未来30天
+
+            futureDates.forEach(dateInfo => {
+                const { dateStr, dayOfWeek } = dateInfo;
+
+                // 找到对应的新排班
+                const newSchedule = newWorktimes.find(schedule => schedule.type === dayOfWeek);
+                if (!newSchedule || newSchedule.plan === '0') return;
+
+                // 获取医院在该日期的排班
+                const hospitalSchedule = this.getHospitalScheduleForDate(hospital, dateStr, dayOfWeek);
+                if (hospitalSchedule && hospitalSchedule.plan !== '0') {
+                    if (this.isPlanConflict(newSchedule.plan, hospitalSchedule.plan)) {
+                        conflicts.push({
+                            date: dateStr,
+                            hospital: hospital.h_depart_name,
+                            newPlan: this.getPlanDesc(newSchedule.plan),
+                            existingPlan: this.getPlanDesc(hospitalSchedule.plan),
+                            type: hospital.worktime_no_fixed === 0 ? 'fixed' : 'non_fixed'
+                        });
+                        hasConflict = true;
+                    }
+                }
+            });
+
+            return hasConflict;
+        },
+        getHospitalScheduleForDate(hospital, dateStr, dayOfWeek) {
+            // 优先检查临时调整
+            if (hospital.temp_change_worktime && hospital.temp_change_worktime[dateStr]) {
+                return hospital.temp_change_worktime[dateStr];
+            }
+
+            // 固定排班
+            if (hospital.worktime_no_fixed === 0 && hospital.worktime_list) {
+                return hospital.worktime_list[dayOfWeek];
+            }
+
+            // 非固定排班的具体日期
+            if (hospital.worktime_no_fixed === 1 && hospital.worktime_list) {
+                return hospital.worktime_list[dateStr];
+            }
+
+            return null;
+        },
+        getWeekDayName(weekDay) {
+            const weekDays = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
+            return weekDays[weekDay - 1] || `周${weekDay}`;
+        },
+
+        getPlanDesc(plan) {
+            const planMap = {
+                '0': '休息',
+                '1': '上午班',
+                '2': '下午班',
+                '3': '全天班'
+            };
+            return planMap[plan] || '未知';
+        },
+        // 生成未来日期
+
+        // 检查排班计划冲突
+        isPlanConflict(plan1, plan2) {
+            console.log(`检查冲突: ${plan1} vs ${plan2}`);
+
+            if (plan1 === '0' || plan2 === '0') {
+                console.log('一方休息，无冲突');
+                return false;
+            }
+
+            if (plan1 === '3' || plan2 === '3') {
+                console.log('一方是全天班，有冲突');
+                return true; // 全天班与任何班次冲突
+            }
+
+            if (plan1 === plan2) {
+                console.log('相同班次，有冲突');
+                return true; // 相同班次冲突
+            }
+
+            console.log('不同班次，无冲突');
+            return false;
+        },
+        // isPlanConflict(plan1, plan2) {
+        //     if (plan1 === '0' || plan2 === '0') return false;
+        //     if (plan1 === '3' || plan2 === '3') return true;
+        //     if (plan1 === plan2) return true;
+        //     return false;
+        // },
+        generateFutureDates(days) {
+            const dates = [];
+            const today = new Date();
+
+            for (let i = 0; i < days; i++) {
+                const date = new Date(today);
+                date.setDate(today.getDate() + i);
+                const dateStr = this.formatDate(date);
+                const dayOfWeek = date.getDay() === 0 ? 7 : date.getDay();
+
+                dates.push({ date, dateStr, dayOfWeek });
+            }
+
+            return dates;
+        },
+        // ==========
+        checkRangeConflict() {
+
         },
         restoreCancel() {
 
@@ -2848,7 +3254,7 @@ export default {
                 if (
                     response.data &&
                     response.data[this.payTypeWeixin]
-                    &&response.data[this.payTypeWeixin].length > 0
+                    && response.data[this.payTypeWeixin].length > 0
                 ) {
                     this.wxpayList = response.data[this.payTypeWeixin]
                     this.selectWxpay = this.wxpayList.filter(item => item.is_bind)[0];
@@ -3101,7 +3507,7 @@ export default {
                 depart_id: this.depart_id,
                 doctor_id: this.doctor_id
             }).then(response => {
-                if(response.code != 0) {
+                if (response.code != 0) {
                     this.$Message.error(response.msg);
                     // location.href = '/'
                     return;
@@ -3588,13 +3994,35 @@ export default {
 
 <style lang="scss" scoped>
 //
-.conflictTitle{
-    color: #626573
-    b{
+.visitContent {
+    max-height: 300px;
+    overflow-y: auto;
+}
+
+.conflictTitle {
+    color: #626573;
+    line-height: 23px;
+    color: #626573;
+
+    span {
+        display: inline-block;
+        margin: 0 4px;
         white-space: nowrap;
         color: #1E2226;
     }
 }
+
+.hosPlanItem {
+    p {
+        color: #1E2226;
+        margin-bottom: 14px;
+    }
+
+    div {
+        color: #8A9099;
+    }
+}
+
 .cancelled-item {
     text-decoration: line-through;
     color: #BABDC2 !important;
@@ -3654,9 +4082,11 @@ export default {
     border: 1px solid #E4E7ED;
     /* #E4E7ED */
 }
+
 .not-current-month {
     opacity: 0.6 !important;
 }
+
 #siteMessage8 {
     .display_work_days {
         display: flex;
@@ -3814,6 +4244,7 @@ export default {
 .hosColorType {
     gap: 24px;
     padding-bottom: 18px;
+    flex-wrap: wrap;
     // box-shadow: inset 0px -1px 0px 0px rgba(0, 0, 0, 0.15);
 }