diff --git a/src/components/GroupFormBtns.vue b/src/components/GroupFormBtns.vue
index c50accb..4e9a76e 100644
--- a/src/components/GroupFormBtns.vue
+++ b/src/components/GroupFormBtns.vue
@@ -2,8 +2,8 @@
 
 <template>
     <div class="btns-wrap flex">
-        <GuipButton type="ignore" @click="cancelClick">取消</GuipButton>
-        <GuipButton type="primary" @click="confirmClick">保存</GuipButton>
+        <GuipButton type="ignore" @click="cancelClick">{{cancelText || '取消'}}</GuipButton>
+        <GuipButton type="primary" @click="confirmClick">{{confirmText ||'保存'}}</GuipButton>
     </div>
 </template>
 <script>
@@ -11,7 +11,7 @@ import GuipButton from '@/components/GuipButton.vue';
 
 export default {
     name: '',
-    props: [''],
+    props: ['cancelText','confirmText'],
     components: {
         GuipButton
     },
diff --git a/src/views/DoctorInformation.vue b/src/views/DoctorInformation.vue
index 6e5ace8..1ce1f3a 100644
--- a/src/views/DoctorInformation.vue
+++ b/src/views/DoctorInformation.vue
@@ -18,23 +18,17 @@
                             <div class="qqCode-wrap right">
                                 <div class="avator-wrapper flex">
                                     <img v-if="doctorAvatorUrl" :src="doctorAvatorUrl" alt="" class="uploadImg">
-                                    <hover-button  :button-text="doctorAvatorUrl?'重新上传':'开始上传'" :default-icon="require('../assets/upLoad_grey.svg')"
-                                    :hover-icon="require('../assets/upLoad_active.svg')"
-                                    default-text-color="#23242B" hover-text-color="#006AFF">
+                                    <hover-button :button-text="doctorAvatorUrl ? '重新上传' : '开始上传'"
+                                        :default-icon="require('../assets/upLoad_grey.svg')"
+                                        :hover-icon="require('../assets/upLoad_active.svg')"
+                                        default-text-color="#23242B" hover-text-color="#006AFF">
                                     </hover-button>
 
                                     <div class="info-upload-wrapper" @click="clearDocotorAvatorFiles">
-                                        <el-upload
-                                            :on-change="handleAvatarChange"
-                                            action="#"
-                                            list-type="picture-card"
-                                            :multiple="false"
-                                            :http-request="setDoctorBaseInfoUpload"
-                                            :limit="Number(1)"
-                                            ref="avatorUpload"
-                                            :auto-upload="false"
-                                        >
-                                        <i slot="default" class="el-icon-plus"></i>
+                                        <el-upload :on-change="handleAvatarChange" action="#" list-type="picture-card"
+                                            :multiple="false" :http-request="setDoctorBaseInfoUpload" :limit="Number(1)"
+                                            ref="avatorUpload" :auto-upload="false">
+                                            <i slot="default" class="el-icon-plus"></i>
                                         </el-upload>
                                     </div>
                                 </div>
@@ -46,8 +40,8 @@
 
                         </el-form-item>
 
-                        <GuipInput ref="GuipInput" column="column" :required="true" label="医生姓名"
-                            v-model="siteForm.name" prop="name" placeholder="请输入" />
+                        <GuipInput ref="GuipInput" column="column" :required="true" label="医生姓名" v-model="siteForm.name"
+                            prop="name" placeholder="请输入" />
                     </div>
                     <div class="flex-line"></div>
                     <div class="flex-right">
@@ -62,6 +56,27 @@
 
         </div>
         <div class="siteMessage flex-common" id="siteMessage2">
+            <p class="littleTitle mb32">出诊设置</p>
+            <el-form :model="siteForm" :rules="siteFormrules3" ref="siteForm3">
+                <div class="flex-wrap">
+                    <div class="flex-left">
+                        <p class="coincideTip mb12">您有多个出诊医院时，允许不同医院排班时段重合吗？</p>
+                        <div class="flex">
+                            <div class="coincideWrap">
+                                <el-radio v-model="siteForm.is_allow_coincide" :label="1">允许时段重合</el-radio>
+                                <p>适用于：可由助理代为坐诊</p>
+                            </div>
+                            <div class="coincideWrap">
+                                <el-radio v-model="siteForm.is_allow_coincide" :label="0">禁止时段重合</el-radio>
+                                <p>适用于：可由助理代为坐诊</p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </el-form>
+            <GroupFormBtns @cancel="cancelClick" @confirm="submitCoincideSet" />
+        </div>
+        <div class="siteMessage flex-common" id="siteMessage2">
             <p class="littleTitle mb32">初诊审批</p>
             <el-form :model="siteForm" :rules="siteFormrules2" ref="siteForm2">
                 <div class="flex-wrap">
@@ -69,7 +84,7 @@
                         <GuipRadio v-model="siteForm.first_visit_audit" class="mb12" column="column"
                             :options="groupOptions" label="初诊是否审批" required prop="first_visit_audit"
                             @change="radioChange" />
-                        <GuipInput ref="GuipInput" column="column" label="审批人电话" desc="审批人电话、微信，至少填写一项"
+                            <GuipInput ref="GuipInput" column="column" label="审批人电话" desc="审批人电话、微信，至少填写一项"
                             v-model="siteForm.approver_phone" prop="approver_phone" placeholder="请输入" />
                     </div>
                     <div class="flex-line"></div>
@@ -80,27 +95,24 @@
                                 <div class="avator-wrapper">
                                     <div class="flex" style="position: relative;">
                                         <img v-if="approverWechatUrl" :src="approverWechatUrl" class="uploadImg">
-                                        <hover-button :button-text="(approverWechatUrl ? '重新上传':'微信二维码')" :default-icon="require('../assets/upLoad_grey.svg')"
-                                        :hover-icon="require('../assets/upLoad_active.svg')"
-                                        default-text-color="#23242B" hover-text-color="#006AFF" />
-
-                                        <div class="info-upload-wrapper" @click="clearApproverWechatFiles" style="width: 177px;left: 0;display: flex;justify-content: flex-start;overflow: hidden;">
-                                            <el-upload
-                                                :on-change="handleApproverWechatChange"
-                                                action="#"
-                                                list-type="picture-card"
-                                                :multiple="false"
-                                                :http-request="setApproverWechatUpload"
-                                                :limit="Number(1)"
-                                                ref="approverWechatUpload"
-                                                :auto-upload="false"
-                                            >
+                                        <hover-button :button-text="(approverWechatUrl ? '重新上传' : '微信二维码')"
+                                            :default-icon="require('../assets/upLoad_grey.svg')"
+                                            :hover-icon="require('../assets/upLoad_active.svg')"
+                                            default-text-color="#23242B" hover-text-color="#006AFF" />
+
+                                        <div class="info-upload-wrapper" @click="clearApproverWechatFiles"
+                                            style="width: 177px;left: 0;display: flex;justify-content: flex-start;overflow: hidden;">
+                                            <el-upload :on-change="handleApproverWechatChange" action="#"
+                                                list-type="picture-card" :multiple="false"
+                                                :http-request="setApproverWechatUpload" :limit="Number(1)"
+                                                ref="approverWechatUpload" :auto-upload="false">
                                                 <i slot="default" class="el-icon-plus"></i>
                                             </el-upload>
                                         </div>
                                     </div>
 
-                                    <div slot="tip" class="el-upload__tip desc" style="margin-top:8px;">批人微信二维码，大小2M以内</div>
+                                    <div slot="tip" class="el-upload__tip desc" style="margin-top:8px;">批人微信二维码，大小2M以内
+                                    </div>
                                 </div>
                             </div>
                         </GuipFormItem>
@@ -121,8 +133,8 @@
                     </div>
                     <div class="flex-line"></div>
                     <div class="flex-right">
-                        <GuipInput ref="GuipInput" column="column"  label="个人标签"
-                            v-model="siteForm.label" prop="name" placeholder="请输入" />
+                        <GuipInput ref="GuipInput" column="column" label="个人标签" v-model="siteForm.label" prop="name"
+                            placeholder="请输入" />
                     </div>
                 </div>
             </el-form>
@@ -156,11 +168,11 @@ export default {
             fileList: [
                 // { name: 'image.jpeg', url: 'http://jasonyizherenxin.checkcopy.com/user_avatar/1.png?v=93940df0b596961c42de23ef1f2d3257' }
             ],
-            fileList1:[],
-            doctorAvatoFile:[],
+            fileList1: [],
+            doctorAvatoFile: [],
             doctorAvatorUrl: '',
-            approverWechatUrl:'',
-            approverWechatFile:[],
+            approverWechatUrl: '',
+            approverWechatFile: [],
             options_payword: [],
             groupOptions: [
                 { label: '需审批', value: '1' },
@@ -168,7 +180,7 @@ export default {
             ],
             formData: null,
             siteForm: {
-                did:0,
+                did: 0,
                 name: '',
                 idcard: ' ',
                 phone: '',
@@ -176,9 +188,10 @@ export default {
                 doctor_desc: '',
                 doctor_detail: '',
                 label: '',
-                approver_phone:'',
-                approver_wechat:'',
+                approver_phone: '',
+                approver_wechat: '',
                 first_visit_audit: '',
+                is_allow_coincide:''//是否允许重合
             },
             oldForm: {},
             siteFormrules2: {
@@ -186,6 +199,11 @@ export default {
                     { required: true, message: '请选择初诊审批设置', trigger: 'change' }
                 ]
             },
+            siteFormrules3: {
+                coincide: [
+                    { required: true, message: '请选择出诊设置', trigger: 'change' }
+                ]
+            },
             siteFormrules: {
                 name: [
                     { required: true, message: '请输入姓名', trigger: 'blur' }
@@ -231,7 +249,7 @@ export default {
     },
     methods: {
         setDoctorDesc() {
-            if(!this.doctorId) {
+            if (!this.doctorId) {
                 this.$message.error('请先设置医生基础信息')
                 return;
             }
@@ -253,7 +271,7 @@ export default {
             })
         },
         getDoctorData(doctor_id) {
-            this.$http('POST', '/api/admin/get_doctor_baseinfo', {did:doctor_id}).then(response => {
+            this.$http('POST', '/api/admin/get_doctor_baseinfo', { did: doctor_id }).then(response => {
                 if (response.code != 0) {
                     this.$message.error(response.msg)
                     return;
@@ -277,9 +295,9 @@ export default {
 
                 this.$message.success(response.msg)
                 var data = response.data
-                if(this.doctorId) return;
+                if (this.doctorId) return;
                 setTimeout(() => {
-                    location.href = location.href+'?doctor_id='+data.doctor_id
+                    location.href = location.href + '?doctor_id=' + data.doctor_id
                 }, 800);
             }).catch(error => {
                 console.error(error, 'error')
@@ -299,8 +317,8 @@ export default {
             this.setDoctorInfo(fd)
         },
         submitDoctorBaseInfo() {
-            if(this.doctorAvatoFile.length == 0) {
-                if(this.doctorId) {
+            if (this.doctorAvatoFile.length == 0) {
+                if (this.doctorId) {
                     this.setDoctorInfo(this.siteForm)
                     return;
                 }
@@ -310,12 +328,12 @@ export default {
 
             this.$refs.avatorUpload.submit();
         },
-        clearDocotorAvatorFiles(){
+        clearDocotorAvatorFiles() {
             this.doctorAvatorUrl = '';
             this.doctorAvatoFile = []
             this.$refs.avatorUpload.clearFiles();
         },
-        clearApproverWechatFiles(){
+        clearApproverWechatFiles() {
             this.approverWechatUrl = '';
             this.approverWechatFile = []
             this.$refs.approverWechatUpload.clearFiles();
@@ -340,9 +358,9 @@ export default {
 
                 this.$message.success(response.msg)
                 var data = response.data
-                if(this.doctorId) return;
+                if (this.doctorId) return;
                 setTimeout(() => {
-                    location.href = location.href+'?doctor_id='+data.doctor_id
+                    location.href = location.href + '?doctor_id=' + data.doctor_id
                 }, 800);
             }).catch(error => {
                 console.error(error, 'error')
@@ -350,18 +368,42 @@ export default {
             })
         },
         submitApproverWechat() {
-            if(!this.doctorId) {
+            if (!this.doctorId) {
                 this.$message.error('请先设置医生基础信息')
                 return;
             }
 
-            if(this.approverWechatFile.length == 0) {
+            if (this.approverWechatFile.length == 0) {
                 this.setApproverWechat(this.siteForm)
                 return;
             }
 
             this.$refs.approverWechatUpload.submit();
         },
+        // 出诊设置
+        submitCoincideSet() {
+            if (!this.doctorId) {
+                this.$message.error('请先设置医生基础信息')
+                return;
+            }
+            // 接口待定
+            // this.$http('POST', '/api/admin/set_doctor_approver', {
+            //     is_allow_coincide:this.siteForm.is_allow_coincide
+            // }).then(response => {
+            //     if (response.code != 0) {
+            //         this.$message.error(response.msg)
+            //         return;
+            //     }
+
+            //     this.$message.success(response.msg)
+            //     if (this.doctorId) return;
+              
+            // }).catch(error => {
+            //     console.error(error, 'error')
+            //     this.$message.error('设置失败')
+            // })
+            
+        },
         handleApproverWechatChange(file, fileList) {
             console.log(file, fileList)
             this.approverWechatFile = file
@@ -382,8 +424,30 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-
-.info-upload-wrapper ::v-deep .el-upload-list.el-upload-list--picture-card{
+.coincideWrap{
+    margin-right: 24px;
+    text-align: left;
+    p{
+        font-family: Microsoft YaHei UI;
+        font-size: 12px;
+        font-weight: normal;
+        line-height: 24px;
+        letter-spacing: 0.08em;
+        color: #8A9099;
+        padding-left: 22px;
+    }
+}
+.coincideTip{
+    font-family: Microsoft YaHei UI;
+    font-size: 14px;
+    font-weight: normal;
+    line-height: normal;
+    letter-spacing: 0.08em;
+    color: #1E2226;
+    text-align: left;
+    
+}
+.info-upload-wrapper ::v-deep .el-upload-list.el-upload-list--picture-card {
     display: none;
 }
 
@@ -393,11 +457,12 @@ export default {
     border: 1px solid transparent;
 }
 
-.uploadImg{
+.uploadImg {
     width: 150px;
     margin-right: 20px;
 }
-.special-form-item ::v-deep .el-form-item__label{
+
+.special-form-item ::v-deep .el-form-item__label {
     margin-bottom: 12px;
 }
 
@@ -421,9 +486,11 @@ export default {
     display: flex;
     width: 100%;
     justify-content: flex-start;
-    .avator-wrapper{
+
+    .avator-wrapper {
         position: relative;
-        .info-upload-wrapper{
+
+        .info-upload-wrapper {
             position: absolute;
             display: flex;
             justify-content: flex-end;
diff --git a/src/views/HosInformation.vue b/src/views/HosInformation.vue
index 284da6d..67ed405 100644
--- a/src/views/HosInformation.vue
+++ b/src/views/HosInformation.vue
@@ -26,7 +26,6 @@
                             <GuipInput slot="formDom" ref="GuipInput" column="column" v-model="form.h_realname"
                                 :disabled="true" v-if="depart_id && doctor_id" prop="h_realname"></GuipInput>
                         </GuipFormItem>
-
                         <div class="mb24" style="margin-top:-24px;" v-if="!depart_id && doctor_id">
                             <el-autocomplete v-model="hospitalSearchState" style="width: 100%"
                                 :fetch-suggestions="queryHospital" placeholder="请输入医院名称或地址" ref="hospitalAutocomplete"
@@ -38,7 +37,6 @@
                                 </template>
                             </el-autocomplete>
                         </div>
-
                         <GuipFormItem column="column" class="mb24" label="医院简称">
                             <span slot="formRight" class="desc">方便患者记忆，非必填</span>
                             <GuipInput slot="formDom" ref="GuipInput" column="column" v-model="form.h_shortname"
@@ -92,22 +90,23 @@
                                 @change="ChangeTime('time1')" format="HH:mm" value-format="HH:mm">
                             </el-time-picker>
                         </GuipFormItem>
-                        <GuipFormItem column="column" class="mb24" label="工作时间（ 下午 ）" :required="true">
-                            <el-time-picker slot="formDom" style="width:100%" is-range v-model="form.afternoon_worktime"
-                                range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" placeholder="选择时间范围"
-                                @change="ChangeTime('time1')" format="HH:mm" value-format="HH:mm">
-                            </el-time-picker>
-                        </GuipFormItem>
+
                     </div>
                     <div class="flex-line"></div>
                     <div class="flex-right" v-if="form.worktimes">
-                        <GuipFormItem column="column" label="每周出诊安排" :required="true">
+                        <!-- <GuipFormItem column="column" label="每周出诊安排" :required="true">
 
                             <div class="flex weekPlan" slot="formDom">
                                 <GuipSelect v-for="day in weekDays" :key="day.id" v-model="form.worktimes[day.id].plan"
                                     :options="options_weekPlan" :label="day.name" placeholder="休息"></GuipSelect>
                             </div>
 
+                        </GuipFormItem> -->
+                        <GuipFormItem column="column" class="mb24" label="工作时间（ 下午 ）" :required="true">
+                            <el-time-picker slot="formDom" style="width:100%" is-range v-model="form.afternoon_worktime"
+                                range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" placeholder="选择时间范围"
+                                @change="ChangeTime('time1')" format="HH:mm" value-format="HH:mm">
+                            </el-time-picker>
                         </GuipFormItem>
                     </div>
                 </div>
@@ -305,6 +304,45 @@
             </el-form>
         </div>
 
+        <div class="siteMessage flex-common mt12" id="siteMessage8">
+            <div class="littleTitle mb12">出诊设置</div>
+            <el-form :model="houseCallSettingForm">
+                <GuipFormItem column="column" class="mb24">
+                    <div slot="formLeft" class="form-top-icon">向患者展示</div>
+                    <div class="flex" slot="formDom" style="padding: 9px 0px;">
+                        <el-radio v-model="houseCallSettingForm.display_work_days" class="display_work_days" :label="1">
+                            <div class="flex">自动展示
+                                <GuipInput width="80px" v-model="houseCallSettingForm.planDays" />内已有的排班
+                            </div>
+                        </el-radio>
+                        <el-radio v-model="houseCallSettingForm.display_work_days" :label="0">固定展示所有已安排的排班</el-radio>
+                    </div>
+                </GuipFormItem>
+                <GuipFormItem column="column" class="mb24">
+                    <div slot="formLeft" class="form-top-icon">每周出诊安排</div>
+                    <div class="flex" slot="formDom" style="padding: 9px 0px;">
+                        <el-radio-group v-model="houseCallSettingForm.worktime_no_fixed">
+                            <el-radio :label="0">每周出诊安排固定</el-radio>
+                            <el-radio :label="1">每周出诊安排不固定</el-radio>
+                        </el-radio-group>
+                    </div>
+                </GuipFormItem>
+                <PromptText v-if="houseCallSettingForm.worktime_no_fixed != 0" text='请在“出诊日历预览”中，设置具体的出诊时间' :type="1"
+                    class="mb24" />
+
+                <div class="flex" v-else>
+                    <div class="flex weekPlan" v-if="houseCallSettingForm.worktimes">
+                        <GuipSelect v-for="day in weekDays" width="210px" :key="day.id"
+                            v-model="houseCallSettingForm.worktimes[day.id]['plan']" :options="options_weekPlan"
+                            :label="day.name" placeholder="休息"></GuipSelect>
+                    </div>
+                </div>
+                <GroupFormBtns cancelText="还原" @cancel="restoreCancel" @confirm="setDepartWorkTime" />
+
+            </el-form>
+
+        </div>
+
         <div class="siteMessage flex-common mt12" id="siteMessage9">
             <div class="littleTitle mb12">出诊日历预览</div>
             <PromptText text='不同色块代表不同的医院，点击日期，可临时调整当天出诊时间。' :type="1" class="mb24" />
@@ -312,7 +350,7 @@
                 <div class="header-left">
                     <span class="month-text">{{ formatMonth(currentDay) }}</span>
                     <span v-if="isCurrentMonth(currentDay)" class="current-month-badge">（本月）</span>
-                    <span class="header-tip">1年内有28天出诊医院重合，请检查——点击可查看</span>
+                    <span class="header-tip" v-if="conflictCount > 0">本月有 {{ conflictCount }} 天出诊医院重合，请检查——</span>
                 </div>
                 <div class="header-right">
                     <el-button-group>
@@ -325,39 +363,47 @@
             <div class="flex hosColorType" v-if="hosList.length > 1">
                 <div class="flex gap12" v-for="(item, index) in hosList" :key="index">
                     <span class="color-tag" :style="{ backgroundColor: colorPalette[index] }"></span>
-                    <span>{{ item.hospital_name }}</span>
+                    <span>{{ item.h_depart_name }}</span>
                 </div>
             </div>
             <div class="calendar-container">
-                <el-calendar v-model="currentDay" :first-day-of-week="7">
-                    <!-- 不生效呢 先注释了 -->
-                    <!-- <template slot="header" slot-scope="{ date }">
-                        <div class="custom-header">
-                            <div class="header-left">
-                                <span class="month-text">{{ formatMonth(date) }}111</span>
-                                <span v-if="isCurrentMonth(date)" class="current-month-badge">本月</span>
-                            </div>
-                            <div class="header-right">
-                                <el-button-group>
-                                    <el-button size="mini" @click="goToday">今天</el-button>
-                                    <el-button size="mini" @click="prevMonth">上个00月</el-button>
-                                    <el-button size="mini" @click="nextMonth">下个月</el-button>
-                                </el-button-group>
-                            </div>
+                <!-- 不生效呢 先注释了 -->
+                <!-- <template slot="header" slot-scope="{ date }">
+                    <div class="custom-header">
+                        <div class="header-left">
+                            <span class="month-text">{{ formatMonth(date) }}111</span>
+                            <span v-if="isCurrentMonth(date)" class="current-month-badge">本月</span>
                         </div>
-                    </template> -->
-
+                        <div class="header-right">
+                            <el-button-group>
+                                <el-button size="mini" @click="goToday">今天</el-button>
+                                <el-button size="mini" @click="prevMonth">上个00月</el-button>
+                                <el-button size="mini" @click="nextMonth">下个月</el-button>
+                            </el-button-group>
+                        </div>
+                    </div>
+                </template> -->
+                <el-calendar v-model="currentDay" :first-day-of-week="7" @update:modelValue="onCalendarMonthChange">
                     <template slot="dateCell" slot-scope="{date, data}">
                         <el-tooltip placement="bottom" :disabled="hosList.length == 1" v-if="getDateSchedule(data.day)"
                             popper-class="schedule-tooltip">
                             <!-- getDateCellClass 控制单独医院 的类名-->
-                            <div class="calendar-date" :class="hosList.length == 1 ? getDateCellClass(data.day) : ''">
+                            <div class="calendar-date"
+                                :class="[hosList.length == 1 ? getDateCellClass(data.day) : '', isConflictDate(data.day) ? 'conflict-date' : '']">
                                 <div class="date-header flex-between">
-                                    <div class="flex">
+                                    <div class="flex gap12">
                                         <span class="date-text">{{ getDayNumber(data.day) }}</span>
                                         <span v-if="isToday(data.day)" class="today-badge">今</span>
                                     </div>
-                                    <div class="adjust" v-if="true">临时调整</div>
+                                    <div class="conflict" v-if="is_allow_coincide && isConflictDate(data.day)">存在冲突!
+                                    </div>
+                                    <!-- <div class="adjust" v-if="shouldShowAdjust(data.day) && !is_allow_coincide">临时调整
+                                    </div> -->
+
+                                    <div class="adjust"
+                                        v-if="shouldShowAdjust(data.day) && !hasMultipleTempAdjustments(data.day)">
+                                        临时调整
+                                    </div>
                                 </div>
 
                                 <!-- 医院排班信息 -->
@@ -365,28 +411,38 @@
                                     <template>
                                         <!-- 动态渲染班次类型 -->
                                         <div v-for="(shiftType, key) in plantype" :key="key">
-                                            <div v-if="key !== '0' && getDateSchedule(data.day)[key]"
-                                                class="schedule-item">
+                                            <div v-if="key !== '0' && getDateSchedule(data.day)[key] && getDateSchedule(data.day)[key].length > 0"
+                                                class="schedule-item" :class="getScheduleItemClass(data.day, key)">
                                                 <span class="shift-type">{{ shiftType }}</span>
                                                 <div class="hospital-tags" v-if="hosList.length > 1">
                                                     <span v-for="hospital in getDateSchedule(data.day)[key]"
                                                         :key="hospital.hid" class="color-tag"
-                                                        :style="{ backgroundColor: getHospitalColor(hospital.hid, date) }"></span>
+                                                        :class="getColorTagClass(data.day, hospital.hid, key)"
+                                                        :style="{ backgroundColor: getHospitalColor(hospital.hid, date) }">
+                                                        {{ getTempAdjustmentStatus(data.day, hospital.hid, hospital.originalPlan) === 'cancelled' ? 'x' : ''}}
+                                                    </span>
+                                                    <!-- <span class="color-tag-coi"></span> -->
                                                 </div>
                                             </div>
                                         </div>
                                     </template>
                                 </div>
                             </div>
+                            <!-- 气泡弹出框信息 -->
                             <div slot="content" class="tooltip-content">
                                 <!-- v-if="key !== '0' && getDateSchedule(data.day)[key] && getDateSchedule(data.day)[key].length > 0" -->
                                 <div v-for="(shiftType, key) in plantype" :key="key">
                                     <div v-for="hospital in getDateSchedule(data.day)[key]" :key="hospital.hid"
-                                        class="hospital-item">
+                                        class="hospital-item" :class="getHospitalItemClass(data.day, hospital.hid)">
                                         <div class="hospital-info">
                                             <span class="color-tag tooltip-tag"
+                                                :class="getColorTagClass(data.day, hospital.hid, key)"
                                                 :style="{ backgroundColor: getHospitalColor(hospital.hid) }"></span>
                                             <span class="hospital-name">{{ hospital.hospital_name }}</span>
+                                            <span class="adjust-status"
+                                                v-if="getAdjustmentStatus(data.day, hospital.hid)">
+                                                {{ getAdjustmentStatusText(data.day, hospital.hid) }}
+                                            </span>
                                         </div>
                                         <div class="work-time">{{ hospital.workTime }}</div>
                                     </div>
@@ -439,7 +495,7 @@
                                 全部分类</div>
                             <div :class="['tab-item point', projectSearchId == item.id ? 'active' : '']"
                                 @click="selectTag(item)" v-for="item in projectTagData" :key="item.name">{{
-                                item.name }}
+                                    item.name }}
                             </div>
                         </div>
                     </div>
@@ -568,6 +624,25 @@
                 </GuipInput>
             </el-form>
         </GuipDialog>
+
+        <GuipDialog :dialogVisible="singleHosVisiable" :title="singleHosTitle" :show-close-button="false" width="599px"
+            :show-cancel-button="true" @confirm="singleTempCancel" @cancel="singleTempConfirm" ref="singleHosRef">
+            <p class="mb24">2025年9月5日 星期三（今天）</p>
+            <div>
+                <el-radio-group v-model="temp_plans">
+                    <el-radio :label="1">上午出诊</el-radio>
+                    <el-radio :label="2">下午出诊</el-radio>
+                    <el-radio :label="3">全天出诊</el-radio>
+                    <el-radio :label="0">不出诊</el-radio>
+                </el-radio-group>
+            </div>
+
+            <div>
+                <GuipSelect width="466px" :options="options_weekPlan" label="上午班" placeholder="休息"></GuipSelect>
+                <GuipSelect width="466px" :options="options_weekPlan" label="下午班" placeholder="休息"></GuipSelect>
+            </div>
+
+        </GuipDialog>
         <!-- freeRegVisible -->
         <GuipDialog :dialogVisible="freeRegVisible" title="免挂号费规则" :show-close-button="false" width="599px"
             :show-cancel-button="true" @confirm="handleRegisterConfirm('freeRegVisible')"
@@ -604,8 +679,9 @@
             </el-form>
         </GuipDialog>
 
-        <addPay :payType="addPayType" :visible="isShowAddPay" @update:visible="handleEvent" @update:data="handleUpdateEvent"
-       :isExistSelfSupplys="isExistSelfSupplys" :doctor_id="doctor_id" :depart_id="depart_id"></addPay>
+        <addPay :payType="addPayType" :visible="isShowAddPay" @update:visible="handleEvent"
+            @update:data="handleUpdateEvent" :isExistSelfSupplys="isExistSelfSupplys" :doctor_id="doctor_id"
+            :depart_id="depart_id"></addPay>
     </div>
 </template>
 <script>
@@ -629,99 +705,6 @@ import { Object } from 'core-js';
 const PAY_TYPE_WEIXIN = 2;    // 微信
 const PAY_TYPE_ALIPAY = 3;    // 支付宝
 
-// 查看多医院的效果 把hosList 和  calendarList 注释了的放开
-// 医院信息
-const hosList = [
-    {
-        hid: 4,
-        hospital_name: "北京中医药大学国医堂22",
-    },
-    // {
-    //     hid: 5,
-    //     hospital_name: "北京中医药国医堂",
-    // },
-    // {
-    //     hid: 6,
-    //     hospital_name: "北京国医堂22",
-    // },
-];
-// 医院排班信息
-const calendarList = {
-    '2025-11-06': {
-        // 0: [
-        //     {
-        //         hid: 5,
-        //         hospital_name: "北京中医药",
-        //     },
-        //     {
-        //         hid: 6,
-        //         hospital_name: "北京中医堂22",
-        //     },
-        // ],
-        3: [
-            {
-                hid: 4,
-                hospital_name: "北京中医药大学国医堂22",
-                workTime: '8:00-17:00 (全天班)'
-            }
-        ],
-
-    },
-    '2025-11-07': {
-        // 1: [
-        //     {
-        //         hid: 5,
-        //         hospital_name: "北京中医药",
-        //         workTime: '8:00-12:00 (上午班)'
-        //     },
-        //     {
-        //         hid: 6,
-        //         hospital_name: "北京中医堂22",
-        //         workTime: '8:00-12:00 (上午班)'
-        //     },
-        // ],
-        2: [
-            {
-                hid: 4,
-                hospital_name: "北京中医药大学国医堂22",
-                workTime: '14:00-17:00 (下午班)'
-            }
-        ],
-    },
-    '2025-11-08': {
-        2: [
-            // {
-            //     hid: 5,
-            //     hospital_name: "北京中医药",
-            //     workTime: '8:00-12:00 (上午班)'
-            // },
-            {
-                hid: 4,
-                hospital_name: "北京中医药大学国医堂22",
-                workTime: '8:00-12:00 (上午班)'
-
-            },
-        ],
-        // 1: [
-
-        //     {
-        //         hid: 6,
-        //         hospital_name: "北京中医堂22",
-        //         workTime: '14:00-17:00 (下午班)'
-        //     },
-        // ],
-    },
-    '2025-11-09': {
-        // 3: [
-        //     {
-        //         hid: 5,
-        //         hospital_name: "北京中医药",
-        //         workTime: '8:00-17:00 (全天班)'
-        //     }
-        // ],
-    },
-}
-
 export default {
     // 站点设置
     name: '',
@@ -744,8 +727,6 @@ export default {
     },
     data() {
         return {
-            hosList: [],//医院信息
-            currentDay: new Date(),
             depart_id: false,
             doctor_id: false,
             dialogType: '1',
@@ -802,16 +783,22 @@ export default {
                     { required: true, message: '请输入', trigger: 'blur' }
                 ],
             },
+            houseCallSettingForm: {
+                worktimes: null,
+                display_work_days: 0,//固定展示所有已安排的排班
+                worktime_no_fixed: 0,//每周出诊安排固定 
+                planDays: 30,
+            },
             options_province: [],
             options_city: [],
             weekPlan: {
-                '周一': '',
-                '周二': '',
-                '周三': '',
-                '周四': '',
-                '周五': '',
-                '周六': '',
-                '周日': '',
+                '1': '周一',
+                '2': '周二',
+                '3': '周三',
+                '4': '周四',
+                '5': '周五',
+                '6': '周六',
+                '7': '周日',
             },
             weekDays: [
                 { id: 1, name: '周一' },
@@ -846,6 +833,7 @@ export default {
                 company_address: '',
                 company_phone: '',
                 site_alias: '',
+                coincide: ''
             },
             oldForm: {
                 description: '',
@@ -890,7 +878,7 @@ export default {
             payTypeAlipay: PAY_TYPE_ALIPAY,
             selectWxpay: null,
             selectAlipay: null,
-            onLinePay:null,
+            onLinePay: null,
             addPayType: -1,
             isShowAddPay: false,
             isExistSelfSupplys: false,
@@ -918,22 +906,30 @@ export default {
             },
             currentDayColor: '#F6F7FA',
             plantype: {
-                0: '停诊',
                 1: '上午班',
                 2: '下午班',
                 3: '全天班',
+                0: '不出诊',
             },
             weekDaysDesc: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
-            hosLength: 0
+            hosLength: 0,
+            singleHosVisiable: false,
+            singleHosTitle: '出诊日历',
+            temp_plans: null,//临时调诊
+            hosList: [],//医院信息
+            currentDay: new Date(),
+            calendarList1: [],
+            calendarList: {}, // 用于存储格式化后的排班数据
+            rawScheduleData: null, // 存储原始排班数据
+            is_allow_coincide: true,//是否允许时段重合
+            conflictDates: [], // 存储有冲突的日期
+            conflictCount: 0, // 冲突天数统计
+            tempAdjustments: {}, // 存储临时调诊数据 {日期: {医院ID: {原班次, 新班次, 状态}}}
         }
     },
     created() {
         store.commit('SET_CUSTOMIZE', true);
         store.commit('SET_SLIDER_MENU', 'hosMenuData');
-
-        //!!!!! 假的假的 整个假数据
-        this.hosList = hosList
-        this.hosLength = hosList.length
     },
     async mounted() {
         // 重写日历周期标题
@@ -955,6 +951,7 @@ export default {
         } else {
             await this.getAreaData()
         }
+        this.getDoctorHosPreview()
     },
     watch: {
         '$route.query': {
@@ -1000,37 +997,538 @@ export default {
         //     }
         //     return {};
         // },
+        // [{"depart_id":4,"morning_plan":"1","afternoon_plan":0}]
+        // /api/admin/get_departs_worktimes
+
+        // 获取颜色标签的类名
+        getColorTagClass(dateStr, hospitalId, shiftType) {
+            const originalPlan = this.getOriginalPlan(dateStr, hospitalId);
+            const status = this.getTempAdjustmentStatus(dateStr, hospitalId, originalPlan);
+            
+            // 获取当前显示的班次（可能是调整后的）
+            const currentShift = this.getCurrentShiftType(dateStr, hospitalId);
+            
+            // 如果当前不显示这个班次，不渲染色块
+            if (currentShift !== shiftType) {
+                return 'hidden-tag';
+            }
+
+            // 根据状态返回对应的类名
+            switch (status) {
+                case 'cancelled':
+                    return 'opacity-tag'; // 调诊后无出诊班次
+                case 'added':
+                case 'changed':
+                    return 'color-tag-coi'; // 调整后的班次
+                case 'same':
+                    return 'color-tag'; // 与固定排班一致
+                case 'no_adjustment':
+                    return 'color-tag'; // 无调整，按固定排班显示
+                default:
+                    return 'color-tag';
+            }
+        },
+        getCurrentShiftType(dateStr, hospitalId) {
+            if (this.tempAdjustments[dateStr] && this.tempAdjustments[dateStr][hospitalId]) {
+                // 有临时调整，使用调整后的班次
+                return this.tempAdjustments[dateStr][hospitalId].newPlan;
+            } else {
+                // 无调整，使用原始班次
+                return this.getOriginalPlan(dateStr, hospitalId);
+            }
+        },
+
+        // 获取排班项的类名
+        getScheduleItemClass(dateStr, shiftType) {
+            if (this.hasTimeConflict(dateStr, shiftType)) {
+                return 'conflict-schedule';
+            }
+            return '';
+        },
+
+        // 获取医院项的类名
+        getHospitalItemClass(dateStr, hospitalId) {
+            const status = this.getTempAdjustmentStatus(dateStr, hospitalId, this.getOriginalPlan(dateStr, hospitalId));
+            if (status && status !== 'same') {
+                return 'temp-adjusted';
+            }
+            return '';
+        },
+
+        // 获取调整状态文本
+        getAdjustmentStatusText(dateStr, hospitalId) {
+            const status = this.getTempAdjustmentStatus(dateStr, hospitalId, this.getOriginalPlan(dateStr, hospitalId));
+            const statusMap = {
+                'cancelled': '(已取消)',
+                'added': '(新增)',
+                'changed': '(调整)',
+                'same': '(原班次)'
+            };
+            return statusMap[status] || '';
+        },
+
+        // 获取调整状态
+        getAdjustmentStatus(dateStr, hospitalId) {
+            return this.getTempAdjustmentStatus(dateStr, hospitalId, this.getOriginalPlan(dateStr, hospitalId));
+        },
+
+        // 检查是否有临时调整
+        hasTempAdjustments(dateStr) {
+            return this.shouldShowAdjust(dateStr);
+        },
+
+        // 检查是否有多个临时调整（控制只显示一个adjust元素）
+        hasMultipleTempAdjustments() {
+            // 这个方法用于控制界面显示逻辑，实际只显示一个adjust元素
+            return false; // 总是返回false，因为我们已经控制只显示一个
+        },
+
+        // 获取临时调诊状态
+        // getTempAdjustmentStatus(dateStr, hospitalId, originalPlan) {
+        //     if (!this.tempAdjustments[dateStr] || !this.tempAdjustments[dateStr][hospitalId]) {
+        //         return null;
+        //     }
+
+        //     const adjustment = this.tempAdjustments[dateStr][hospitalId];
+        //     const newPlan = adjustment.newPlan;
+
+        //     // 判断状态
+        //     if (newPlan === "0" && originalPlan !== "0") {
+        //         return 'cancelled'; // 班次取消
+        //     } else if (originalPlan === "0" && newPlan !== "0") {
+        //         return 'added'; // 新增班次
+        //     } else if (originalPlan !== newPlan) {
+        //         return 'changed'; // 班次变更
+        //     } else {
+        //         return 'same'; // 与固定排班一致
+        //     }
+        // },
+        getTempAdjustmentStatus(dateStr, hospitalId, originalPlan) {
+            if (!this.tempAdjustments[dateStr] || !this.tempAdjustments[dateStr][hospitalId]) {
+                return 'no_adjustment'; // 无调整
+            }
+
+            const adjustment = this.tempAdjustments[dateStr][hospitalId];
+            const newPlan = adjustment.newPlan;
+
+            // 判断状态
+            if (newPlan === "0" && originalPlan !== "0") {
+                return 'cancelled'; // 班次取消
+            } else if (originalPlan === "0" && newPlan !== "0") {
+                return 'added'; // 新增班次
+            } else if (originalPlan !== newPlan) {
+                return 'changed'; // 班次变更
+            } else {
+                return 'same'; // 与固定排班一致
+            }
+        },
+
+
+        // 检查是否需要显示临时调整标识
+        shouldShowAdjust(dateString) {
+            const schedule = this.getDateSchedule(dateString);
+            if (!schedule) return false;
+
+            // 检查是否有任何医院的临时调诊
+            return Object.keys(this.rawScheduleData).some(hospitalId => {
+                const hospital = this.rawScheduleData[hospitalId];
+                const dateStr = this.formatDate(new Date(dateString));
+
+                return hospital.temp_change_worktime &&
+                    hospital.temp_change_worktime[dateStr] &&
+                    this.getTempAdjustmentStatus(dateStr, hospitalId, this.getOriginalPlan(dateStr, hospitalId)) !== 'same';
+            });
+        },
+
+        // 获取原始固定排班
+        getOriginalPlan(dateStr, hospitalId) {
+            const hospital = this.rawScheduleData[hospitalId];
+            if (!hospital) return "0";
+
+            const date = new Date(dateStr);
+            const dayOfWeek = date.getDay() === 0 ? 7 : date.getDay();
+
+            // 固定排班
+            if (hospital.worktime_no_fixed === 0 && hospital.worktime_list && hospital.worktime_list[dayOfWeek]) {
+                return hospital.worktime_list[dayOfWeek].plan.toString();
+            }
+
+            // 非固定排班中的具体日期
+            if (hospital.worktime_no_fixed === 1 && hospital.worktime_list && hospital.worktime_list[dateStr]) {
+                return hospital.worktime_list[dateStr].plan.toString();
+            }
+
+            return "0";
+        },
+
+        // 检查是否存在冲突（不允许时段重合时）
+        hasTimeConflict(dateStr, shiftType) {
+            if (this.is_allow_coincide) return false;
+
+            const schedule = this.getDateSchedule(dateStr);
+            if (!schedule || !schedule[shiftType]) return false;
+
+            // 同一班次有多个医院且不允许重合
+            return schedule[shiftType].length > 1;
+        },
+        // 统计本月多医院出诊冲突
+        countMonthlyConflicts() {
+            const monthStart = new Date(this.currentDay.getFullYear(), this.currentDay.getMonth(), 1);
+            const monthEnd = new Date(this.currentDay.getFullYear(), this.currentDay.getMonth() + 1, 0);
+            const today = new Date();
+            today.setHours(0, 0, 0, 0);
+
+            const conflicts = [];
+            let conflictCount = 0;
+
+            // 遍历本月每一天
+            const currentDate = new Date(monthStart);
+            while (currentDate <= monthEnd) {
+                // 只统计今天及之后的日期
+                if (currentDate >= today) {
+                    const dateStr = this.formatDate(currentDate);
+                    const schedule = this.getDateSchedule(dateStr);
+
+                    if (schedule && this.hasScheduleConflict(schedule)) {
+                        conflicts.push(dateStr);
+                        conflictCount++;
+                    }
+                }
+
+                currentDate.setDate(currentDate.getDate() + 1);
+            }
+
+            this.conflictDates = conflicts;
+            this.conflictCount = conflictCount;
+        },
+
+        // 检查某一天的排班是否有冲突（同班次多个医院）
+        hasScheduleConflict(schedule) {
+            // 遍历所有班次类型（上午班、下午班、全天班）
+            for (const shiftType in schedule) {
+                // 跳过标记字段和非班次类型
+                if (shiftType === '_isTempAdjust' || shiftType === '0') continue;
+
+                const hospitals = schedule[shiftType];
+                // 如果同一班次有超过1家医院，则认为有冲突
+                if (hospitals && hospitals.length > 1) {
+                    return true;
+                }
+            }
+            return false;
+        },
+        // 判断是否为冲突日期
+        isConflictDate(dateString) {
+            return this.conflictDates.includes(dateString);
+        },
+        // 检查是否需要显示临时调整标识
+        // shouldShowAdjust(dateString) {
+        //     const schedule = this.getDateSchedule(dateString);
+        //     return schedule && schedule._isTempAdjust;
+        // },
+        // 添加月份变化监听方法
+        onCalendarMonthChange(date) {
+            // 只有当月份真正变化时才重新生成排班
+            const newMonth = new Date(date).getMonth();
+            const currentMonth = new Date(this.currentDay).getMonth();
+
+            if (newMonth !== currentMonth) {
+                this.generateMonthSchedule(new Date(date));
+            }
+        },
+        // 修改 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, '原始数据===');
+
+                if (response.code == 0) {
+                    // 处理医院列表
+                    this.hosList = Object.keys(list).map(item => {
+                        return {
+                            hid: item,
+                            h_depart_name: list[item].h_depart_name
+                        }
+                    });
+
+                    // 保存原始数据
+                    this.rawScheduleData = list;
+                    // 初始化当前月份的排班数据
+                    this.generateMonthSchedule(this.currentDay);
+
+                    this.hosLength = Object.keys(list).length;
+                }
+            }).catch(error => {
+                console.error(error, 'error')
+            })
+        },
+        // 根据月份生成排班数据
+        generateMonthSchedule(date) {
+            if (!this.rawScheduleData) return;
+
+            const monthStart = new Date(date.getFullYear(), date.getMonth(), 1);
+            const monthEnd = new Date(date.getFullYear(), date.getMonth() + 1, 0);
+            const today = new Date();
+            // 如果整个月份都在今天之前，则不生成排班
+            if (monthEnd < today) {
+                this.calendarList = {};
+                this.conflictDates = []; // 清空冲突数据
+                this.conflictCount = 0;
+                return;
+            }
+            // 只生成今天及之后的排班
+            const startDate = today > monthStart ? today : monthStart;
+
+            this.generateScheduleForDateRange(startDate, monthEnd);
+            this.countMonthlyConflicts(); // 添加统计
+        },
+        // 为日期范围生成排班
+        generateScheduleForDateRange(startDate, endDate) {
+    const tempCalendarData = { ...this.calendarList };
+    const currentDate = new Date(startDate);
+
+    // 清空临时调整数据
+    this.tempAdjustments = {};
+
+    while (currentDate <= endDate) {
+        const dateStr = this.formatDate(currentDate);
+        
+        // 重新生成排班数据，确保临时调整信息正确设置
+        const daySchedule = this.getScheduleForDate(currentDate);
+        
+        if (daySchedule && Object.keys(daySchedule).length > 1) {
+            tempCalendarData[dateStr] = daySchedule;
+        } else {
+            delete tempCalendarData[dateStr];
+        }
+
+        currentDate.setDate(currentDate.getDate() + 1);
+    }
+
+    this.calendarList = tempCalendarData;
+},
+
+        isTempAdjustDate(dateString) {
+            if (!this.rawScheduleData) return false;
+
+            // 遍历所有医院，检查是否有该日期的临时调整
+            for (const hospitalId in this.rawScheduleData) {
+                const hospital = this.rawScheduleData[hospitalId];
+                if (hospital.temp_change_worktime && hospital.temp_change_worktime[dateString]) {
+                    return true;
+                }
+            }
+            return false;
+        },
+        addHospitalToSchedule(daySchedule, hospitalId, hospital, plan, workDesc) {
+    const shiftType = plan.toString();
+    
+    // 如果班次是0（不出诊），不添加到排班显示中
+    if (shiftType === "0") {
+        return;
+    }
+    
+    if (!daySchedule[shiftType]) {
+        daySchedule[shiftType] = [];
+    }
+
+    // 检查是否已经添加过这个医院
+    const existingIndex = daySchedule[shiftType].findIndex(item => item.hid === hospitalId);
+
+    const hospitalInfo = {
+        hid: hospitalId,
+        hospital_name: hospital.h_depart_name,
+        workTime: workDesc,
+        originalPlan: this.getOriginalPlan(daySchedule._dateStr, hospitalId),
+        currentPlan: plan.toString()
+    };
+
+    if (existingIndex >= 0) {
+        // 替换现有项
+        daySchedule[shiftType][existingIndex] = hospitalInfo;
+    } else {
+        // 新增
+        daySchedule[shiftType].push(hospitalInfo);
+    }
+},
+getHospitalColorTag(dateStr, hospitalId, shiftType) {
+    const status = this.getTempAdjustmentStatus(dateStr, hospitalId, this.getOriginalPlan(dateStr, hospitalId));
+    const classNames = this.getColorTagClass(dateStr, hospitalId, shiftType);
+    
+    // 如果班次被取消，显示"x"
+    const displayContent = status === 'cancelled' ? 'x' : 'x';
+    
+    return {
+        class: classNames,
+        content: displayContent,
+        style: { backgroundColor: this.getHospitalColor(hospitalId) }
+    };
+},
+
+        // 获取排班优先级（数值越高优先级越高）
+        getSchedulePriority(hospitalId, plan, dateStr) {
+            const status = this.getTempAdjustmentStatus(dateStr, hospitalId, this.getOriginalPlan(dateStr, hospitalId));
+
+            // 优先级规则：
+            // 1. 临时调诊且与固定排班不一致 > 临时调诊且与固定排班一致 > 固定排班
+            if (status === 'changed' || status === 'added' || status === 'cancelled') {
+                return 2; // 临时调诊（不一致）
+            } else if (status === 'same') {
+                return 1; // 临时调诊（一致）
+            } else {
+                return 0; // 固定排班
+            }
+        },
+        // 获取指定日期的排班（集成临时调诊）
+        getScheduleForDate(date) {
+            const dateStr = this.formatDate(date);
+            const dayOfWeek = date.getDay() === 0 ? 7 : date.getDay();
+            const daySchedule = {
+                _isTempAdjust: false,
+                _conflicts: [] // 存储冲突信息
+            };
+
+            Object.keys(this.rawScheduleData).forEach(hospitalId => {
+                const hospital = this.rawScheduleData[hospitalId];
+                const { worktime_no_fixed, worktime_list, temp_change_worktime } = hospital;
+
+                let finalPlan = "0";
+                let isTempAdjust = false;
+                let originalPlan = this.getOriginalPlan(dateStr, hospitalId);
+
+                // 优先检查临时调整
+                if (temp_change_worktime && temp_change_worktime[dateStr]) {
+                    const tempSchedule = temp_change_worktime[dateStr];
+                    finalPlan = tempSchedule.plan.toString();
+                    isTempAdjust = true;
+
+                    // 存储临时调诊信息
+                    if (!this.tempAdjustments[dateStr]) {
+                        this.tempAdjustments[dateStr] = {};
+                    }
+                    this.tempAdjustments[dateStr][hospitalId] = {
+                        originalPlan: originalPlan,
+                        newPlan: finalPlan,
+                        status: this.getTempAdjustmentStatus(dateStr, hospitalId, originalPlan)
+                    };
+                } else {
+                    // 固定排班
+                    if (worktime_no_fixed === 0 && worktime_list && worktime_list[dayOfWeek]) {
+                        const weeklySchedule = worktime_list[dayOfWeek];
+                        finalPlan = weeklySchedule.plan.toString();
+                    }
+                    // 非固定排班
+                    else if (worktime_no_fixed === 1 && worktime_list && worktime_list[dateStr]) {
+                        const dateSchedule = worktime_list[dateStr];
+                        finalPlan = dateSchedule.plan.toString();
+                    }
+                }
+
+                // 添加到排班
+                if (finalPlan !== "0") {
+                    this.addHospitalToSchedule(daySchedule, hospitalId, hospital, finalPlan,
+                        temp_change_worktime && temp_change_worktime[dateStr] ?
+                            temp_change_worktime[dateStr].work_paln_desc :
+                            this.getWorkTimeDesc(finalPlan));
+
+                    if (isTempAdjust) {
+                        daySchedule._isTempAdjust = true;
+                    }
+                }
+            });
+
+            // 检查冲突
+            this.checkScheduleConflicts(daySchedule, dateStr);
+
+            return Object.keys(daySchedule).length > 1 ? daySchedule : null;
+        },
+
+        // 检查排班冲突
+        checkScheduleConflicts(daySchedule, dateStr) {
+            console.log(dateStr);
+            if (this.is_allow_coincide) return;
+
+            for (const shiftType in daySchedule) {
+                if (shiftType === '_isTempAdjust' || shiftType === '_conflicts' || shiftType === '0') continue;
+
+                const hospitals = daySchedule[shiftType];
+                if (hospitals && hospitals.length > 1) {
+                    daySchedule._conflicts.push({
+                        shiftType: shiftType,
+                        hospitals: hospitals
+                    });
+                }
+            }
+        },
+
+
+
+        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 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 || '设置成功')
+                }
+            }).catch(error => {
+                console.error(error, 'error')
+            })
+        },
+        restoreCancel() {
+
+        },
+        // 确认单医院临时调诊
+        singleTempConfirm() {
+            this.singleHosVisiable = false
+        },
+        // 取消单医院临时调诊
+        singleTempCancel() {
+            this.singleHosVisiable = false
+
+        },
         isCurrentMonth(date) {
             const current = new Date();
             const target = new Date(date);
             return current.getFullYear() === target.getFullYear() &&
                 current.getMonth() === target.getMonth();
-        },
+        }, // 修改月份切换方法
+        // 修改月份切换方法，添加冲突统计
         prevMonth() {
             const date = new Date(this.currentDay);
             date.setMonth(date.getMonth() - 1);
             this.currentDay = date;
+            this.generateMonthSchedule(date);
+            this.countMonthlyConflicts(); // 添加统计
         },
 
         nextMonth() {
             const date = new Date(this.currentDay);
             date.setMonth(date.getMonth() + 1);
             this.currentDay = date;
+            this.generateMonthSchedule(date);
+            this.countMonthlyConflicts(); // 添加统计
         },
 
         goToday() {
-            console.log(this.hospitalColorMap, 'hospitalColorMap==');
             this.currentDay = new Date();
-        },
-        getDateCellClass(dateString) {
-            const schedule = this.getDateSchedule(dateString);
-            if (!schedule) return '';
-            for (const key in schedule) {
-                if (key !== '0' && schedule[key] && schedule[key].length > 0) {
-                    return `shift-type-${key}`;
-                }
-            }
-            return '';
+            this.generateMonthSchedule(this.currentDay);
+            this.countMonthlyConflicts(); // 添加统计
         },
         formatMonth(date) {
             const d = new Date(date);
@@ -1041,6 +1539,7 @@ export default {
         overrideWeekTitles() {
             this.$nextTick(() => {
                 const weekHeaders = document.querySelectorAll('.el-calendar-table thead th');
+                console.log(weekHeaders, 'weekHeaders====');
                 if (weekHeaders.length === 7) {
                     weekHeaders.forEach((th, index) => {
                         th.textContent = this.weekDaysDesc[index];
@@ -1057,7 +1556,152 @@ export default {
 
         // 获取指定日期的排班信息
         getDateSchedule(dateString) {
-            return calendarList[dateString];
+            // 如果这天还没有生成排班数据，就动态生成
+            if (!this.calendarList[dateString]) {
+                const date = new Date(dateString);
+                const today = new Date();
+
+                // 只生成今天及之后的排班
+                if (date >= today) {
+                    const daySchedule = this.getScheduleForDate(date);
+                    if (daySchedule) {
+                        this.$set(this.calendarList, dateString, daySchedule);
+                    }
+                }
+            }
+            // console.log(this.calendarList[dateString],'====this.calendarList[dateString]');
+            return this.calendarList[dateString];
+        },
+        formatCalendarData(responseData) {
+            const calendarData = {};
+            const today = new Date();
+
+            // 遍历每个医院
+            Object.keys(responseData).forEach(hospitalId => {
+                const hospital = responseData[hospitalId];
+                const { worktime_no_fixed, worktime_list, temp_change_worktime } = hospital;
+
+                // 处理临时调整的排班
+                if (temp_change_worktime && Object.keys(temp_change_worktime).length > 0) {
+                    Object.keys(temp_change_worktime).forEach(dateStr => {
+                        const schedule = temp_change_worktime[dateStr];
+                        if (!calendarData[dateStr]) {
+                            calendarData[dateStr] = {};
+                        }
+
+                        // 根据 plan 字段确定班次类型
+                        const shiftType = schedule.plan.toString();
+                        if (!calendarData[dateStr][shiftType]) {
+                            calendarData[dateStr][shiftType] = [];
+                        }
+
+                        calendarData[dateStr][shiftType].push({
+                            hid: hospitalId,
+                            hospital_name: hospital.h_depart_name,
+                            workTime: schedule.work_paln_desc || this.getWorkTimeDesc(schedule.plan)
+                        });
+                    });
+                }
+
+                // 处理固定排班
+                if (worktime_no_fixed === 0 && worktime_list && Object.keys(worktime_list).length > 0) {
+                    // 生成未来一段时间的排班（比如未来60天）
+                    for (let i = 0; i < 60; i++) {
+                        const date = new Date(today);
+                        date.setDate(today.getDate() + i);
+                        const dateStr = this.formatDate(date);
+                        const dayOfWeek = date.getDay() === 0 ? 7 : date.getDay(); // 周日为7
+
+                        // 检查这天是否有临时调整，如果有则跳过（因为临时调整优先级更高）
+                        if (temp_change_worktime && temp_change_worktime[dateStr]) {
+                            continue;
+                        }
+
+                        // 获取这天的固定排班
+                        const weeklySchedule = worktime_list[dayOfWeek.toString()];
+                        if (weeklySchedule && weeklySchedule.plan !== "0") {
+                            if (!calendarData[dateStr]) {
+                                calendarData[dateStr] = {};
+                            }
+
+                            const shiftType = weeklySchedule.plan.toString();
+                            if (!calendarData[dateStr][shiftType]) {
+                                calendarData[dateStr][shiftType] = [];
+                            }
+
+                            // 检查是否已经添加过这个医院（避免重复）
+                            const exists = calendarData[dateStr][shiftType].some(
+                                item => item.hid === hospitalId
+                            );
+
+                            if (!exists) {
+                                calendarData[dateStr][shiftType].push({
+                                    hid: hospitalId,
+                                    hospital_name: hospital.h_depart_name,
+                                    workTime: weeklySchedule.work_paln_desc || this.getWorkTimeDesc(weeklySchedule.plan)
+                                });
+                            }
+                        }
+                    }
+                }
+
+                // 处理非固定排班中已有的排班数据（除了临时调整之外的）
+                if (worktime_no_fixed === 1 && worktime_list && Object.keys(worktime_list).length > 0) {
+                    // 这里可以根据实际业务需求处理非固定排班的展示
+                    // 目前只展示已有数据，不生成未来排班
+                }
+            });
+
+            return calendarData;
+        },
+        showConflictDetails() {
+            if (this.conflictCount === 0) return;
+
+            const conflictList = this.conflictDates.map(dateStr => {
+                const date = new Date(dateStr);
+                const schedule = this.getDateSchedule(dateStr);
+                const conflicts = [];
+
+                // 收集具体的冲突信息
+                for (const shiftType in schedule) {
+                    if (shiftType === '_isTempAdjust' || shiftType === '0') continue;
+
+                    const hospitals = schedule[shiftType];
+                    if (hospitals && hospitals.length > 1) {
+                        const hospitalNames = hospitals.map(h => h.hospital_name).join('、');
+                        conflicts.push({
+                            shift: this.plantype[shiftType],
+                            hospitals: hospitalNames,
+                            count: hospitals.length
+                        });
+                    }
+                }
+
+                return {
+                    date: dateStr,
+                    dayOfWeek: this.weekDaysDesc[date.getDay()],
+                    conflicts: conflicts
+                };
+            });
+            return conflictList
+        },
+        // 需要修改 具体工作时间
+        getWorkTimeDesc(plan) {
+            const planMap = {
+                '0': '不可预约',
+                '1': '8:00-12:00 (上午班)',
+                '2': '14:00-17:00 (下午班)',
+                '3': '8:00-17:00 (全天班)'
+            };
+            return planMap[plan.toString()] || '不可预约';
+        },
+
+        // 格式化日期为 YYYY-MM-DD
+        formatDate(date) {
+            const year = date.getFullYear();
+            const month = String(date.getMonth() + 1).padStart(2, '0');
+            const day = String(date.getDate()).padStart(2, '0');
+            return `${year}-${month}-${day}`;
         },
         getDayNumber(dateString) {
             const date = new Date(dateString);
@@ -1199,7 +1843,7 @@ export default {
             this.addPayType = type;
             this.isShowAddPay = true;
         },
-        handleUpdateEvent(data){
+        handleUpdateEvent(data) {
             if (data.type == this.payTypeWeixin) {
                 this.bindWxpayId = data.payid
                 this.selectWxpay = data
@@ -1364,6 +2008,9 @@ export default {
                     'morning_worktime': response.data.morning_worktime ? response.data.morning_worktime.split('-') : '',
                     'afternoon_worktime': response.data.afternoon_worktime ? response.data.afternoon_worktime.split('-') : ''
                 }
+                this.houseCallSettingForm.worktimes = this.form.worktimes;
+
+                console.log(this.form.worktimes, '=form.worktimes====');
                 this.departType = (response.data.type || response.data.type === 0 || response.data.type === "0") ? [Number(response.data.type)] : []
                 this.departIsFixed = response.data.is_fixed == "1" ? true : false
                 this.onLinePay = response.data.pay_switch
@@ -1752,24 +2399,23 @@ export default {
         },
         submitForm(form) {
             this.$refs[form].validate((valid) => {
-                console.log(this[form], '======formxinxi8', '==============' + form);
                 var rqurl = '';
                 if (valid) {
                     let props = {}
                     switch (form) {
                         case 'siteForm1':
-                            var worktimesArray = Object.entries(this.form.worktimes).map(([key, value]) => ({
-                                type: parseInt(key),
-                                plan: value.plan
-                            }));
+                            // var worktimesArray = Object.entries(this.form.worktimes).map(([key, value]) => ({
+                            //     type: parseInt(key),
+                            //     plan: value.plan
+                            // }));
 
                             props = {
                                 morning_worktime: this.form.morning_worktime ? this.form.morning_worktime.join('-') : '',
                                 afternoon_worktime: this.form.afternoon_worktime ? this.form.afternoon_worktime.join('-') : '',
-                                week_visit_plan: JSON.stringify(worktimesArray),
+                                // week_visit_plan: JSON.stringify(worktimesArray),
                             }
 
-                            rqurl = "/api/admin/set_depart_worktime";
+                            rqurl = "/api/admin/set_morning_afternoon_worktime";
                             break;
                         case 'siteForm':
                             if (this.doctor_id && !this.depart_id) {
@@ -1811,6 +2457,10 @@ export default {
                             }
                             rqurl = "/api/admin/set_visit_num";
                             break;
+                        // case 'houseCallSettingForm':
+                        //     this.setDepartWorkTime()
+                        //     return
+
                     }
                     this.updateHosInfo(props, rqurl)
                 } else {
@@ -1880,6 +2530,19 @@ export default {
     box-sizing: border-box;
 }
 
+.conflict-date {
+    background: #FFF1F0;
+    border: 1px solid #E4E7ED;
+    /* #E4E7ED */
+}
+
+#siteMessage8 {
+    .display_work_days {
+        display: flex;
+        align-items: center;
+    }
+}
+
 .tooltip-content {
     .hospital-item {
         font-size: 12px;
@@ -1957,6 +2620,7 @@ export default {
             background: transparent !important;
             border: 1px solid #DCDFE6 !important;
             font-size: 12px;
+
             &:hover {
                 color: #409eff !important;
                 border-color: #c6e2ff !important;
@@ -1990,8 +2654,9 @@ export default {
     margin-bottom: 10px;
 
     // color: #303133;
-    .adjust {
-        width: 63px;
+    .adjust,
+    .conflict {
+        min-width: 63px;
         height: 17px;
         display: flex;
         justify-content: center;
@@ -2008,6 +2673,10 @@ export default {
         text-align: center;
         color: #FF4D4F;
     }
+
+    .conflict {
+        border: none;
+    }
 }
 
 .date-content {
@@ -2058,12 +2727,31 @@ export default {
     flex-wrap: wrap;
 }
 
-.color-tag {
+// 实心框
+.color-tag,
+.opacity-tag {
     display: inline-block;
     width: 12px;
     height: 12px;
     border-radius: 2px;
+    box-sizing: border-box;
     border: 1px solid rgba(0, 0, 0, 0.1);
+
+}
+
+// 取消框透明度调整
+.opacity-tag {
+    opacity: .6;
+}
+
+// 空心框
+.color-tag-coi {
+    width: 12px;
+    height: 12px;
+    border-radius: 2px;
+    background: #FFFFFF;
+    box-sizing: border-box;
+    border: 2px solid #39D067;
 }
 
 /* 如果需要调整文字颜色 */
@@ -2196,9 +2884,12 @@ export default {
 }
 
 .weekPlan {
-    display: grid;
-    grid-gap: 12px 44px;
-    grid-template-columns: repeat(2, 1fr);
+    // display: grid;
+    // grid-gap: 12px 44px;
+    // grid-template-columns: repeat(2, 1fr);
+    gap: 12px 44px;
+    justify-content: flex-start;
+    flex-wrap: wrap;
 }
 
 #siteMessage4 ::v-deep .el-form-item {