diff --git a/package-lock.json b/package-lock.json
index a4fc876..7dadd7d 100755
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,6 @@
         "vue-clickaway": "^2.2.2",
         "vue-qr": "^4.0.9",
         "vue-router": "^3.5.1",
-        "vue-wxlogin": "^1.0.5",
         "vuex": "^3.6.2"
       },
       "devDependencies": {
@@ -4994,7 +4993,6 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
       "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-      "license": "MIT",
       "dependencies": {
         "mimic-response": "^3.1.0"
       },
@@ -7393,8 +7391,7 @@
     "node_modules/js-binary-schema-parser": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/js-binary-schema-parser/-/js-binary-schema-parser-2.0.3.tgz",
-      "integrity": "sha512-xezGJmOb4lk/M1ZZLTR/jaBHQ4gG/lqQnJqdIv4721DMggsa1bDVlHXNeHYogaIEHD9vCRv0fcL4hMA+Coarkg==",
-      "license": "MIT"
+      "integrity": "sha512-xezGJmOb4lk/M1ZZLTR/jaBHQ4gG/lqQnJqdIv4721DMggsa1bDVlHXNeHYogaIEHD9vCRv0fcL4hMA+Coarkg=="
     },
     "node_modules/js-message": {
       "version": "1.0.7",
@@ -7977,7 +7974,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
       "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -8574,8 +8570,7 @@
     "node_modules/parenthesis": {
       "version": "3.1.8",
       "resolved": "https://registry.npmjs.org/parenthesis/-/parenthesis-3.1.8.tgz",
-      "integrity": "sha512-KF/U8tk54BgQewkJPvB4s/US3VQY68BRDpH638+7O/n58TpnwiwnOtGIOsT2/i+M78s61BBpeC83STB88d8sqw==",
-      "license": "MIT"
+      "integrity": "sha512-KF/U8tk54BgQewkJPvB4s/US3VQY68BRDpH638+7O/n58TpnwiwnOtGIOsT2/i+M78s61BBpeC83STB88d8sqw=="
     },
     "node_modules/parse-json": {
       "version": "5.2.0",
@@ -10324,8 +10319,7 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/simple-get": {
       "version": "4.0.1",
@@ -10345,7 +10339,6 @@
           "url": "https://feross.org/support"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "decompress-response": "^6.0.0",
         "once": "^1.3.1",
@@ -10544,7 +10537,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/string-split-by/-/string-split-by-1.0.0.tgz",
       "integrity": "sha512-KaJKY+hfpzNyet/emP81PJA9hTVSfxNLS9SFTWxdCnnW1/zOOwiV248+EfoX7IQFcBaOp4G5YE6xTJMF+pLg6A==",
-      "license": "MIT",
       "dependencies": {
         "parenthesis": "^3.1.5"
       }
@@ -11303,7 +11295,6 @@
       "version": "4.0.9",
       "resolved": "https://registry.npmjs.org/vue-qr/-/vue-qr-4.0.9.tgz",
       "integrity": "sha512-pAISV94T0MNEYA3NGjykUpsXRE2QfaNxlu9ZhEL6CERgqNc21hJYuP3hRVzAWfBQlgO18DPmZTbrFerJC3+Ikw==",
-      "license": "MIT",
       "dependencies": {
         "glob": "^8.0.1",
         "js-binary-schema-parser": "^2.0.2",
@@ -11315,7 +11306,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
       "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
@@ -11325,7 +11315,6 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
       "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
       "deprecated": "Glob versions prior to v9 are no longer supported",
-      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -11344,7 +11333,6 @@
       "version": "5.1.6",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
       "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -11416,19 +11404,6 @@
       "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
       "dev": true
     },
-    "node_modules/vue-wxlogin": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/vue-wxlogin/-/vue-wxlogin-1.0.5.tgz",
-      "integrity": "sha512-JJTL9qwROH7c/OWU8mube6Yd6kwUTItCg4tyjZQVby1MKWNuNz/f0eeRd0bhOdFyPSFmVazTF3nw+Jhfo4FzVA==",
-      "license": "MIT",
-      "dependencies": {
-        "vue": "^2.4.2"
-      },
-      "engines": {
-        "node": ">= 4.0.0",
-        "npm": ">= 3.0.0"
-      }
-    },
     "node_modules/vuex": {
       "version": "3.6.2",
       "resolved": "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz",
diff --git a/src/assets/site/prompt-icon-1.svg b/src/assets/site/prompt-icon-1.svg
new file mode 100644
index 0000000..377fc99
--- /dev/null
+++ b/src/assets/site/prompt-icon-1.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="16" height="16" viewBox="0 0 16 16"><defs><clipPath id="master_svg0_217_60685"><rect x="0" y="0" width="16" height="16" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_217_60685)"><g><path d="M8,1C9.97933,1.052,11.6278,1.7368329999999998,12.9455,3.0545C14.2632,4.372170000000001,14.948,6.02067,15,8C14.948,9.97933,14.2632,11.6278,12.9455,12.9455C11.6278,14.2632,9.97933,14.948,8,15C6.02067,14.948,4.372170000000001,14.2632,3.0545,12.9455C1.7368329999999998,11.6278,1.052,9.97933,1,8C1.052,6.02067,1.7368329999999998,4.372170000000001,3.0545,3.0545C4.372170000000001,1.7368329999999998,6.02067,1.052,8,1C8,1,8,1,8,1C8,1,8,1,8,1ZM9.047,5.297C9.318,5.297,9.542,5.21633,9.719,5.055C9.896,4.89367,9.9845,4.6775,9.9845,4.406499999999999C9.9845,4.1355,9.896,3.91933,9.719,3.758C9.542,3.59667,9.32067,3.516,9.055,3.516C8.78933,3.516,8.568,3.59667,8.391,3.758C8.214,3.91933,8.125499999999999,4.1355,8.125499999999999,4.406499999999999C8.125499999999999,4.6775,8.214,4.89367,8.391,5.055C8.568,5.21633,8.78683,5.297,9.0475,5.297C9.0475,5.297,9.047,5.297,9.047,5.297C9.047,5.297,9.047,5.297,9.047,5.297ZM9.2345,10.922C9.2345,10.85933,9.23967,10.776,9.25,10.672C9.26033,10.568,9.26033,10.469,9.25,10.375C9.25,10.375,8.422,11.328,8.422,11.328C8.33867,11.4217,8.25267,11.4947,8.164,11.547C8.075330000000001,11.5993,7.99983,11.615,7.9375,11.594C7.84383,11.5523,7.80217,11.4793,7.8125,11.375C7.8125,11.375,9.1875,7.047,9.1875,7.047C9.2395,6.75533,9.19267,6.50533,9.047,6.297C8.90133,6.08867,8.667,5.96367,8.344000000000001,5.922C7.97933,5.93233,7.58083,6.086,7.1485,6.383C6.71617,6.68,6.3385,7.05767,6.0155,7.516C6.0155,7.516,6.0155,7.7505,6.0155,7.7505C6.00517,7.85483,6.00517,7.95383,6.0155,8.0475C6.0155,8.0475,6.8435,7.0945,6.8435,7.0945C6.92683,7.00083,7.01283,6.92783,7.1015,6.8755C7.19017,6.82317,7.2605,6.8075,7.3125,6.8285C7.41683,6.8805,7.45333,6.96383,7.422,7.0785C7.422,7.0785,6.0625,11.391,6.0625,11.391C5.9895,11.6513,6.026,11.8832,6.172,12.0865C6.318,12.2898,6.57317,12.4278,6.9375,12.5005C7.4585,12.4902,7.896,12.3392,8.25,12.0475C8.604,11.7558,8.93217,11.3808,9.2345,10.9225C9.2345,10.9225,9.2345,10.922,9.2345,10.922C9.2345,10.922,9.2345,10.922,9.2345,10.922Z" fill="#006AFF" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/src/assets/site/prompt-icon-2.svg b/src/assets/site/prompt-icon-2.svg
new file mode 100644
index 0000000..3789fbc
--- /dev/null
+++ b/src/assets/site/prompt-icon-2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="16" height="16" viewBox="0 0 16 16"><defs><clipPath id="master_svg0_354_94660/23_30613"><rect x="0" y="0" width="16" height="16" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_354_94660/23_30613)"><g><path d="M8,1C9.97933,1.052,11.6278,1.7368329999999998,12.9455,3.0545C14.2632,4.372170000000001,14.948,6.02067,15,8C14.948,9.97933,14.2632,11.6278,12.9455,12.9455C11.6278,14.2632,9.97933,14.948,8,15C6.02067,14.948,4.372170000000001,14.2632,3.0545,12.9455C1.7368329999999998,11.6278,1.052,9.97933,1,8C1.052,6.02067,1.7368329999999998,4.372170000000001,3.0545,3.0545C4.372170000000001,1.7368329999999998,6.02067,1.052,8,1C8,1,8,1,8,1C8,1,8,1,8,1ZM9.047,5.297C9.318,5.297,9.542,5.21633,9.719,5.055C9.896,4.89367,9.9845,4.6775,9.9845,4.406499999999999C9.9845,4.1355,9.896,3.91933,9.719,3.758C9.542,3.59667,9.32067,3.516,9.055,3.516C8.78933,3.516,8.568,3.59667,8.391,3.758C8.214,3.91933,8.125499999999999,4.1355,8.125499999999999,4.406499999999999C8.125499999999999,4.6775,8.214,4.89367,8.391,5.055C8.568,5.21633,8.78683,5.297,9.0475,5.297C9.0475,5.297,9.047,5.297,9.047,5.297C9.047,5.297,9.047,5.297,9.047,5.297ZM9.2345,10.922C9.2345,10.85933,9.23967,10.776,9.25,10.672C9.26033,10.568,9.26033,10.469,9.25,10.375C9.25,10.375,8.422,11.328,8.422,11.328C8.33867,11.4217,8.25267,11.4947,8.164,11.547C8.075330000000001,11.5993,7.99983,11.615,7.9375,11.594C7.84383,11.5523,7.80217,11.4793,7.8125,11.375C7.8125,11.375,9.1875,7.047,9.1875,7.047C9.2395,6.75533,9.19267,6.50533,9.047,6.297C8.90133,6.08867,8.667,5.96367,8.344000000000001,5.922C7.97933,5.93233,7.58083,6.086,7.1485,6.383C6.71617,6.68,6.3385,7.05767,6.0155,7.516C6.0155,7.516,6.0155,7.7505,6.0155,7.7505C6.00517,7.85483,6.00517,7.95383,6.0155,8.0475C6.0155,8.0475,6.8435,7.0945,6.8435,7.0945C6.92683,7.00083,7.01283,6.92783,7.1015,6.8755C7.19017,6.82317,7.2605,6.8075,7.3125,6.8285C7.41683,6.8805,7.45333,6.96383,7.422,7.0785C7.422,7.0785,6.0625,11.391,6.0625,11.391C5.9895,11.6513,6.026,11.8832,6.172,12.0865C6.318,12.2898,6.57317,12.4278,6.9375,12.5005C7.4585,12.4902,7.896,12.3392,8.25,12.0475C8.604,11.7558,8.93217,11.3808,9.2345,10.9225C9.2345,10.9225,9.2345,10.922,9.2345,10.922C9.2345,10.922,9.2345,10.922,9.2345,10.922Z" fill="#FF8C00" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/src/assets/site/prompt-icon-3.svg b/src/assets/site/prompt-icon-3.svg
new file mode 100644
index 0000000..98b0bdd
--- /dev/null
+++ b/src/assets/site/prompt-icon-3.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="16" height="16" viewBox="0 0 16 16"><defs><clipPath id="master_svg0_242_77707/23_30613"><rect x="0" y="0" width="16" height="16" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_242_77707/23_30613)"><g><path d="M8,1C9.97933,1.052,11.6278,1.7368329999999998,12.9455,3.0545C14.2632,4.372170000000001,14.948,6.02067,15,8C14.948,9.97933,14.2632,11.6278,12.9455,12.9455C11.6278,14.2632,9.97933,14.948,8,15C6.02067,14.948,4.372170000000001,14.2632,3.0545,12.9455C1.7368329999999998,11.6278,1.052,9.97933,1,8C1.052,6.02067,1.7368329999999998,4.372170000000001,3.0545,3.0545C4.372170000000001,1.7368329999999998,6.02067,1.052,8,1C8,1,8,1,8,1C8,1,8,1,8,1ZM9.047,5.297C9.318,5.297,9.542,5.21633,9.719,5.055C9.896,4.89367,9.9845,4.6775,9.9845,4.406499999999999C9.9845,4.1355,9.896,3.91933,9.719,3.758C9.542,3.59667,9.32067,3.516,9.055,3.516C8.78933,3.516,8.568,3.59667,8.391,3.758C8.214,3.91933,8.125499999999999,4.1355,8.125499999999999,4.406499999999999C8.125499999999999,4.6775,8.214,4.89367,8.391,5.055C8.568,5.21633,8.78683,5.297,9.0475,5.297C9.0475,5.297,9.047,5.297,9.047,5.297C9.047,5.297,9.047,5.297,9.047,5.297ZM9.2345,10.922C9.2345,10.85933,9.23967,10.776,9.25,10.672C9.26033,10.568,9.26033,10.469,9.25,10.375C9.25,10.375,8.422,11.328,8.422,11.328C8.33867,11.4217,8.25267,11.4947,8.164,11.547C8.075330000000001,11.5993,7.99983,11.615,7.9375,11.594C7.84383,11.5523,7.80217,11.4793,7.8125,11.375C7.8125,11.375,9.1875,7.047,9.1875,7.047C9.2395,6.75533,9.19267,6.50533,9.047,6.297C8.90133,6.08867,8.667,5.96367,8.344000000000001,5.922C7.97933,5.93233,7.58083,6.086,7.1485,6.383C6.71617,6.68,6.3385,7.05767,6.0155,7.516C6.0155,7.516,6.0155,7.7505,6.0155,7.7505C6.00517,7.85483,6.00517,7.95383,6.0155,8.0475C6.0155,8.0475,6.8435,7.0945,6.8435,7.0945C6.92683,7.00083,7.01283,6.92783,7.1015,6.8755C7.19017,6.82317,7.2605,6.8075,7.3125,6.8285C7.41683,6.8805,7.45333,6.96383,7.422,7.0785C7.422,7.0785,6.0625,11.391,6.0625,11.391C5.9895,11.6513,6.026,11.8832,6.172,12.0865C6.318,12.2898,6.57317,12.4278,6.9375,12.5005C7.4585,12.4902,7.896,12.3392,8.25,12.0475C8.604,11.7558,8.93217,11.3808,9.2345,10.9225C9.2345,10.9225,9.2345,10.922,9.2345,10.922C9.2345,10.922,9.2345,10.922,9.2345,10.922Z" fill="#FF4D4F" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
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/components/PromptText.vue b/src/components/PromptText.vue
new file mode 100644
index 0000000..0283f17
--- /dev/null
+++ b/src/components/PromptText.vue
@@ -0,0 +1,97 @@
+<template>
+    <div class="prompt-text" :class="typeClass">
+        <div class="flex-text">
+            <div class="flex">
+                <img class="prompt-icon" :src="typeIcon" alt="">
+                <span class="prompt-desc">{{text}}</span>
+            </div>
+            <div class="flex">
+                <slot name="next_desc" />
+            </div>
+        </div>
+        <div class="prompt-extra">
+            <slot name="desc" />
+        </div>
+    </div>
+</template>
+<script>
+
+export default {
+    name: 'PromptText',
+    props: {
+        text: {
+            type: String,
+            required: true
+        },
+        type: {
+            type: [Number, String],
+            default: 2
+        },
+    },
+    components: {
+    },
+    data(){
+        return{}
+    },
+    computed: {
+        typeClass() {
+            switch (parseInt(this.type)) {
+                case 1: return 'info';
+                case 2: return 'notice';
+                case 3: return 'warning';
+                default: return 'notice';
+            }
+        },
+        typeIcon() {
+            switch (parseInt(this.type)) {
+                case 1: return require('@/assets/site/prompt-icon-1.svg');
+                case 2: return require('@/assets/site/prompt-icon-2.svg');
+                case 3: return require('@/assets/site/prompt-icon-3.svg');
+                default: return require('@/assets/site/prompt-icon-2.svg');
+            }
+        }
+    },
+    methods:{
+
+    }
+}
+</script>
+<style scoped lang="scss">
+.prompt-text{
+  padding: 8px 13px;
+  border-radius: 4px;
+  text-align: justify;
+}
+.flex-text{
+  display: flex;
+  align-items: center;
+  align-self: stretch;
+  justify-content: space-between;
+  z-index: 1;
+}
+.info{
+  background: #F2F7FF;
+  border: 1px solid #BFDAFF;
+}
+.notice{
+  background: #FEFCE8;
+  border: 1px solid rgba(255, 140, 0, 0.3);
+}
+.warning{
+  background: #FFF1F0;
+  border: 1px solid #FFA39E;
+}
+.prompt-icon{
+  width: 16px;
+  height: 16px;;
+  margin-right: 8px;
+}
+
+.prompt-desc{
+  color: #1E2226;
+  letter-spacing: 0.08em;
+}
+.prompt-extra{
+
+}
+</style>
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
index 84116e8..54af857 100755
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -54,6 +54,23 @@ export default new Vuex.Store({
       ]
     },
     {
+      name: '出诊公告',
+      path: '',
+      noToPath:true,
+      img: 'menu/Totalprofit1.svg',
+      imgActive: require('@/assets/menu/Totalprofit.svg'),
+      list: [
+        {
+          name: '公告设置',
+          desc: 'siteMessage8'
+        },
+        {
+          name: '出诊日历预览',
+          desc: 'siteMessage9'
+        },
+      ]
+    },
+    {
       name: '项目管理',
       path: '',
       noToPath:true,
diff --git a/src/views/DoctorInformation.vue b/src/views/DoctorInformation.vue
index 6e5ace8..9c9e0f0 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 mb24">您有多个出诊医院时，允许不同医院排班时段重合吗？</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">
@@ -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,13 +133,16 @@
                     </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>
             <GroupFormBtns @cancel="cancelClick('siteForm1')" @confirm="setDoctorDesc" />
         </div>
+        <ConflictDialog :isDoctorSet="true" ref="conflictDialog" :cancelBtnShow="'0'" :doctor_id="doctorId"
+        title="已有出诊安排冲突，请先修改！" :confirmText="'我知道了'"/>
+
     </div>
 </template>
 <script>
@@ -138,6 +153,8 @@ import GuipInput from '@/components/GuipInput.vue';
 import GuipTextarea from '@/components/GuipTextarea.vue';
 import GroupFormBtns from '@/components/GroupFormBtns.vue';
 import GuipRadio from '@/components/GuipRadio.vue';
+import ConflictDialog from './conflictDialog.vue';
+
 export default {
     // 站点设置
     name: '',
@@ -148,19 +165,22 @@ export default {
         GuipRadio,
         GuipInput,
         GuipTextarea,
-        GroupFormBtns
+        GroupFormBtns,
+        ConflictDialog
     },
     data() {
         return {
             doctorId: '',
+            is_allow_coincide: true,//是否允许重合
+            hasConflictresult:[],
             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 +188,7 @@ export default {
             ],
             formData: null,
             siteForm: {
-                did:0,
+                did: 0,
                 name: '',
                 idcard: ' ',
                 phone: '',
@@ -176,9 +196,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 +207,11 @@ export default {
                     { required: true, message: '请选择初诊审批设置', trigger: 'change' }
                 ]
             },
+            siteFormrules3: {
+                coincide: [
+                    { required: true, message: '请选择出诊设置', trigger: 'change' }
+                ]
+            },
             siteFormrules: {
                 name: [
                     { required: true, message: '请输入姓名', trigger: 'blur' }
@@ -231,7 +257,7 @@ export default {
     },
     methods: {
         setDoctorDesc() {
-            if(!this.doctorId) {
+            if (!this.doctorId) {
                 this.$message.error('请先设置医生基础信息')
                 return;
             }
@@ -253,7 +279,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 +303,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 +325,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 +336,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 +366,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 +376,48 @@ 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;
+            }
+            // 如果设置为禁止时段重合
+            if (this.siteForm.is_allow_coincide == 0) {
+                this.$refs.conflictDialog.open()
+                return
+            }
+
+            this.$http('POST', '/api/admin/set_allow_coincide', {
+                is_allow_coincide:this.siteForm.is_allow_coincide,
+                did: this.doctorId
+            }).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 +438,33 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.coincideWrap {
+    margin-right: 24px;
+    text-align: left;
 
-.info-upload-wrapper ::v-deep .el-upload-list.el-upload-list--picture-card{
+    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 +474,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 +503,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 46c19a9..87fe49a 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"
@@ -89,27 +87,20 @@
                         <GuipFormItem column="column" class="mb24" label="工作时间（ 上午 ）" :required="true">
                             <el-time-picker slot="formDom" style="width:100%" is-range v-model="form.morning_worktime"
                                 range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" placeholder="选择时间范围"
-                                @change="ChangeTime('time1')" format="HH:mm" value-format="HH:mm">
+                            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" 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">
+                            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">
-
-                            <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>
-                    </div>
                 </div>
             </el-form>
             <GroupFormBtns @cancel="cancelClick" @confirm="submitForm('siteForm1')" />
@@ -153,7 +144,8 @@
             <el-form>
                 <div class="mb32 flex gap12">
                     <span class="littleTitle">线上收款</span>
-                    <GuipSwitch :value="onLinePay" ref="hasOnlinePayRef" :active-value="1" :inactive-value="0" :disabled="!wxpayList.length" @change="onLineChange"></GuipSwitch>
+                    <GuipSwitch :value="onLinePay" ref="hasOnlinePayRef" :active-value="1" :inactive-value="0"
+                        :disabled="!wxpayList.length" @change="onLineChange"></GuipSwitch>
                     <span v-if="!onLinePay" class="tipInfo">未绑定微信收款方式，无法开启线上收款</span>
                     <span v-if="!onLinePay == 1"> {{ onLinePay == 1 ? '开启' : '' }}</span>
                 </div>
@@ -196,8 +188,7 @@
                                             <p>{{ item.appid }}</p>
                                         </div>
                                         <div class="right">
-                                            <img v-if="item.is_bind"
-                                                src="@/assets/drop-selected.svg" alt="">
+                                            <img v-if="item.is_bind" src="@/assets/drop-selected.svg" alt="">
                                         </div>
                                     </div>
                                 </template>
@@ -218,8 +209,9 @@
                             <CustomDropdown slot="formDom" width="100%" :options="alipayList"
                                 :options_null="!alipayList.length" @change="changeSelectAlipay">
                                 <template #trigger>
-                                    <span v-if="selectAlipay && (selectAlipay.company_short_name || selectAlipay.appid)">{{
-                                        selectAlipay.company_short_name }} {{ selectAlipay.appid }}</span>
+                                    <span
+                                        v-if="selectAlipay && (selectAlipay.company_short_name || selectAlipay.appid)">{{
+                                            selectAlipay.company_short_name }} {{ selectAlipay.appid }}</span>
                                     <span v-else-if="alipayList.length === 0">非必须绑定项</span>
                                     <span v-else>未绑定支付宝收款</span>
                                 </template>
@@ -244,8 +236,7 @@
                                             <p>{{ item.appid }}</p>
                                         </div>
                                         <div class="right">
-                                            <img v-if="item.is_bind"
-                                                src="@/assets/drop-selected.svg" alt="">
+                                            <img v-if="item.is_bind" src="@/assets/drop-selected.svg" alt="">
                                         </div>
                                     </div>
                                 </template>
@@ -259,15 +250,16 @@
             <el-form>
                 <div class="mb32 flex gap12">
                     <span class="littleTitle">收挂号费</span>
-                    <GuipSwitch :value="hasVisitFee" ref="hasVisitFeeRef" :active-value="1" :inactive-value="0" @change="onVisitFeeChange"></GuipSwitch>
-                    <span class="desc">患者在小程序预约时，{{hasVisitFee == 1?'':'不'}}需缴纳挂号费</span>
+                    <GuipSwitch :value="hasVisitFee" ref="hasVisitFeeRef" :active-value="1" :inactive-value="0"
+                        @change="onVisitFeeChange"></GuipSwitch>
+                    <span class="desc">患者在小程序预约时，{{ hasVisitFee == 1 ? '' : '不' }}需缴纳挂号费</span>
                 </div>
                 <div class="bidwrap-item">
                     <div class="biditemMast mb12 flex-between">
                         <div class="bidwrap-item-top flex">
                             <div class="top-right column">
                                 <p>设置挂号费金额</p>
-                                <p class="desc" v-if="registerMoney">{{registerMoney}}元/人</p>
+                                <p class="desc" v-if="registerMoney">{{ registerMoney }}元/人</p>
                             </div>
                         </div>
                         <div class="flex" v-if="registerMoney">
@@ -277,8 +269,7 @@
                         </div>
                         <div class="flex" v-else>
                             <span :class="'notSet'">未设置</span>
-                            <GuipButton type="system"
-                                :btnstyle="{ width: '126px', height: '38px' }"
+                            <GuipButton type="system" :btnstyle="{ width: '126px', height: '38px' }"
                                 @click="showDialog('register')">立即设置</GuipButton>
                         </div>
                     </div>
@@ -286,7 +277,8 @@
                         <div class="bidwrap-item-top flex">
                             <div class="top-right column">
                                 <p>免挂号费规则</p>
-                                <p class="desc" v-if="againVisitFreeDays && hasAgainVisitFreeDays">患者{{againVisitFreeDays}}天内再次就诊、患者有剩余治疗项目，免收挂号费</p>
+                                <p class="desc" v-if="againVisitFreeDays && hasAgainVisitFreeDays">
+                                    患者{{ againVisitFreeDays }}天内再次就诊、患者有剩余治疗项目，免收挂号费</p>
                             </div>
                         </div>
                         <div class="flex" v-if="hasFreeRegisterRule">
@@ -296,8 +288,7 @@
                         </div>
                         <div class="flex" v-else>
                             <span :class="'notSet'">未设置</span>
-                            <GuipButton type="system"
-                                :btnstyle="{ width: '126px', height: '38px' }"
+                            <GuipButton type="system" :btnstyle="{ width: '126px', height: '38px' }"
                                 @click="showDialog('registerRule')">立即设置</GuipButton>
                         </div>
                     </div>
@@ -305,6 +296,147 @@
             </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" />
+            <div class="custom-calendar-header">
+                <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" v-if="conflictCount > 0 && !is_allow_coincide">本月有 {{ conflictCount }}
+                        天出诊医院重合，请检查——</span>
+                </div>
+                <div class="header-right">
+                    <el-button-group>
+                        <el-button size="mini" @click="goToday">今天</el-button>
+                        <el-button size="mini" @click="prevMonth">上个月</el-button>
+                        <el-button size="mini" @click="nextMonth">下个月</el-button>
+                    </el-button-group>
+                </div>
+            </div>
+            <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.h_depart_name }}</span>
+                </div>
+            </div>
+            <div class="calendar-container">
+                <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="hasScheduleData(data.day, date)" popper-class="schedule-tooltip">
+                            <!-- 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' : '']">
+                                <div class="date-header flex-between">
+                                    <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="conflict" v-if="!is_allow_coincide && isConflictDate(data.day)">存在冲突!
+                                    </div>
+                                    <div class="adjust"
+                                        v-if="shouldShowAdjust(data.day) && !hasMultipleTempAdjustments(data.day) && is_allow_coincide">
+                                        临时调整
+                                    </div>
+                                </div>
+
+                                <!-- 医院排班信息 -->
+                                <div class="schedule-content">
+                                    <template>
+                                        <!-- 动态渲染班次类型 -->
+                                        <div v-for="(shiftType, key) in plantype" :key="key">
+                                            <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"
+                                                    :style="(hosList.length == 1 && getDateCellClass(data.day) == 'shift-type-0') ? 'text-decoration:line-through' : ''">{{
+                                                        shiftType }}</span>
+                                                <div class="hospital-tags" v-if="hosList.length > 1">
+                                                    <span v-for="hospital in getDateSchedule(data.day)[key]"
+                                                        :key="hospital.hid"
+                                                        :class="getColorTagConfig(data.day, hospital.hid, key).class"
+                                                        :style="getColorTagConfig(data.day, hospital.hid, key).style">
+                                                        {{ hospital.isCancelled ? 'x' : '' }}
+                                                    </span>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </template>
+                                </div>
+                            </div>
+                            <!-- 气泡弹出框信息 -->
+                            <div slot="content" class="tooltip-content">
+                                <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="[getHospitalItemClass(data.day, hospital.hid),
+                                        { 'cancelled-item': hospital.isCancelled || getAdjustmentStatus(data.day, hospital.hid) === 'cancelled' }]">
+                                        <div class="hospital-info">
+                                            <span class=" tooltip-tag"
+                                                :class="getColorTagConfig(data.day, hospital.hid, key).class"
+                                                :style="getColorTagConfig(data.day, hospital.hid, key).style">
+                                                {{ hospital.isCancelled ? 'x' : '' }}</span>
+                                            <span class="hospital-name">{{ hospital.hospital_name }}</span>
+                                        </div>
+                                        <div class="work-time">
+                                            {{ getWorkTimeDisplayText(hospital, data.day, hospital.hid) }}
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+                        </el-tooltip>
+                        <div v-else class="calendar-date" @click="handleDateClick(data.day, $event, date, data)">
+                            <div class="date-header">
+                                <div class="flex gap12">
+                                    <span class="date-text">{{ getDayNumber(data.day) }}</span>
+                                    <span v-if="isToday(data.day)" class="today-badge">今</span>
+                                </div>
+                            </div>
+                        </div>
+                    </template>
+                </el-calendar>
+            </div>
+        </div>
         <!-- <p class="pageTitle bold">项目管理</p> -->
         <div class="siteMessage flex-common mt12" id="siteMessage4">
             <el-form>
@@ -337,7 +469,8 @@
                                 @click="selectTag('all')">
                                 全部分类</div>
                             <div :class="['tab-item point', projectSearchId == item.id ? 'active' : '']"
-                                @click="selectTag(item)" v-for="item in projectTagData" :key="item.name">{{ item.name }}
+                                @click="selectTag(item)" v-for="item in projectTagData" :key="item.name">{{
+                                    item.name }}
                             </div>
                         </div>
                     </div>
@@ -458,20 +591,104 @@
         </div>
 
         <GuipDialog :dialogVisible="registrationVisible" title="设置挂号费金额" :show-close-button="false" width="599px"
-            :show-cancel-button="true" @confirm="handleRegisterConfirm('registerMoney')" @cancel="handleregisterCancel" ref="visitFee">
+            :show-cancel-button="true" @confirm="handleRegisterConfirm('registerMoney')" @cancel="handleregisterCancel"
+            ref="visitFee">
             <el-form>
-                <GuipInput v-model="registerMoney" ref="registerMoney" class="registerMoney" placeholder="请输入" unit="元/人"></GuipInput>
+                <GuipInput v-model="registerMoney" ref="registerMoney" class="registerMoney" placeholder="请输入"
+                    unit="元/人">
+                </GuipInput>
             </el-form>
         </GuipDialog>
+
+        <GuipDialog :dialogVisible="singleHosVisiable" :title="singleHosTitle" :show-close-button="false" width="599px"
+            :show-cancel-button="true" @confirm="singleTempConfirm" @cancel="singleTempCancel" ref="singleHosRef">
+            <p class="" v-if="isShowDialogDate">
+                {{ currentEditingDate }}{{ isToday(currentEditingDate) ? '(今日)' : '' }}
+            </p>
+            <div class="flex mt24"  :key="currentDate">
+                <el-radio v-model="singleCurrentPlan" :label="'1'">上午出诊</el-radio>
+                <el-radio v-model="singleCurrentPlan" :label="'2'">下午出诊</el-radio>
+                <el-radio v-model="singleCurrentPlan" :label="'3'">全天出诊</el-radio>
+                <el-radio v-model="singleCurrentPlan" :label="'0'">不出诊</el-radio>
+            </div>
+        </GuipDialog>
+
+        <GuipDialog :dialogVisible="moreHosVisiable" title="出诊日历" :show-close-button="false" width="599px"
+            :show-cancel-button="true" @cancel="moreTempCancel" @confirm="moreTempConfirm" ref="singleHosRef">
+            <p class="mb24">
+                {{ currentEditingDate }}{{ isToday(currentEditingDate) ? '(今日)' : '' }}
+            </p>
+            <el-form>
+                <div class="flex mb24">
+                    <span class="" style="width: 50px;margin-right: 24px;">上午班</span>
+                    <div class="select-container">
+                        <div class="selected-hospitals-display" @click="toggleAfternoonDropdown('morn')">
+                            <div class="flex">
+                                <span v-if="isMorningConflict" class="conflictTip">冲突</span>
+                                <div class="overHostext">{{ morningText }}</div>
+                            </div>
+                            <i :class="['el-icon-arrow-down', { 'is-reverse': isMornDropdownOpen }]"></i>
+                        </div>
+                        <el-select placeholder="休息" ref="afternoonSelect" v-model="morningSelectedHospitals1"
+                            class="hidden-select" @visible-change="handleMornVisibleChange">
+                            <el-option v-for="item in hosList" :key="item.hid" :label="item.name" disabled
+                                :value="item.hid">
+                                <div class="flex-between option-content">
+                                    <span style="color:#333">{{ item.name }}</span>
+                                    <div class="checkbox-wrapper" @click.stop>
+                                        <el-checkbox :key="forceTime"
+                                            @change="handleWorkCheckDirect(item, $event, 'morningSelectedHospitals')"
+                                            :checked="item.morning_plan == '1' ? true : false"></el-checkbox>
+                                    </div>
+                                </div>
+                            </el-option>
+                        </el-select>
+                    </div>
+                </div>
+
+                <div class="flex">
+                    <span style="width: 50px;margin-right: 24px;">下午班</span>
+                    <div class="select-container">
+                        <div class="selected-hospitals-display" @click="toggleAfternoonDropdown('after')">
+                            <div class="flex">
+                                <span v-if="isAfternoonConflict" class="conflictTip">冲突</span>
+                                <div class="overHostext">{{ afterText }}</div>
+                            </div>
+                            <i :class="['el-icon-arrow-down', { 'is-reverse': isAfternoonDropdownOpen }]"></i>
+                        </div>
+                        <el-select placeholder="休息" ref="afternoonSelect" v-model="afternoonSelectedHospitals1"
+                            class="hidden-select" @visible-change="handleAfternoonVisibleChange">
+                            <el-option v-for="item in hosList" :key="item.hid" :label="item.name" disabled
+                                :value="item.hid">
+                                <div class="flex-between option-content">
+                                    <span style="color:#333">{{ item.name }}</span>
+                                    <div class="checkbox-wrapper" @click.stop>
+                                        <el-checkbox :key="forceTime"
+                                            @change="handleWorkCheckDirect(item, $event, 'afternoonSelectedHospitals')"
+                                            :checked="item.afternoon_plan == '1' ? true : false"></el-checkbox>
+                                    </div>
+                                </div>
+
+                            </el-option>
+                        </el-select>
+                    </div>
+
+                </div>
+            </el-form>
+
+        </GuipDialog>
         <!-- freeRegVisible -->
         <GuipDialog :dialogVisible="freeRegVisible" title="免挂号费规则" :show-close-button="false" width="599px"
-            :show-cancel-button="true" @confirm="handleRegisterConfirm('freeRegVisible')" @cancel="handleregisterCancel" >
+            :show-cancel-button="true" @confirm="handleRegisterConfirm('freeRegVisible')"
+            @cancel="handleregisterCancel">
             <p class="freeDesc">若勾选多个规则，满足其一即免挂号费</p>
             <el-form class="freeWrap">
                 <div class="flex gap8 mb24 mt24">
                     <el-checkbox v-model="hasAgainVisitFreeDays" :true-label="1" :false-label="0"></el-checkbox>
                     患者
-                    <GuipInput v-model="againVisitFreeDays" type="number" width="92px" placeholder="请输入"></GuipInput>天内再次就诊，免挂号费
+                    <GuipInput v-model="againVisitFreeDays" type="number" width="92px" placeholder="请输入">
+                    </GuipInput>
+                    天内再次就诊，免挂号费
                 </div>
                 <p class="flex gap8">
                     <el-checkbox v-model="hasRemainVisitFree" :true-label="1" :false-label="0"></el-checkbox>
@@ -479,8 +696,10 @@
                 </p>
             </el-form>
         </GuipDialog>
+         <ConflictDialog :is_allow_coincide="is_allow_coincide" :h_realname="form.h_realname" :houseCallSettingForm="houseCallSettingForm"
+          ref="conflictDialog" :doctor_id="doctor_id" :rawScheduleDataProp="rawScheduleData" :depart_id="depart_id" :oldWorktimes="form.worktimes"/>
 
-        <GuipDialog :dialogVisible="dialogVisible" :title="dialogTitle" :show-close-button="true" width="762"
+        <GuipDialog :dialogVisible="dialogVisible" :title="dialogTitle" :show-close-button="true" width="762px"
             :show-cancel-button="true" @confirm="handleConfirm" @cancel="handleCancel" @close="handleClose"
             @dialogVisibleChange="dialogVisibleChange">
             <BatchProject ref="channelProject" v-if="dialogType == '1'" :projectTagData="projectTagData" />
@@ -497,11 +716,15 @@
         </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>
+
 import GuipFormItem from '@/components/GuipFormItem.vue';
+import PromptText from '@/components/PromptText.vue';
 import BatchProject from '@/components/BatchProject.vue';
 import store from '@/store';
 import GuipButton from '@/components/GuipButton.vue';
@@ -512,14 +735,14 @@ import GuipSelect from '@/components/GuipSelect.vue';
 import GuipSwitch from '@/components/GuipSwitch.vue';
 import GuipTable from '@/components/GuipTable.vue';
 import GuipDialog from '@/components/GuipDialog.vue';
-//import GuipSelectFilter from '@/components/GuipSelectFilter.vue';
 import CustomDropdown from '@/components/CustomDropdown.vue';
 import SetAliPay from '@/components/SetAliPay.vue';
-
 import { mapState } from 'vuex';
 import { Object } from 'core-js';
+import ConflictDialog from './conflictDialog.vue';
 const PAY_TYPE_WEIXIN = 2;    // 微信
 const PAY_TYPE_ALIPAY = 3;    // 支付宝
+
 export default {
     // 站点设置
     name: '',
@@ -536,10 +759,14 @@ export default {
         GuipSelect,
         GuipTextarea,
         GroupFormBtns,
-        SetAliPay
+        SetAliPay,
+        PromptText,
+        ConflictDialog
     },
     data() {
         return {
+            afterText: '',
+            morningText: '',
             depart_id: false,
             doctor_id: false,
             dialogType: '1',
@@ -596,16 +823,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: '周一' },
@@ -640,6 +873,7 @@ export default {
                 company_address: '',
                 company_phone: '',
                 site_alias: '',
+                coincide: ''
             },
             oldForm: {
                 description: '',
@@ -678,26 +912,101 @@ export default {
                     { required: true, message: '请输入站点简称', trigger: 'blur' }
                 ]
             },
-            wxpayList:[],
-            alipayList:[],
+            wxpayList: [],
+            alipayList: [],
             payTypeWeixin: PAY_TYPE_WEIXIN,
             payTypeAlipay: PAY_TYPE_ALIPAY,
-            selectWxpay:null,
+            selectWxpay: null,
             selectAlipay: null,
-            onLinePay:null,
-            payinfo: [],
-            registerMoney:'',//挂号费金额
-            registerDays:5,
-            freeRegVisible:false,
-            registrationVisible:false,
-            hasVisitFee:null,
-            hasFreeRegisterRule:false,
-            hasAgainVisitFreeDays:0,
-            againVisitFreeDays:0,
-            hasRemainVisitFree:0,
-            isShowAddAliPay:false,
+            isShowAddAliPay: false,
+            checkAliPay: null,
+            onLinePay: null,
+            addPayType: -1,
+            isShowAddPay: false,
             isExistSelfSupplys: false,
-            checkAliPay:null
+            payinfo: [],
+            registerMoney: '',//挂号费金额
+            registerDays: 5,
+            freeRegVisible: false,
+            registrationVisible: false,
+            hasVisitFee: null,
+            hasFreeRegisterRule: false,
+            hasAgainVisitFreeDays: 0,
+            againVisitFreeDays: 0,
+            hasRemainVisitFree: 0,
+            colorPalette: ['#39D067', '#FD7B13', '#3D47FC', '#9B59B6', '#E74C3C', '#F39C12'],
+            singleColor: {
+                1: '#ECF5FF',
+                2: '#FFFAF0',
+                3: '#EFFFE0',
+            },
+            singleTextColor: {
+                0: '303133',
+                1: '#409EFF',
+                2: '#FB832D',
+                3: '#00C261',
+            },
+            currentDayColor: '#F6F7FA',
+            plantype: {
+                1: '上午班',
+                2: '下午班',
+                3: '全天班',
+                0: '不出诊',
+            },
+            weekDaysDesc: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
+            hosLength: 0,
+            singleHosVisiable: false,//单个医院的
+            moreHosVisiable: false,//多个医院
+            singleHosTitle: '出诊日历',//单个医院弹框标题
+            temp_plans: null,//临时调诊
+            hosList: [],//医院信息
+            hosListCopy: [],//医院信息备份
+            currentDay: new Date(),
+            calendarList1: [],
+            calendarList: {}, // 用于存储格式化后的排班数据
+            rawScheduleData: null, // 存储原始排班数据
+            is_allow_coincide: 0,//是否允许时段重合
+            conflictDates: [], // 存储有冲突的日期
+            conflictCount: 0, // 冲突天数统计
+            tempAdjustments: {}, // 存储临时调诊数据 {日期: {医院ID: {原班次, 新班次, 状态}}}
+            currentEditingHospital: null, // 当前正在编辑的医院
+            currentDate:Date.now(),
+            currentEditingDate: null, // 当前正在编辑的日期
+            currentClickDate: null, // 当前正在编辑的日期
+            isShowDialogDate: false,//单个医院日期是否显示
+            morning_value: ['双皮奶', '鸡蛋'],
+            options: [{
+                value: '选项1',
+                label: '黄金糕'
+            }, {
+                value: '选项2',
+                label: '双皮奶'
+            }, {
+                value: '选项3',
+                label: '蚵仔煎'
+            }, {
+                value: '选项4',
+                label: '龙须面'
+            }, {
+                value: '选项5',
+                label: '北京烤鸭'
+            }],
+            morningSelectedHospitals: [], // 上午班选中的医院ID数组
+            afternoonSelectedHospitals: [], // 下午班选中的医院ID数组
+            morningSelectedHospitals1: [], // 上午班选中的医院ID数组备份
+            afternoonSelectedHospitals1: [], // 下午班选中的医院ID数组备份
+            isAfternoonDropdownOpen: false,//下午班下拉是否展开
+            isMornDropdownOpen: false,//上午班下拉是否展开
+            visitDialogTitle: '出诊安排重叠，请确认',//出诊冲突框标题
+            visitDialogVisible: false,//出诊冲突提示框
+            visitShowCancelBtn: true,//出诊冲突框是否显示取消按钮
+            visitConfirmText: '确定并保存',//出诊冲突框确认按钮文字
+            hasConflictresult: [],
+            hasConflict: false, // 控制冲突提示显示
+            originalMorningSelected: [], // 保存原始上午选中状态
+            originalAfternoonSelected: [], // 保存原始下午选中状态
+            forceTime: Date.now(),
+            singleCurrentPlan:null,
         }
     },
     created() {
@@ -705,6 +1014,9 @@ export default {
         store.commit('SET_SLIDER_MENU', 'hosMenuData');
     },
     async mounted() {
+        // 重写日历周期标题
+        this.overrideWeekTitles();
+
         const { depart_id, doctor_id } = this.$route.query; // 获取 doctorId 参数
         if (doctor_id) this.doctor_id = doctor_id;
         if (doctor_id && depart_id) {
@@ -720,6 +1032,7 @@ export default {
         } else {
             await this.getAreaData()
         }
+        this.getDoctorHosPreview()
     },
     watch: {
         '$route.query': {
@@ -729,37 +1042,1370 @@ 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();
                     this.geHosAdress();
                 }
             }
-        }
-    },
-    computed: {
-        selectedCount() {
-            return this.selectedRows.length;
+        }
+    },
+    computed: {
+
+        // 生成医院颜色映射对象
+        // 根据医院列表生成颜色映射表，循环使用调色板中的颜色
+        hospitalColorMap() {
+            const colorMap = {};
+            this.hosListCopy.forEach((hospital, index) => {
+                colorMap[hospital.hid] = this.colorPalette[index % this.colorPalette.length];
+            });
+            return colorMap;
+        },
+        // 添加计算属性
+        formattedCalendarData() {
+            const data = {};
+            Object.keys(this.calendarList).forEach(dateStr => {
+                const schedule = this.calendarList[dateStr];
+                if (this.hasActualSchedule(schedule)) {
+                    data[dateStr] = schedule;
+                }
+            });
+            return data;
+        },
+        hospitalTagConfigs() {
+            const configs = {};
+            Object.keys(this.calendarList).forEach(dateStr => {
+                configs[dateStr] = {};
+                const schedule = this.calendarList[dateStr];
+                if (!schedule) return;
+
+                Object.keys(schedule).forEach(shiftType => {
+                    if (['_isTempAdjust', '_conflicts', '0'].includes(shiftType)) return;
+
+                    if (schedule[shiftType]) {
+                        schedule[shiftType].forEach(hospital => {
+                            const key = `${dateStr}_${hospital.hid}_${shiftType}`;
+                            configs[dateStr][key] = this.getColorTagClass(
+                                dateStr,
+                                hospital.hid,
+                                shiftType
+                            );
+                        });
+                    }
+                });
+            });
+            return configs;
+        },
+        morningCheckboxVisibility() {
+            if (this.is_allow_coincide) return 'all'; // 允许重合时显示所有
+
+            if (this.morningSelectedHospitals.length === 0) {
+                return 'all'; // 没有选中时显示所有
+            } else if (this.morningSelectedHospitals.length === 1) {
+                return 'selectedOnly'; // 有一个选中时只显示选中的
+            }
+            return 'all'; // 多个选中时显示所有（冲突情况）
+        },
+
+        // 控制下午班checkbox显示状态
+        afternoonCheckboxVisibility() {
+            if (this.is_allow_coincide) return 'all';
+
+            if (this.afternoonSelectedHospitals.length === 0) {
+                return 'all';
+            } else if (this.afternoonSelectedHospitals.length === 1) {
+                return 'selectedOnly';
+            }
+            return 'all';
+        },
+
+        // 检查上午班是否有冲突
+        isMorningConflict() {
+            if (this.is_allow_coincide) return false;
+            return this.morningSelectedHospitals.length > 1;
+        },
+
+        // 检查下午班是否有冲突
+        isAfternoonConflict() {
+            if (this.is_allow_coincide) return false;
+            return this.afternoonSelectedHospitals.length > 1;
+        },
+
+        selectedCount() {
+            return this.selectedRows.length;
+        },
+        ...mapState(['hosMenuData']) // 从Vuex映射showSidebar状态到组件的计算属性中
+    },
+    methods: {
+
+        // 出诊冲突提示框-取消
+        handleVisitCancel() {
+            this.handleVisitClose()
+        },
+        // 出诊冲突提示框-关闭
+        handleVisitClose() {
+            this.visitDialogVisible = false;
+
+        },
+        isMorningCheckboxVisible(hospitalId) {
+            if (this.is_allow_coincide) return true;
+
+            if (this.morningCheckboxVisibility === 'all') {
+                return true;
+            } else if (this.morningCheckboxVisibility === 'selectedOnly') {
+                return this.morningSelectedHospitals.includes(hospitalId);
+            }
+            return true;
+        },
+
+        // 控制下午班checkbox显示
+        isAfternoonCheckboxVisible(hospitalId) {
+            if (this.is_allow_coincide) return true;
+
+            if (this.afternoonCheckboxVisibility === 'all') {
+                return true;
+            } else if (this.afternoonCheckboxVisibility === 'selectedOnly') {
+                return this.afternoonSelectedHospitals.includes(hospitalId);
+            }
+            return true;
+        },
+        morningSelectedNames() {
+            return this.getSelectedNames(this.morningSelectedHospitals);
+        },
+        afternoonSelectedNames() {
+            return this.getSelectedNames(this.afternoonSelectedHospitals);
+        },
+        isFutureOrToday(dateString) {
+            const date = new Date(dateString);
+            const today = new Date();
+            today.setHours(0, 0, 0, 0);
+            return date >= today;
+        },
+        getSelectedNames(selectedList) {
+            if (selectedList.length === 0) {
+                return '不出诊';
+            }
+
+            const selectedNames = selectedList.map(hid => {
+                const hospital = this.hosList.find(item => item.hid === hid);
+                return hospital ? hospital.name : '';
+            }).filter(name => name);
+            return selectedNames.join('、') || '休息';
+        },
+        handleEvent(data) {
+            this.isShowAddAliPay = data;
+        },
+        handleUpdateEvent(data) {
+            this.bindAlipayId = data.payid;
+            this.selectAlipay = data;
+        },
+        goToAddPay(pay_type) {
+            if (pay_type == this.payTypeWeixin) {
+                this.$router.push(`/setPaymentForm?doctor_id=${this.doctor_id}&depart_id=${this.depart_id}`);
+                return
+            }
+
+            this.isShowAddAliPay = true;
+        },
+        toggleAfternoonDropdown() {
+            if (this.isAfternoonDropdownOpen) {
+                this.$refs.afternoonSelect.blur();
+            } else {
+                this.$refs.afternoonSelect.focus();
+            }
+        },
+
+        handleAfternoonVisibleChange(visible) {
+            this.isAfternoonDropdownOpen = visible;
+            this.isMornDropdownOpen = false;
+        },
+        handleMornVisibleChange(visible) {
+            this.isMornDropdownOpen = visible;
+            this.isAfternoonDropdownOpen = false;
+        },
+
+        getMorningSelectedNames() {
+            if (this.morningSelectedHospitals.length === 0) {
+                return '不出诊';
+            }
+
+            const selectedNames = this.morningSelectedHospitals.map(hid => {
+                const hospital = this.hosList.find(item => item.hid === hid);
+                return hospital ? hospital.name : '';
+            }).filter(name => name);
+
+            return selectedNames.join('、') || '休息';
+        },
+        getAfternoonSelectedNames() {
+            if (this.afternoonSelectedHospitals.length === 0) {
+                return '不出诊';
+            }
+
+            const selectedNames = this.afternoonSelectedHospitals.map(hid => {
+                const hospital = this.hosList.find(item => item.hid === hid);
+                return hospital ? hospital.name : '';
+            }).filter(name => name);
+
+            return selectedNames.join('、') || '休息';
+        },
+
+        getDateCellClass(dateString) {
+            const schedule = this.getDateSchedule(dateString);
+            if (!schedule) return '';
+            for (const key in schedule) {
+                if (key !== '0' && schedule[key] && schedule[key].length > 0) {
+                    let obj = schedule[key][0]
+                    // 判断当前班次计划是否为休息状态（0表示休息）
+                    if (obj.currentPlan == '0') {
+                        return `shift-type-0`;
+                    } else {
+                        return `shift-type-${key}`;
+                    }
+                }
+            }
+            return '';
+        },
+
+        handleWorkCheckDirect(item, checked, workHosType) {
+            if (checked) {
+                this.selectMorningHospital(item.hid, workHosType);
+            } else {
+                this.deselectMorningHospital(item.hid, workHosType);
+            }
+            this.forceTime = Date.now(); // 强制更新时间，触发视图重新渲染
+        },
+
+
+        selectMorningHospital(hospitalId, workHosType) {
+
+            // 如果不允许重合，实现互斥选择
+            if (!this.is_allow_coincide) {
+                if (workHosType === 'morningSelectedHospitals') {
+                    // 清空上午班所有选中状态
+                    this.morningSelectedHospitals = [];
+                    // 更新所有医院的上午班状态为0
+                    this.hosList.forEach(hospital => {
+                        hospital.morning_plan = '0';
+                    });
+
+                    // 选中当前医院
+                    this.morningSelectedHospitals = [hospitalId];
+                    // 更新当前医院的上午班状态为1
+                    this.hosList.forEach(hospital => {
+                        if (hospital.hid === hospitalId) {
+                            hospital.morning_plan = '1';
+                        }
+                    });
+                } else {
+                    // 清空下午班所有选中状态
+                    this.afternoonSelectedHospitals = [];
+                    // 更新所有医院的下午班状态为0
+                    this.hosList.forEach(hospital => {
+                        hospital.afternoon_plan = '0';
+                    });
+
+                    // 选中当前医院
+                    this.afternoonSelectedHospitals = [hospitalId];
+                    // 更新当前医院的下午班状态为1
+                    this.hosList.forEach(hospital => {
+                        if (hospital.hid === hospitalId) {
+                            hospital.afternoon_plan = '1';
+                        }
+                    });
+                }
+            } else {
+                // 允许重合，正常多选
+                const targetList = workHosType === 'morningSelectedHospitals'
+                    ? this.morningSelectedHospitals
+                    : this.afternoonSelectedHospitals;
+
+                if (!targetList.includes(hospitalId)) {
+                    if (workHosType === 'morningSelectedHospitals') {
+                        this.morningSelectedHospitals = [...targetList, hospitalId];
+                    } else {
+                        this.afternoonSelectedHospitals = [...targetList, hospitalId];
+                    }
+
+                    // 更新医院状态
+                    this.hosList.forEach(hospital => {
+                        if (hospital.hid === hospitalId) {
+                            if (workHosType === 'morningSelectedHospitals') {
+                                hospital.morning_plan = '1';
+                            } else {
+                                hospital.afternoon_plan = '1';
+                            }
+                        }
+                    });
+                }
+            }
+
+            this.updateSelectedText();
+            this.checkConflicts();
+        },
+
+
+
+        clearAllSelections(workHosType) {
+            if (workHosType === 'morningSelectedHospitals') {
+                this.morningSelectedHospitals = [];
+                // 更新医院状态
+                this.hosList.forEach(hospital => {
+                    hospital.morning_plan = '0';
+                });
+            } else {
+                this.afternoonSelectedHospitals = [];
+                // 更新医院状态
+                this.hosList.forEach(hospital => {
+                    hospital.afternoon_plan = '0';
+                });
+            }
+        },
+        // 修改取消选中的方法
+        deselectMorningHospital(hospitalId, workHosType) {
+            if (workHosType === 'morningSelectedHospitals') {
+                this.morningSelectedHospitals = this.morningSelectedHospitals.filter(id => id !== hospitalId);
+            } else {
+                this.afternoonSelectedHospitals = this.afternoonSelectedHospitals.filter(id => id !== hospitalId);
+            }
+
+            // 更新医院状态
+            this.hosList.forEach(hospital => {
+                if (hospital.hid === hospitalId) {
+                    if (workHosType === 'morningSelectedHospitals') {
+                        hospital.morning_plan = '0';
+                    } else {
+                        hospital.afternoon_plan = '0';
+                    }
+                }
+            });
+
+            this.updateSelectedText();
+            this.checkConflicts(); // 取消选中后检查冲突
+        },
+
+        // 添加更新文本的方法
+        updateSelectedText() {
+            this.morningText = this.morningSelectedNames()
+            this.afterText = this.afternoonSelectedNames()
+        },
+
+        handleDateClick(dateString, event) {
+            this.currentClickDate = dateString
+            event.stopPropagation();
+            const clickedDate = new Date(dateString);
+            const today = new Date();
+            today.setHours(0, 0, 0, 0);
+
+            if (clickedDate < today) {
+                this.$Message.warning('无法调整过去的日期');
+                return;
+            }
+
+            this.currentEditingDate = this.formatMonth(dateString, true) + ` ${this.weekDaysDesc[clickedDate.getDay()]}`;
+            this.isShowDialogDate = this.hasTempAdjustments(dateString);
+
+            if (this.isShowDialogDate) {
+                this.singleHosTitle = this.weekDaysDesc[clickedDate.getDay()] + '出诊规则';
+            }else{
+                this.singleHosTitle = '出诊日历'
+            }
+
+            // 获取该日期涉及的所有医院
+            const hospitals = this.getHospitalsByDate(dateString);
+
+            // 重构医院数据，确保正确设置上下午出诊状态
+            this.hosList = this.hosListCopy.map(item => {
+                let hospitalInfo = {
+                    hid: item.hid,
+                    name: item.h_depart_name,
+                    workTime: '休息',
+                    originalPlan: '0',
+                    currentPlan: '0',
+                    isCancelled: false,
+                    morning_plan: '0',
+                    afternoon_plan: '0'
+                };
+
+                // 查找该医院在当前日期的排班信息
+                const hospitalSchedule = hospitals.find(h => h.hid === item.hid);
+                if (hospitalSchedule) {
+                    hospitalInfo = { ...hospitalInfo, ...hospitalSchedule };
+
+                    // 根据 currentPlan 设置上下午状态
+                    switch (hospitalSchedule.currentPlan) {
+                        case '1': // 上午班
+                            hospitalInfo.morning_plan = '1';
+                            hospitalInfo.afternoon_plan = '0';
+                            break;
+                        case '2': // 下午班
+                            hospitalInfo.morning_plan = '0';
+                            hospitalInfo.afternoon_plan = '1';
+                            break;
+                        case '3': // 全天班
+                            hospitalInfo.morning_plan = '1';
+                            hospitalInfo.afternoon_plan = '1';
+                            break;
+                        default: // 休息或其他
+                            hospitalInfo.morning_plan = '0';
+                            hospitalInfo.afternoon_plan = '0';
+                            break;
+                    }
+                }
+                return hospitalInfo;
+            });
+
+            // 根据医院数量决定弹出哪种对话框
+            if (this.hosList.length === 1) {
+                this.currentEditingHospital = hospitals[0];
+                if(this.currentEditingHospital){
+                    this.singleCurrentPlan = this.currentEditingHospital.currentPlan;
+                }else{
+                    this.singleCurrentPlan = '0'
+                }
+                this.singleHosVisiable = true;
+            } else {
+                this.initSelectedHospitals(this.hosList);
+                this.singleCurrentPlan = null;
+                this.moreHosVisiable = true;
+            }
+            this.currentDate = Date.now()
+        },
+        initSelectedHospitals(hospitals) {
+            // 保存原始选中状态
+            this.originalMorningSelected = [...this.morningSelectedHospitals];
+            this.originalAfternoonSelected = [...this.afternoonSelectedHospitals];
+
+            this.$set(this, 'morningSelectedHospitals', []);
+            this.$set(this, 'afternoonSelectedHospitals', []);
+
+            hospitals.forEach(hospital => {
+                const { hid, morning_plan, afternoon_plan } = hospital;
+
+                if (morning_plan === '1') {
+                    this.morningSelectedHospitals = [...this.morningSelectedHospitals, hid];
+                }
+
+                if (afternoon_plan === '1') {
+                    this.afternoonSelectedHospitals = [...this.afternoonSelectedHospitals, hid];
+                }
+            });
+
+            this.updateSelectedText();
+            this.checkConflicts(); // 初始化时检查冲突
+        },
+        checkConflicts() {
+            if (this.is_allow_coincide) {
+                this.hasConflict = false;
+                return;
+            }
+
+            // 检查上午班和下午班是否有冲突
+            const morningConflict = this.morningSelectedHospitals.length > 1;
+            const afternoonConflict = this.afternoonSelectedHospitals.length > 1;
+
+            this.hasConflict = morningConflict || afternoonConflict;
+        },
+
+        // 修改确认多医院临时调诊的方法
+        async moreTempConfirm() {
+            try {
+                // 检查冲突
+                if (this.hasConflict && !this.is_allow_coincide) {
+                    this.$message.error('存在时段冲突，请调整出诊安排后再保存');
+                    return;
+                }
+
+                const plans = [];
+                // 处理所有医院，为每个医院生成对应的排班计划
+                this.hosList.forEach(hospital => {
+                    const { hid } = hospital;
+                    const isInMorning = this.morningSelectedHospitals.includes(hid);
+                    const isInAfternoon = this.afternoonSelectedHospitals.includes(hid);
+
+                    let morning_plan = "0";
+                    let afternoon_plan = "0";
+
+                    // 设置上午班状态
+                    if (isInMorning) {
+                        morning_plan = "1";
+                    }
+
+                    // 设置下午班状态
+                    if (isInAfternoon) {
+                        afternoon_plan = "1";
+                    }
+
+                    plans.push({
+                        depart_id: hid,
+                        morning_plan: morning_plan,
+                        afternoon_plan: afternoon_plan
+                    });
+                });
+
+                console.log('保存的排班数据:', plans);
+
+                await this.saveTempAdjustment(this.currentClickDate, plans);
+                this.moreHosVisiable = false;
+
+                // // 重置选中状态
+                // this.$nextTick(() => {
+                //     this.morningSelectedHospitals = [];
+                //     this.afternoonSelectedHospitals = [];
+                //     this.hasConflict = false;
+                // });
+
+            } catch (error) {
+                console.error('保存多医院调诊失败:', error);
+                this.$message.error('保存失败');
+            }
+        },
+
+
+        // 设置临时调诊数据----
+        async saveTempAdjustment(dateString, newPlan) {
+            try {
+                const response = await this.$http('POST', '/api/admin/set_visit_change', {
+                    doctor_id: this.doctor_id,
+                    date: dateString,
+                    plans: JSON.stringify(newPlan)
+                });
+
+                if (response.code === 0) {
+                    this.$message.success('临时调整保存成功');
+                    this.$nextTick(() => {
+                        this.morningSelectedHospitals = [];
+                        this.afternoonSelectedHospitals = [];
+                    });
+                    // 重新加载排班数据
+                    this.getDoctorHosPreview();
+                } else {
+                    this.$message.error(response.msg || '保存失败');
+                }
+            } catch (error) {
+                console.error('保存临时调整失败:', error);
+                this.$message.error('保存失败');
+            }
+        },
+        getHospitalsByDate(dateString) {
+            const schedule = this.getDateSchedule(dateString);
+            if (!schedule) {
+                return [];
+            }
+
+            const hospitals = [];
+
+            // 遍历所有班次类型收集医院
+            Object.keys(schedule).forEach(shiftType => {
+                if (['_isTempAdjust', '_conflicts', '0'].includes(shiftType)) return;
+
+                const list = schedule[shiftType];
+
+                if (Array.isArray(list) && list.length > 0) {
+                    list.forEach(hospital => {
+                        // 检查是否已存在
+                        const exists = hospitals.some(h => h.hid === hospital.hid);
+                        if (!exists) {
+                            hospitals.push({
+                                hid: hospital.hid,
+                                name: hospital.hospital_name,
+                                originalPlan: hospital.originalPlan,
+                                currentPlan: hospital.currentPlan,
+                                isCancelled: hospital.isCancelled,
+                                workTime: hospital.workTime
+                            });
+                        }
+                    });
+                }
+            });
+
+            return hospitals;
+        },
+        // tooltip的出诊文案
+        getWorkTimeDisplayText(hospital, dateStr, hospitalId) {
+            const hospitalData = this.rawScheduleData[hospitalId];
+            if (!hospitalData) return hospital.workTime;
+
+            const { morning_worktime, afternoon_worktime, temp_change_worktime } = hospitalData;
+            let allDay_worktime = '';
+
+            if ((hospital.currentPlan == 3 || hospital.originalPlan == 3) && (morning_worktime && afternoon_worktime)) {
+                allDay_worktime = morning_worktime.slice(0, 5) + '-' + afternoon_worktime.slice(-5);
+            }
+
+            // 检查是否有冲突
+            // 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': '上午班',
+                '2': '下午班',
+                '3': '全天班',
+                '0': '休息'
+            };
+
+            const workTimeTextMap = {
+                '1': morning_worktime,
+                '2': afternoon_worktime,
+                '3': allDay_worktime,
+                '0': '休息'
+            };
+
+            let planText = planTextMap[hospital.currentPlan] || '休息';
+            let workTimeText = workTimeTextMap[hospital.currentPlan];
+
+            if (hospital.currentPlan != hospital.originalPlan && hospital.currentPlan == 0) {
+                workTimeText = workTimeTextMap[hospital.originalPlan] || '休息';
+            }
+
+            // 添加冲突标识
+            // const conflictMark = isInConflict ? ' ⚠️' : '';
+
+            if (hospital.isCancelled) {
+                return `${workTimeText} (固定${planTextMap[hospital.originalPlan] || ''})`;
+            }
+
+            const hasTempAdjustment = temp_change_worktime && temp_change_worktime[dateStr];
+            if (hasTempAdjustment) {
+                return `${workTimeText} (临时${planText})`;
+            }
+
+            return `${workTimeText} (固定${planText})`;
+        },
+        getColorTagClass(dateStr, hospitalId, shiftType) {
+
+            const schedule = this.getDateSchedule(dateStr);
+            if (!schedule || !schedule[shiftType]) return { class: 'color-tag', style: {} };
+
+            const hospital = schedule[shiftType].find(h => h.hid === hospitalId);
+            if (!hospital) return { class: 'color-tag', style: {} };
+
+            const hospitalColor = this.getHospitalColor(hospitalId);
+
+            // 如果是取消的班次
+            if (hospital.isCancelled) {
+                return {
+                    class: 'opacity-tag',
+                    style: { backgroundColor: hospitalColor }
+                };
+            }
+
+            // 其他状态的班次（保持原有逻辑）
+            const status = this.getTempAdjustmentStatus(dateStr, hospitalId, hospital.originalPlan);
+
+            switch (status) {
+                case 'cancelled':
+                    return { class: 'opacity-tag', style: { backgroundColor: hospitalColor } };
+                case 'added':
+                case 'changed':
+                    return {
+                        class: 'color-tag-coi',
+                        style: { borderColor: hospitalColor, backgroundColor: 'transparent' }
+                    };
+                case 'same':
+                case 'no_adjustment':
+                default:
+                    return { class: 'color-tag', style: { backgroundColor: hospitalColor } };
+            }
+        },
+        getColorTagConfig(dateStr, hospitalId, shiftType) {
+            const schedule = this.getDateSchedule(dateStr);
+            if (!schedule || !schedule[shiftType]) return { class: 'color-tag', style: {} };
+
+            const hospital = schedule[shiftType].find(h => h.hid === hospitalId);
+            if (!hospital) return { class: 'color-tag', style: {} };
+
+            const hospitalColor = this.getHospitalColor(hospitalId);
+
+            // 如果是取消的班次
+            if (hospital.isCancelled) {
+                return {
+                    class: 'opacity-tag',
+                    style: { backgroundColor: hospitalColor }
+                };
+            }
+
+            // 其他状态的班次（保持原有逻辑）
+            const status = this.getTempAdjustmentStatus(dateStr, hospitalId, hospital.originalPlan);
+            switch (status) {
+                case 'cancelled':
+                    return { class: 'opacity-tag', style: { backgroundColor: hospitalColor } };
+                case 'added':
+                case 'changed':
+                    return {
+                        class: 'color-tag-coi',
+                        style: { borderColor: hospitalColor, backgroundColor: 'transparent' }
+                    };
+                case 'same':
+                case 'no_adjustment':
+                default:
+                    return { class: 'color-tag', style: { backgroundColor: hospitalColor } };
+            }
+        },
+        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));
+            const isCancelled = status === 'cancelled';
+
+            if (isCancelled) {
+                return 'temp-adjusted cancelled-item';
+            }
+
+            if (status && status !== 'same') {
+                return 'temp-adjusted';
+            }
+
+            return '';
+        },
+
+        // 获取调整状态
+        getAdjustmentStatus(dateStr, hospitalId) {
+            return this.getTempAdjustmentStatus(dateStr, hospitalId, this.getOriginalPlan(dateStr, hospitalId));
+        },
+
+        // 检查是否有临时调整
+        hasTempAdjustments(dateStr) {
+            return this.shouldShowAdjust(dateStr);
+        },
+
+        // 检查是否有多个临时调整（控制只显示一个adjust元素）
+        hasMultipleTempAdjustments() {
+            return false; // 总是返回false，因为已经控制只显示一个
+        },
+        // 获取临时调诊状态
+        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.toString();
+            const originalPlanStr = originalPlan.toString();
+            if (newPlan === "0" && originalPlanStr !== "0") {
+                return 'cancelled';
+            } else if (originalPlanStr === "0" && newPlan !== "0") {
+                return 'added';
+            } else if (originalPlanStr !== 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]) {
+                const plan = hospital.worktime_list[dayOfWeek].plan.toString();
+                return plan;
+            }
+
+            // 非固定排班中的具体日期
+            if (hospital.worktime_no_fixed === 1 && hospital.worktime_list && hospital.worktime_list[dateStr]) {
+                const plan = hospital.worktime_list[dateStr].plan.toString();
+                return plan;
+            }
+
+            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.calendarList[dateStr];
+
+                    if (schedule) {
+                        const hasConflict = this.hasScheduleConflict(schedule);
+                        if (hasConflict) {
+                            conflicts.push(dateStr);
+                            conflictCount++;
+                        }
+                    } else {
+                        console.log(`无排班数据: ${dateStr}`);
+                    }
+                }
+                currentDate.setDate(currentDate.getDate() + 1);
+            }
+
+            this.conflictDates = conflicts;
+            this.conflictCount = conflictCount;
+
+            // console.log('=== 月度冲突统计结果 ===', {
+            //     冲突天数: conflictCount,
+            //     冲突日期: conflicts,
+            //     日历数据: this.calendarList
+            // });
+        },
+        // 检查排班是否存在冲突（不允许时段重合时）
+        hasScheduleConflict(schedule) {
+            if (this.is_allow_coincide) return false; // 如果允许重合，直接返回无冲突
+
+            const timeSlots = {
+                morning: new Set(), // 上午时段
+                afternoon: new Set() // 下午时段
+            };
+
+            // 遍历所有班次
+            for (const shiftType in schedule) {
+                if (['_isTempAdjust', '_conflicts', '_dateStr', '0'].includes(shiftType)) continue;
+
+                const hospitals = schedule[shiftType];
+                if (!hospitals || hospitals.length === 0) continue;
+
+                hospitals.forEach(hospital => {
+                    if (hospital.isCancelled) return; // 跳过已取消的
+
+                    const hospitalKey = `${hospital.hid}_${hospital.hospital_name}`;
+
+                    switch (shiftType) {
+                        case '1': // 上午班
+                            timeSlots.morning.add(hospitalKey);
+                            break;
+                        case '2': // 下午班
+                            timeSlots.afternoon.add(hospitalKey);
+                            break;
+                        case '3': // 全天班
+                            timeSlots.morning.add(hospitalKey);
+                            timeSlots.afternoon.add(hospitalKey);
+                            break;
+                    }
+                });
+            }
+
+            const hasMorningConflict = timeSlots.morning.size > 1;
+            const hasAfternoonConflict = timeSlots.afternoon.size > 1;
+            const hasConflict = hasMorningConflict || hasAfternoonConflict;
+
+            // if (hasConflict) {
+            //     console.log(`冲突检测结果 ${schedule._dateStr}:`, {
+            //         上午时段医院: Array.from(timeSlots.morning),
+            //         下午时段医院: Array.from(timeSlots.afternoon),
+            //         上午冲突: hasMorningConflict,
+            //         下午冲突: hasAfternoonConflict
+            //     });
+            // }
+
+            return hasConflict;
+        },
+        // 判断是否为冲突日期
+        isConflictDate(dateString) {
+            return this.conflictDates.includes(dateString);
+        },
+        // 添加月份变化监听方法
+        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;
+                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.rawScheduleData = JSON.parse(JSON.stringify(list));
+
+                    // 初始化当前月份的排班数据
+                    this.generateMonthSchedule(this.currentDay);
+                    this.countMonthlyConflicts();
+
+                    this.hosLength = Object.keys(list).length;
+
+                }
+            }).catch(error => {
+                console.error(error, 'error')
+            })
+        },
+        // 根据月份生成排班数据
+        generateMonthSchedule(date) {
+            if (!this.rawScheduleData) return;
+
+            const calendar = new Date(date);
+            const currentMonth = calendar.getMonth();
+            const currentYear = calendar.getFullYear();
+
+            // 获取日历可见范围（通常包含上个月末、当前月、下个月初）
+            const visibleStart = new Date(currentYear, currentMonth, 1);
+            visibleStart.setDate(1); // 当月第一天
+
+            // 计算当月最后一天
+            // const monthEnd = new Date(currentYear, currentMonth + 1, 0);
+
+            // 计算下个月的前几天（通常日历显示6周，约42天）
+            const visibleEnd = new Date(currentYear, currentMonth, 1);
+            visibleEnd.setDate(42); // 显示6周的数据
+
+            const today = new Date();
+            today.setHours(0, 0, 0, 0);
+
+            // 只生成今天及之后的排班
+            const startDate = today > visibleStart ? today : visibleStart;
+
+            this.generateScheduleForDateRange(startDate, visibleEnd);
+            this.countMonthlyConflicts();
+        },
+        // 为日期范围生成排班
+        generateScheduleForDateRange(startDate, endDate) {
+            const tempCalendarData = {};
+            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;
+
+                    // 立即检查冲突
+                    const hasConflict = this.hasScheduleConflict(daySchedule);
+                    if (hasConflict) {
+                        console.log(`日期 ${dateStr} 存在冲突`);
+                    }
+                }
+
+                currentDate.setDate(currentDate.getDate() + 1);
+            }
+
+            this.calendarList = tempCalendarData;
+            console.log(this.calendarList,'===this.calendarList:');
+        },
+        addHospitalToSchedule(daySchedule, hospitalId, hospital, plan, workDesc) {
+            const shiftType = plan.toString();
+            const dateStr = daySchedule._dateStr;
+            const originalPlan = this.getOriginalPlan(dateStr, hospitalId);
+
+            // 处理临时取消的班次
+            if (shiftType === "0" && originalPlan !== "0") {
+                if (!daySchedule[originalPlan]) {
+                    daySchedule[originalPlan] = [];
+                }
+
+                const hospitalInfo = {
+                    hid: hospitalId,
+                    hospital_name: hospital.h_depart_name,
+                    workTime: '已取消',
+                    originalPlan: originalPlan,
+                    currentPlan: shiftType,
+                    isCancelled: true
+                };
+
+                const existingIndex = daySchedule[originalPlan].findIndex(item => item.hid === hospitalId);
+                if (existingIndex >= 0) {
+                    daySchedule[originalPlan][existingIndex] = hospitalInfo;
+                } else {
+                    daySchedule[originalPlan].push(hospitalInfo);
+                }
+                return;
+            }
+
+            // 正常班次
+            if (shiftType !== "0") {
+                // 对于全天班，不需要特殊处理，就按全天班显示
+                if (!daySchedule[shiftType]) {
+                    daySchedule[shiftType] = [];
+                }
+
+                const hospitalInfo = {
+                    hid: hospitalId,
+                    hospital_name: hospital.h_depart_name,
+                    workTime: workDesc,
+                    originalPlan: originalPlan,
+                    currentPlan: shiftType,
+                    isCancelled: false
+                };
+
+                const existingIndex = daySchedule[shiftType].findIndex(item => item.hid === hospitalId);
+                if (existingIndex >= 0) {
+                    daySchedule[shiftType][existingIndex] = hospitalInfo;
+                } else {
+                    daySchedule[shiftType].push(hospitalInfo);
+                }
+            }
+        },
+
+        // 获取排班优先级（数值越高优先级越高）
+        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: [],
+                _dateStr: dateStr // 添加日期标识
+            };
+
+            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();
+                    }
+                }
+
+                //即使 finalPlan 为 "0"，也要处理临时调整的情况
+                if (isTempAdjust || finalPlan !== "0") {
+                    const workDesc = temp_change_worktime && temp_change_worktime[dateStr] ?
+                        temp_change_worktime[dateStr].work_paln_desc :
+                        this.getWorkTimeDesc(finalPlan);
+
+                    this.addHospitalToSchedule(daySchedule, hospitalId, hospital, finalPlan, workDesc);
+
+                    if (isTempAdjust) {
+                        daySchedule._isTempAdjust = true;
+                    }
+                }
+            });
+
+            // 检查冲突
+            this.checkScheduleConflicts(daySchedule, dateStr);
+            console.log(daySchedule,'daySchedule===');
+
+            return Object.keys(daySchedule).length > 1 ? daySchedule : null;
+        },
+        // 检查排班冲突
+        checkScheduleConflicts(daySchedule) {
+            if (!this.is_allow_coincide) return;
+
+            daySchedule._conflicts = [];
+
+            const timeSlotConflicts = {
+                'morning': new Set(),
+                'afternoon': new Set()
+            };
+
+            // 收集每个时间段的医院
+            for (const shiftType in daySchedule) {
+                if (shiftType === '_isTempAdjust' || shiftType === '_conflicts' || shiftType === '_dateStr' || shiftType === '0') continue;
+
+                const hospitals = daySchedule[shiftType];
+                if (hospitals && hospitals.length > 0) {
+                    const activeHospitals = hospitals.filter(hospital =>
+                        !hospital.isCancelled && hospital.currentPlan !== "0"
+                    );
+
+                    activeHospitals.forEach(hospital => {
+                        switch (shiftType) {
+                            case '1': // 上午班
+                                timeSlotConflicts.morning.add(`${hospital.hid}_${hospital.hospital_name}`);
+                                break;
+                            case '2': // 下午班
+                                timeSlotConflicts.afternoon.add(`${hospital.hid}_${hospital.hospital_name}`);
+                                break;
+                            case '3': // 全天班
+                                timeSlotConflicts.morning.add(`${hospital.hid}_${hospital.hospital_name}`);
+                                timeSlotConflicts.afternoon.add(`${hospital.hid}_${hospital.hospital_name}`);
+                                break;
+                        }
+                    });
+                }
+            }
+
+            // 记录冲突详情
+            if (timeSlotConflicts.morning.size > 1) {
+                daySchedule._conflicts.push({
+                    timeSlot: 'morning',
+                    hospitals: Array.from(timeSlotConflicts.morning),
+                    message: `上午班冲突: ${Array.from(timeSlotConflicts.morning).map(h => h.split('_')[1]).join('、')}`
+                });
+            }
+
+            if (timeSlotConflicts.afternoon.size > 1) {
+                daySchedule._conflicts.push({
+                    timeSlot: 'afternoon',
+                    hospitals: Array.from(timeSlotConflicts.afternoon),
+                    message: `下午班冲突: ${Array.from(timeSlotConflicts.afternoon).map(h => h.split('_')[1]).join('、')}`
+                });
+            }
+        },
+
+
+        // 获取医院在特定工作日的排班
+        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;
+        },
+        // 还原出诊设置
+        restoreCancel() {
+            this.houseCallSettingForm.worktimes = JSON.parse(JSON.stringify(this.form.worktimes));
+        },
+        // 确认单医院临时调诊
+        singleTempConfirm() {
+            this.singleHosVisiable = false
+            let plan = this.currentEditingHospital.currentPlan;
+            let depart_id = this.currentEditingHospital.hid;
+            let plans = {
+                depart_id,
+                "morning_plan": plan,
+                "afternoon_plan": plan,
+            }
+            if (plan == '0') {
+                plans["morning_plan"] = '0';
+                plans["afternoon_plan"] = '0';
+            } else if (plan == '1') {
+                plans["morning_plan"] = '1';
+                plans["afternoon_plan"] = '0';
+            } else if (plan == '2') {
+                plans["morning_plan"] = '0';
+                plans["afternoon_plan"] = '1';
+            } else if (plan == '3') {
+                plans["morning_plan"] = '1';
+                plans["afternoon_plan"] = '1';
+            }
+            let plansList = []
+            plansList.push(plans)
+            this.saveTempAdjustment(this.currentEditingDate, plansList)
         },
-        ...mapState(['hosMenuData']) // 从Vuex映射showSidebar状态到组件的计算属性中
-    },
-    methods: {
-        handleEvent(data) {
-            this.isShowAddAliPay = data;
+        // 取消单医院临时调诊
+        singleTempCancel() {
+            this.singleHosVisiable = false;
         },
-        handleUpdateEvent(data){
-            this.bindAlipayId = data.payid;
-            this.selectAlipay = data;
+        // 取消多医院临时调诊
+        moreTempCancel() {
+            this.moreHosVisiable = false;
+            this.$nextTick(() => {
+                this.morningSelectedHospitals = [];
+                this.afternoonSelectedHospitals = [];
+            });
         },
-        goToAddPay(pay_type){
-            if(pay_type == this.payTypeWeixin) {
-                this.$router.push(`/setPaymentForm?doctor_id=${this.doctor_id}&depart_id=${this.depart_id}`);
-                return
+        // 判断是否是当月
+        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() {
+            this.currentDay = new Date();
+            this.generateMonthSchedule(this.currentDay);
+            this.countMonthlyConflicts(); // 添加统计
+        },
+        async setDepartWorkTime() {
+            this.$refs.conflictDialog.setDepartWorkTime()
+        },
+        formatMonth(date, dayFlag) {
+            const d = new Date(date);
+            const year = d.getFullYear();
+            const month = d.getMonth() + 1;
+            let dateDesc = `${year}年${month}月`;
+            if (dayFlag) {
+                dateDesc += `${d.getDate()}日`
             }
+            return dateDesc
+        },
+        overrideWeekTitles() {
+            this.$nextTick(() => {
+                const weekHeaders = document.querySelectorAll('.el-calendar-table thead th');
+                if (weekHeaders.length === 7) {
+                    weekHeaders.forEach((th, index) => {
+                        th.textContent = this.weekDaysDesc[index];
+                    });
+                }
+            });
+        },
+        // 判断是否为今天
+        isToday(dateString) {
+            const today = new Date();
+            const date = new Date(dateString);
+            return today.toDateString() === date.toDateString();
+        },
 
-            this.isShowAddAliPay = true;
+        // 检查排班数据是否有实际内容
+        hasActualSchedule(schedule) {
+            if (!schedule) return false;
+
+            const validKeys = Object.keys(schedule).filter(key =>
+                !['_isTempAdjust', '_conflicts', '_dateStr'].includes(key)
+            );
+
+            return validKeys.some(key => {
+                return schedule[key] && schedule[key].length > 0;
+            });
         },
+
+        // 获取指定日期的排班信息（修改后的版本）
+        getDateSchedule(dateString) {
+            if(dateString == '2025-11-18'){
+                console.log('dateString==:',this.formattedCalendarData[dateString]);
+            }
+            return this.formattedCalendarData[dateString] || null;
+        },
+        // 修改判断方法
+        hasScheduleData(dateString) {
+            return !!this.getDateSchedule(dateString);
+        },
+
+        // 需要修改 具体工作时间
+        getWorkTimeDesc(plan) {
+            const planMap = {
+                '0': '不可预约',
+                '1': '(上午班)',
+                '2': '(下午班)',
+                '3': '(全天班)'
+            };
+            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);
+            return date.getDate();
+        },
+
+        // 获取医院对应的颜色
+        getHospitalColor(hid) {
+            return this.hospitalColorMap[hid] || '#CCCCCC';
+        },
+
         showDialog(type) {
             if (type == 'register') {
                 this.registrationVisible = true;
@@ -775,22 +2421,21 @@ 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.wxpayList = response.data[this.payTypeWeixin]
                     this.selectWxpay = this.wxpayList.filter(item => item.is_bind)[0];
-                    console.log(this.selectWxpay,'this.selectWxpay');
-                }else{
+                } else {
                     this.selectWxpay = null;
                 }
                 if (
                     response.data &&
                     response.data[this.payTypeAlipay]
-                    &&response.data[this.payTypeAlipay].length > 0
+                    && response.data[this.payTypeAlipay].length > 0
                 ) {
                     this.alipayList = response.data[this.payTypeAlipay]
                     this.selectAlipay = this.alipayList.filter(item => item.is_bind)[0];
-                }else{
+                } else {
                     this.selectAlipay = null;
                 }
             }).catch(error => {
@@ -802,18 +2447,17 @@ export default {
             await this.$http('POST', '/api/admin/set_pay_switch', {
                 doctor_id: this.doctor_id,
                 depart_id: this.depart_id,
-                pay_switch:this.onLinePay
+                pay_switch: this.onLinePay
             }).then(response => {
-                console.log(response,'===');
-                    const { code } = response
-                    const msg = this.onLinePay === 1 ? '已开启' : '已关闭'
-                    const type = code === 0 ? 'success' : 'error';
-                    this.$positionMessage({
-                        type: type,
-                        message: msg+'线上收款',
-                        target: this.$refs['hasOnlinePayRef'],
-                        position: 'top'
-                    })
+                const { code } = response
+                const msg = this.onLinePay === 1 ? '已开启' : '已关闭'
+                const type = code === 0 ? 'success' : 'error';
+                this.$positionMessage({
+                    type: type,
+                    message: msg + '线上收款',
+                    target: this.$refs['hasOnlinePayRef'],
+                    position: 'top'
+                })
             }).catch(error => {
                 this.onLinePay = 0;
                 console.error(error, 'error')
@@ -831,7 +2475,7 @@ export default {
                 const type = code === 0 ? 'success' : 'error';
                 this.$positionMessage({
                     type: type,
-                    message: msg+'收挂号费',
+                    message: msg + '收挂号费',
                     target: this.$refs['hasVisitFeeRef'],
                     position: 'top'
                 })
@@ -840,7 +2484,6 @@ export default {
             })
         },
         changeSelectWeixin(item) {
-            console.log(item, 'item')
             // if(this.bindWxpayId === item.payid){
             //     this.bindWxpayId = 0
             //     this.selectWxpay = null
@@ -860,18 +2503,16 @@ export default {
             this.selectAlipay = item;
             this.bindPayMethod(item.id)
         },
-
-        async bindPayMethod(id){
+        async bindPayMethod(id) {
             await this.$http('POST', '/api/admin/bind_pay_method', {
                 pay_id: id,
                 doctor_id: this.doctor_id,
                 depart_id: this.depart_id
             }).then(response => {
                 const { code } = response;
-                if(code == 0){
+                if (code == 0) {
                     this.$Message.success(response.msg || '绑定成功');
-
-                }else{
+                } else {
                     this.$Message.error(response.msg || '绑定失败');
                 }
                 this.getBindpayList()
@@ -880,20 +2521,22 @@ export default {
                 console.error(error, 'error')
             })
         },
-
-        handleregisterCancel(){
-            console.log('取消');
+        goBindPay(type) {
+            this.addPayType = type;
+            this.isShowAddPay = true;
+        },
+        handleregisterCancel() {
             this.freeRegVisible = false;
             this.registrationVisible = false;
         },
-        handleRegisterConfirm(type){
+        handleRegisterConfirm(type) {
             var params = {}
             params.doctor_id = this.doctor_id
             params.depart_id = this.depart_id
-            if(type == 'freeRegVisible'){
+            if (type == 'freeRegVisible') {
                 params.has_again_visit_free_days = parseInt(this.hasAgainVisitFreeDays) ? 1 : 0
                 params.again_visit_free_days = parseInt(this.againVisitFreeDays)
-                if(params.again_visit_free_days < 0){
+                if (params.again_visit_free_days < 0) {
                     this.$positionMessage({
                         type: 'error',
                         message: '请输入正确的天数',
@@ -904,23 +2547,23 @@ export default {
                 params.has_remain_visit_free = parseInt(this.hasRemainVisitFree) ? 1 : 0
 
                 this.$http('POST', '/api/admin/set_visit_free_rules', {
-                   ...params
+                    ...params
                 }).then(response => {
                     this.$nextTick(() => {
-                        if(response.code == 0) {
+                        if (response.code == 0) {
                             this.$Message.success('设置成功');
                             this.fetchDoctorData()
-                        }else{
+                        } else {
                             this.$Message.error(response.msg);
                         }
-                       this.freeRegVisible = false;
+                        this.freeRegVisible = false;
                     })
                 }).catch(error => {
                     console.error(error, 'error')
                 })
-            }else{
+            } else {
                 params.price = parseInt(this.registerMoney)
-                if(!params.price || params.price <= 0) {
+                if (!params.price || params.price <= 0) {
                     this.$positionMessage({
                         type: 'error',
                         message: '请输入正确的金额',
@@ -930,22 +2573,21 @@ export default {
                     return;
                 }
                 this.$http('POST', '/api/admin/set_visit_price', {
-                   ...params
+                    ...params
                 }).then(response => {
                     this.$nextTick(() => {
-                       if(response.code !== 0) {
+                        if (response.code !== 0) {
                             this.$Message.error(response.msg);
-                        }else{
+                        } else {
                             this.$Message.success('设置成功');
-                       }
-                       this.registrationVisible = false;
+                        }
+                        this.registrationVisible = false;
                     })
                 }).catch(error => {
                     console.error(error, 'error')
                 })
             }
         },
-
         handleSearch() {
             if (this.hospitalSearchFlag) return
             this.hospitalSearchFlag = true
@@ -962,7 +2604,6 @@ export default {
             this.form.search_city = item.city
             this.form.address = item.address
             this.form.h_pos = item.location.lat + ',' + item.location.lng
-            console.log(item)
         },
         getInternetHospital(queryString) {
             if (!this.hospitalSearchFlag) return;
@@ -997,7 +2638,6 @@ export default {
             })
         },
         queryHospital(queryString, cb) {
-            console.log(queryString)
             cb(this.hospitalRestaurants);
         },
         random() {
@@ -1028,7 +2668,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;
@@ -1039,6 +2679,19 @@ 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 = JSON.parse(JSON.stringify(this.form.worktimes));
+                // ---------还没有数据
+                const {display_work_days,worktime_no_fixed} = response.data;
+                if(display_work_days > 0){
+                    this.houseCallSettingForm.planDays = display_work_days;
+                }else{
+                    this.houseCallSettingForm.display_work_days = display_work_days
+                }
+                this.houseCallSettingForm.worktime_no_fixed = worktime_no_fixed
+
+                // ---------还没有数据
+
+
                 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
@@ -1048,7 +2701,7 @@ export default {
                 this.hasAgainVisitFreeDays = response.data.has_again_visit_free_days
                 this.againVisitFreeDays = response.data.again_visit_free_days
                 this.hasRemainVisitFree = response.data.has_remain_visit_free
-                if((this.hasAgainVisitFreeDays && this.againVisitFreeDays) || this.hasRemainVisitFree) this.hasFreeRegisterRule = true
+                if ((this.hasAgainVisitFreeDays && this.againVisitFreeDays) || this.hasRemainVisitFree) this.hasFreeRegisterRule = true
 
                 this.getAreaData(this.form.province)
             }).catch(error => {
@@ -1095,8 +2748,6 @@ export default {
                             }
                             this.tableKey = Date.now(); // 强制重新渲染表格
                         }
-                        // this.$set('projectList',Object.values(response.data.list))
-                        // this.$set('projectTagData',response.data.classify)
                     })
                 }
             }).catch(error => {
@@ -1257,7 +2908,6 @@ export default {
             this.editorProjectInfo({ need_countdown: row.need_countdown, project_id: row.id })
         },
         handleClick1(row) {
-            console.log(row);
             this.$router.push(`/addNewTreatment?package_id=${row.id}&doctor_id=${this.doctor_id}&depart_id=${this.depart_id}`)
             // 跳转编辑页面
         },
@@ -1267,7 +2917,6 @@ export default {
         },
         // 处理全选按钮变化
         handleSelectAllChange(val) {
-            console.log(this.$refs.multipleTable, 'multipleTable-');
             if (val) {
                 // 只选中未选中的行
                 const unselectedRows = this.projectList.filter(
@@ -1295,7 +2944,6 @@ export default {
             this.isIndeterminate = !noneSelected && !allSelected;
         },
         handleSelectAllChange1(val) {
-            console.log(this.$refs.multipleTable, 'multipleTable-');
             if (val) {
                 // 只选中未选中的行
                 const unselectedRows = this.courseList.filter(
@@ -1314,7 +2962,6 @@ export default {
 
         // 处理选择变化
         handleSelectionChange1(rows) {
-            console.log(rows, '1=====');
             this.selectedRows1 = rows;
             // 更新全选按钮状态
             const allSelected = rows.length === this.courseList.length;
@@ -1337,8 +2984,6 @@ export default {
             if (name == 'project') {
                 // 修改项目列表
                 url = '/api/admin/project_mutil_option';
-                // selectedRows
-                console.log(this.selectedRows, '----09999888');
                 this.selectedRows.forEach(item => {
                     if (item.status != type) {
                         str.push(item.id)
@@ -1351,7 +2996,6 @@ export default {
                 props.project_ids = str.join(',')
             } else {
                 // 修改疗程套餐
-                // selectedRows1
                 this.selectedRows1.forEach(item => {
                     if (item.status != type) {
                         str.push(item.id)
@@ -1363,7 +3007,6 @@ export default {
                 }
                 props.package_ids = str.join(',')
             }
-            // console.log(url,props);
             this.changePackData(url, props, name)
         },
         //
@@ -1387,13 +3030,9 @@ export default {
                 console.error(error, 'error')
             })
         },
-        ChangeTime(type) {
-            console.log(this.form.morning_worktime, type, '===');
-        },
         onSwitchChange(data) {
             this.form.is_fixed = data ? 1 : 0
             this.departIsFixed = data
-            console.log(data, '---');
         },
         updateHosInfo(props, url) {
             if (this.doctor_id) props.doctor_id = this.doctor_id;
@@ -1427,24 +3066,17 @@ 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
-                            }));
-
                             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),
                             }
 
-                            rqurl = "/api/admin/set_depart_worktime";
+                            rqurl = "/api/admin/set_morning_afternoon_worktime";
                             break;
                         case 'siteForm':
                             if (this.doctor_id && !this.depart_id) {
@@ -1486,6 +3118,10 @@ export default {
                             }
                             rqurl = "/api/admin/set_visit_num";
                             break;
+                        // case 'houseCallSettingForm':
+                        //     this.setDepartWorkTime()
+                        //     return
+
                     }
                     this.updateHosInfo(props, rqurl)
                 } else {
@@ -1498,26 +3134,41 @@ export default {
         },
         confirmClick(type) {
             console.log(type, '确认');
+        },
+        isHoliday(date) {
+            console.log(date, '====---00');
         }
 
     }
 }
 </script>
+
 <style lang="scss" scoped>
-.freeWrap{
+
+.cancelled-item {
+    text-decoration: line-through;
+    color: #BABDC2 !important;
+    opacity: .7;
+}
+
+.freeWrap {
     letter-spacing: 0.08em;
     color: #626573;
 }
-.freeDesc{
+
+.freeDesc {
     color: #8A9099;
 }
+
 .el-form-item {
     margin-bottom: 0;
 }
-.requireImg{
+
+.requireImg {
     width: 8px;
     height: 8px;
 }
+
 .notSet,
 .yesSet {
     margin-right: 12px;
@@ -1527,32 +3178,440 @@ export default {
 .yesSet {
     color: #00C261;
 }
-.desc{
+
+.desc {
     font-size: 12px;
     font-weight: normal;
     line-height: 13px;
     letter-spacing: 0.08em;
     color: #6B7280;
 }
-.bidwrap-item{
+
+.calendar-container {
+    width: 100%;
+    border-top: 1px solid rgba(0, 0, 0, 0.15);
+}
+
+.calendar-date {
+    text-align: left;
+    height: 100%;
+    padding: 8px;
+    box-sizing: border-box;
+}
+
+.conflict-date {
+    background: #FFF1F0;
+    border: 1px solid #E4E7ED;
+    /* #E4E7ED */
+}
+
+.not-current-month {
+    opacity: 0.6 !important;
+}
+
+#siteMessage8 {
+    .display_work_days {
+        display: flex;
+        align-items: center;
+    }
+}
+
+// 下拉框定位--
+.select-container {
+    position: relative;
+    flex: 1;
+}
+
+.conflictTip {
+    height: 22px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 2px 10px;
+    gap: 6px;
+    border-radius: 4px;
+    background: #FFF1F0;
+    box-sizing: border-box;
+    border: 1px solid #FFA39E;
+    font-size: 14px;
+    font-weight: normal;
+    line-height: normal;
+    text-align: center;
+    letter-spacing: 0.08em;
+    color: #FF4D4F;
+    box-sizing: border-box;
+    margin-right: 6px;
+}
+
+.selected-hospitals-display {
+    border: 1px solid #DCDFE6;
+    border-radius: 4px;
+    padding: 0 15px;
+    height: 40px;
+    line-height: 40px;
+    background: white;
+    cursor: pointer;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    transition: border-color 0.2s;
+}
+
+.selected-hospitals-display:hover {
+    border-color: #C0C4CC;
+}
+
+.selected-hospitals-display:focus {
+    border-color: #409EFF;
+}
+
+.hidden-select {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    opacity: 0;
+    z-index: 1;
+}
+
+// 下拉框定位--
+
+.tooltip-content {
+    .hospital-item {
+        font-size: 12px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 4px 0;
+        color: #fff;
+        gap: 4px;
+        letter-spacing: 0.08em;
+    }
+
+    .hospital-info {
+        display: flex;
+        align-items: center;
+        gap: 4px;
+    }
+
+    .tooltip-tag {
+        width: 14px;
+        height: 14px;
+        border-radius: 3px;
+    }
+
+    .hospital-name {
+        font-size: 12px;
+        color: #fff;
+        font-weight: 500;
+    }
+
+    .work-time {
+        font-size: 12px;
+        color: #fff;
+        white-space: nowrap;
+    }
+}
+
+.custom-calendar-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 15px 0;
+    margin-bottom: 10px;
+
+    .header-left {
+        display: flex;
+        align-items: center;
+        gap: 10px;
+        color: #303133;
+        font-size: 14px;
+        font-weight: bold;
+
+        .header-tip {
+            font-size: 12px;
+            font-weight: normal;
+            line-height: 13px;
+            letter-spacing: 0.08em;
+            color: #FF4D4F;
+        }
+    }
+
+    .header-right {
+        display: flex;
+        gap: 10px;
+
+        .el-button {
+            color: #606266;
+            width: auto;
+            /* height: 24px; */
+            line-height: 20px;
+            height: auto;
+            padding: 2px 12px;
+            box-sizing: border-box;
+            font-weight: 500;
+            background: transparent !important;
+            border: 1px solid #DCDFE6 !important;
+            font-size: 12px;
+
+            &:hover {
+                color: #409eff !important;
+                border-color: #c6e2ff !important;
+                background-color: #ecf5ff !important;
+            }
+        }
+    }
+}
+
+.hosColorType {
+    gap: 24px;
+    padding-bottom: 18px;
+    flex-wrap: wrap;
+    // box-shadow: inset 0px -1px 0px 0px rgba(0, 0, 0, 0.15);
+}
+
+/* 隐藏默认的日历头部 */
+:deep(.el-calendar__header) {
+    display: none !important;
+}
+
+:deep(.el-calendar__body) {
+    padding: 0;
+}
+
+
+.date-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    // gap: 3px;
+    margin-bottom: 8px;
+
+    // color: #303133;
+    .adjust,
+    .conflict {
+        min-width: 63px;
+        height: 17px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        padding: 2px 6px;
+        box-sizing: border-box;
+        border-radius: 2px;
+        background: #FFF1F0;
+        box-sizing: border-box;
+        border: 1px solid #FFA39E;
+        font-size: 12px;
+        font-weight: normal;
+        line-height: 13px;
+        text-align: center;
+        color: #FF4D4F;
+    }
+
+    .conflict {
+        border: none;
+    }
+}
+
+.date-content {
+    width: 100%;
+    height: 100%;
+}
+
+.date-text {
+    font-size: 14px;
+    font-weight: normal;
+}
+
+.today-badge {
+    background-color: #409EFF;
+    color: white;
+    width: 18px;
+    height: 18px;
+    font-size: 12px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    letter-spacing: 0.08em;
+    border-radius: 3px;
+    background: linear-gradient(316deg, #FF4143 4%, #FF768B 93%);
+}
+
+.schedule-content {
+    font-size: 12px;
+}
+
+.schedule-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 8px;
+}
+
+.shift-type {
+    color: #626573;
+    margin-right: 6px;
+    white-space: nowrap;
+}
+
+
+
+.hospital-tags {
+    display: flex;
+    gap: 6px;
+    flex-wrap: wrap;
+}
+
+// 实心框
+.color-tag,
+.opacity-tag {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-weight: bold;
+    width: 12px;
+    height: 12px;
+    color: #fff;
+    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-color: #fff !important;
+    box-sizing: border-box;
+    border: 2px solid #39D067;
+}
+
+/* 隐藏的标签 */
+.hidden-tag {
+    display: none;
+}
+
+/* 如果需要调整文字颜色 */
+.shift-type-0 {
+    background-color: #F6F7FA !important;
+
+    .date-text,
+    .shift-type {
+        color: #626573;
+    }
+}
+
+.shift-type-1 {
+    background-color: #ECF5FF !important;
+
+    .date-text,
+    .shift-type {
+        color: #409EFF;
+    }
+}
+
+.shift-type-2 {
+    background-color: #FFFAF0 !important;
+
+    .date-text,
+    .shift-type {
+        color: #FB832D;
+    }
+}
+
+.shift-type-3 {
+    background-color: #EFFFE0 !important;
+
+    .date-text,
+    .shift-type {
+        color: #00C261;
+    }
+}
+
+/* Element UI Calendar 样式调整 */
+:deep(.el-calendar-table .el-calendar-day) {
+    height: 100px;
+    padding: 0;
+}
+
+:deep(.el-calendar-table thead th) {
+    height: 48px;
+    box-sizing: border-box;
+    padding: 12px 8px;
+    text-align: left;
+    color: #303133;
+}
+
+:deep(.el-calendar-table td) {
+    border-color: #E4E7ED;
+    vertical-align: top;
+}
+
+:deep(.el-calendar-table .el-calendar-day:hover) {
+    background-color: #f5f7fa;
+}
+
+:deep(.el-calendar-table td.is-selected) {
+    background-color: transparent;
+}
+
+:deep(.el-calendar-table td.is-today) {
+    color: #303133;
+}
+
+:deep(.el-calendar__header .el-calendar__title) {
+    color: #303133;
+    font-weight: bold;
+
+}
+
+:deep(.el-calendar__header .el-button) {
+    color: #606266;
+    width: auto;
+    /* height: 24px; */
+    line-height: 20px;
+    height: auto;
+    padding: 2px 12px;
+    box-sizing: border-box;
+    font-weight: 500;
+    background: transparent !important;
+    border: 1px solid #DCDFE6 !important;
+
+    &:hover {
+        color: #409eff !important;
+        border-color: #c6e2ff !important;
+        background-color: #ecf5ff !important;
+    }
+}
+
+.bidwrap-item {
     padding: 24px 14px;
     box-sizing: border-box;
     background: #FAFAFA;
+
     .biditemMast {
         background: #fff;
         padding: 24px 16px;
         border-radius: 8px;
         background: #FFFFFF;
         align-items: flex-start;
+
         .bidwrap-item-top {
             .top-right {
                 p {
                     margin-top: 10px;
                     color: #1E2226;
                 }
-                .desc{
+
+                .desc {
                     color: #6B7280;
                 }
+
                 a {
                     text-decoration: none;
                     color: #006AFF;
@@ -1570,20 +3629,25 @@ export default {
         }
     }
 }
+
 .el-autocomplete-noloading {
     display: none !important;
 }
 
 .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 {
     margin-bottom: 0 !important;
 }
-.tipInfo{
+
+.tipInfo {
     font-family: Microsoft YaHei UI;
     font-size: 12px;
     font-weight: normal;
diff --git a/src/views/conflictDialog.vue b/src/views/conflictDialog.vue
new file mode 100644
index 0000000..12adab0
--- /dev/null
+++ b/src/views/conflictDialog.vue
@@ -0,0 +1,553 @@
+<template>
+
+<GuipDialog :dialogVisible="visitDialogVisible" :title="visitDialogTitle" :show-close-button="true" width="699px"
+            :show-cancel-button="visitShowCancelBtn" @confirm="handleVisitConfirm" :confirmText="visitConfirmText"
+            @cancel="handleVisitCancel" @close="handleVisitClose">
+            <div class="flex conflictTitle" v-if="is_allow_coincide && !isDoctorSet">
+                您设置的 <b>{{ h_realname }} </b>【每周排班】，与以下现有出诊安排重叠，请确定是否正确。
+            </div>
+            <div class="flex conflictTitle" v-if="!is_allow_coincide && !isDoctorSet">
+                您设置的 <b>{{ h_realname }} </b>【每周排班】，与以下现有出诊安排冲突，请调整后再保存：
+            </div>
+            <div class="visitContent mt24">
+                <div class="hosPlanItem mb24" v-for="(conflict, index) in hasConflictresult" :key="index">
+                    <p>{{ conflict.date }} {{ conflict.dayOfWeek ? `（${conflict.dayOfWeek}）` : '' }}{{ conflict.conflictShift }}</p>
+                    <div class="flex">
+                        <span class="conflictTip">{{!is_allow_coincide ?'冲突':'重叠' }}</span>
+                        <div>{{ conflict.hospital }}({{ conflict.type === 'fixed' ?
+                            '固定排班' :
+                            '临时出诊' }})</div>
+                    </div>
+                </div>
+            </div>
+            <p v-if="hasConflictresultLength > 3" style="color: #FF4D4F;">等共{{hasConflictresultLength}}条出诊安排冲突，请修改后再进行设置</p>
+        </GuipDialog>
+</template>
+<script>
+import GuipDialog from '@/components/GuipDialog.vue';
+
+export default {
+    props: {
+        is_allow_coincide: [Boolean, Number],
+        oldWorktimes: Object,
+        h_realname: String,
+        doctor_id: [Number, String],
+        depart_id: [Number, String],
+        houseCallSettingForm: Object,
+        rawScheduleDataProp: Object,
+        isDoctorSet:Boolean,
+        cancelText: String,
+        confirmText: String,
+        cancelBtnShow: String,
+        title: String,
+        // houseCallSettingForm: Object,
+        // getDoctorHosPreview: Function,
+        // formatWorktimesArray: Function,
+    },
+    components: {
+        GuipDialog,
+    },
+    data(){
+        return {
+            visitDialogTitle: '出诊安排重叠，请确认',//出诊冲突框标题
+            visitDialogVisible: false,//出诊冲突提示框
+            visitShowCancelBtn: true,//出诊冲突框是否显示取消按钮
+            visitConfirmText: '确定并保存',//出诊冲突框确认按钮文字
+            hasConflictresult: [],
+            rawScheduleData1:null,
+            weekPlan: {
+                '1': '周一',
+                '2': '周二',
+                '3': '周三',
+                '4': '周四',
+                '5': '周五',
+                '6': '周六',
+                '7': '周日',
+            },
+            weekDaysDesc: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
+            hasConflictresultLength:0
+
+        }
+    },
+    created() {
+            this.rawScheduleData1 = this.rawScheduleDataProp;
+
+    },
+    watch: {
+    // 监听 props 变化
+        rawScheduleDataProp(newVal) {
+                this.rawScheduleData1 = newVal
+        },
+        
+    } ,
+    mounted() {
+        if(this.cancelBtnShow == '0'){
+            this.visitShowCancelBtn = false;
+        }
+        if(this.cancelText){
+            this.visitConfirmText = this.cancelText;
+        }
+        if(this.confirmText){
+            this.visitConfirmText = this.confirmText;
+        }
+        if(this.title){
+            this.visitDialogTitle = this.title;
+        }
+    },
+
+    methods: {
+        open(){
+            this.visitDialogVisible = true;
+            this.getDoctorHosPreview();
+        },
+        handleVisitClose() {
+            this.visitDialogVisible = false;
+        },
+        handleVisitCancel() {
+            this.visitDialogVisible = false;
+        },
+        handleVisitConfirm() {
+            if (this.is_allow_coincide) {
+                this.saveWorkTimeDirect();
+            }
+            this.visitDialogVisible = false;
+        },
+        // ...start
+        async getDoctorHosPreview() {
+            await this.$http('POST', '/api/admin/get_departs_worktimes', {
+                doctor_id: this.doctor_id,
+            }).then(response => {
+                const list = response.msg;
+                if (response.code == 0) {
+                    // 保存原始数据
+                    this.rawScheduleData1 = JSON.parse(JSON.stringify(list));
+                    const data  = this.analyzeCurrentMonthConflicts();
+                    this.hasConflictresultLength = data.length;
+                    this.hasConflictresult = data.length > 3 ? data.slice(0, 3) : data;
+                    // console.log(this.hasConflictresult, 'this.hasConflictresult');
+                }
+            }).catch(error => {
+                console.error(error, 'error')
+            })
+        },
+        // 格式化日期为 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}`;
+        },
+          // 分析当月剩余天数的冲突（区分固定排班和临时出诊）
+          analyzeCurrentMonthConflicts() {
+            const conflicts = [];
+            const today = new Date();
+            const currentYear = today.getFullYear();
+            const currentMonth = today.getMonth();
+
+            // 获取当月最后一天
+            const lastDay = new Date(currentYear, currentMonth + 1, 0).getDate();
+
+            // 分析从今天到月底的每一天
+            for (let day = today.getDate(); day <= lastDay; day++) {
+                const date = new Date(currentYear, currentMonth, day);
+                const dateStr = this.formatDate(date);
+                const dayOfWeek = date.getDay() === 0 ? 7 : date.getDay();
+
+                const dayConflicts = this.checkDayConflictsWithType(dateStr, dayOfWeek, this.rawScheduleData1, Object.keys(this.rawScheduleData1));
+                if (dayConflicts.length > 0) {
+                    conflicts.push(...dayConflicts);
+                }
+            }
+
+            return conflicts;
+        },
+
+        // 检查单日冲突（区分固定和临时）
+        checkDayConflictsWithType(dateStr, dayOfWeek, hospitals, hospitalIds) {
+            const conflicts = [];
+            const timeSlots = {
+                morning: [],
+                afternoon: []
+            };
+
+            // 收集这一天的所有医院排班
+            hospitalIds.forEach(hid => {
+                const hospital = hospitals[hid];
+                let plan = "0";
+                let isTempAdjust = false;
+                let originalPlan = "0";
+
+                // 获取原始排班
+                if (hospital.worktime_no_fixed === 0) {
+                    // 固定排班
+                    const weeklyPlan = hospital.worktime_list && hospital.worktime_list[dayOfWeek];
+                    originalPlan = weeklyPlan ? weeklyPlan.plan.toString() : "0";
+                } else {
+                    // 非固定排班
+                    const datePlan = hospital.worktime_list && hospital.worktime_list[dateStr];
+                    originalPlan = datePlan ? datePlan.plan.toString() : "0";
+                }
+
+                // 检查临时调整
+                if (hospital.temp_change_worktime && hospital.temp_change_worktime[dateStr]) {
+                    const tempPlan = hospital.temp_change_worktime[dateStr];
+                    plan = tempPlan.plan.toString();
+                    isTempAdjust = true;
+                } else {
+                    plan = originalPlan;
+                }
+
+                if (plan !== "0") {
+                    const hospitalInfo = {
+                        hid,
+                        name: hospital.h_depart_name,
+                        plan,
+                        originalPlan,
+                        isTempAdjust,
+                        scheduleType: isTempAdjust ? '临时出诊' : '固定排班'
+                    };
+
+                    if (plan === "1" || plan === "3") {
+                        timeSlots.morning.push(hospitalInfo);
+                    }
+                    if (plan === "2" || plan === "3") {
+                        timeSlots.afternoon.push(hospitalInfo);
+                    }
+                }
+            });
+
+            // 检查冲突
+            if (timeSlots.morning.length > 1) {
+                conflicts.push(this.createConflictInfoWithType(
+                    dateStr,
+                    timeSlots.morning,
+                    '上午'
+                ));
+            }
+
+            if (timeSlots.afternoon.length > 1) {
+                conflicts.push(this.createConflictInfoWithType(
+                    dateStr,
+                    timeSlots.afternoon,
+                    '下午'
+                ));
+            }
+
+            return conflicts;
+        },
+
+        // 创建冲突信息（区分固定和临时）
+        createConflictInfoWithType(date, hospitals, timeSlot) {
+            const dateObj = new Date(date);
+            const dayOfWeek = this.weekDaysDesc[dateObj.getDay()];
+
+            // 格式化医院信息，区分固定排班和临时出诊
+            const hospitalGroups = {
+                fixed: hospitals.filter(h => !h.isTempAdjust).map(h => h.name),
+                temp: hospitals.filter(h => h.isTempAdjust).map(h => h.name)
+            };
+
+            let hospitalDisplay = '';
+            if (hospitalGroups.fixed.length > 0) {
+                hospitalDisplay += hospitalGroups.fixed.join('、') + '固定排班';
+            }
+            if (hospitalGroups.temp.length > 0) {
+                if (hospitalDisplay) hospitalDisplay += '、';
+                hospitalDisplay += hospitalGroups.temp.join('、') + '临时出诊';
+            }
+
+            return {
+                date: date,
+                hospital: hospitalDisplay,
+                conflictShift: timeSlot,
+                type: hospitalGroups.temp.length > 0 ? 'mixed' : 'fixed',
+                dayOfWeek: dayOfWeek,
+                hospitals: hospitals,
+                displayText: `${date}（${dayOfWeek}）${timeSlot}班：${hospitalDisplay}`
+            };
+        },
+        // ..end
+        async setDepartWorkTime() {
+            const { display_work_days, planDays, worktime_no_fixed,worktimes } = this.houseCallSettingForm;
+            const params = {
+                doctor_id: this.doctor_id,
+                depart_id: this.depart_id,
+                worktime_no_fixed: worktime_no_fixed,
+                week_visit_plan: JSON.stringify(this.formatWorktimesArray(worktimes))
+            }
+
+            if (display_work_days == 1 && planDays > 0) {
+                params.display_work_days = planDays
+            }
+
+            // 检查冲突：当前设置医院的新排班 vs 其他医院的现有排班
+            const conflictResults = this.checkScheduleConflict(worktimes, worktime_no_fixed);
+            // 为固定出诊并且存在冲突时展示弹出框
+            if (conflictResults.hasConflict && worktime_no_fixed == 0) {
+                this.visitDialogVisible = true;
+                this.hasConflictresult = conflictResults.conflicts;
+                if(this.is_allow_coincide){
+                    this.visitDialogTitle = '出诊安排重叠，请确认';
+                    this.visitConfirmText = '确定并保存';
+                    this.visitShowCancelBtn = true;
+                }else{
+                    this.visitDialogTitle = '出诊安排冲突，请确认';
+                    this.visitConfirmText = '知道了';
+                    this.visitShowCancelBtn = false;
+                }
+                return;
+            }
+        },
+        async saveWorkTimeDirect() {
+            const { display_work_days, planDays, worktime_no_fixed, worktimes } = this.houseCallSettingForm;
+            var worktimesArray = this.formatWorktimesArray(worktimes)
+            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.form.worktimes = worktimes;
+                    this.getDoctorHosPreview();
+                }
+            }).catch(error => {
+                console.error(error, 'error')
+            })
+        },
+
+        // 检查排班冲突
+        checkScheduleConflict(newWorktimes, worktime_no_fixed) {
+            const conflicts = [];
+            let hasConflict = false;
+
+            if (!this.rawScheduleData1) {
+                return { hasConflict: false, conflicts: [] };
+            }
+            // 遍历所有其他医院的排班数据
+            Object.keys(this.rawScheduleData1).forEach(hospitalId => {
+                // 跳过当前正在设置的医院 (depart_id=4)
+                if (hospitalId === this.depart_id.toString()) {
+                    console.log('跳过当前医院:', hospitalId);
+                    return;
+                }
+                const hospital = this.rawScheduleData1[hospitalId];
+                // 根据排班类型检查冲突
+                const hospitalConflicts = this.checkHospitalConflict(newWorktimes, hospital, worktime_no_fixed);
+
+                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;
+        },
+            // 检查与固定排班医院的冲突
+            checkVsFixedHospital(newWorktimes, hospital) {
+            const conflicts = [];
+            // 遍历新设置的每周排班
+            Object.keys(newWorktimes).forEach(weekDay => {
+                const newPlan = newWorktimes[weekDay].plan;
+                if (newPlan === '0') {
+                    return; // 休息不检查冲突
+                }
+
+                // 检查医院在该工作日的排班
+                const hospitalPlan = hospital.worktime_list && hospital.worktime_list[weekDay];
+                if (hospitalPlan && hospitalPlan.plan !== '0') {
+                    // 获取冲突的具体时段
+                    const conflictShift = this.getConflictShift(newPlan, hospitalPlan.plan);
+                    if (conflictShift) {
+                        conflicts.push(this.createConflictInfo(
+                            `每${this.getWeekDayName(parseInt(weekDay))}`,
+                            hospital.h_depart_name,
+                            newPlan,
+                            conflictShift, // 这里改为冲突时段而不是医院排班
+                            '固定排班',
+                            hospitalPlan.work_paln_desc,
+                        ));
+                    }
+                }
+            });
+
+            return conflicts;
+        },
+        // 检查与非固定排班医院的冲突
+        checkVsNonFixedHospital(newWorktimes, hospital) {
+            const conflicts = [];
+
+            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;
+
+                // 获取冲突的具体时段
+                const conflictShift = this.getConflictShift(newSchedule.plan, hospitalPlan.plan);
+                if (conflictShift) {
+                    conflicts.push(this.createConflictInfo(
+                        dateStr,
+                        hospital.h_depart_name,
+                        newSchedule.plan,
+                        conflictShift, // 这里改为冲突时段而不是医院排班
+                        '非固定排班',
+                        hospitalPlan.work_paln_desc,
+                        this.weekPlan[dayOfWeek],//这个还需呀修改
+
+                    ));
+                }
+            });
+
+            return conflicts;
+        },
+        createConflictInfo(date, hospitalName, newPlan, conflictShift, scheduleType, workDesc, dayOfWeek) {
+            const planMap = {
+                '0': '休息',
+                '1': '上午班',
+                '2': '下午班',
+                '3': '全天班'
+            };
+
+            const conflict = {
+                date: date,
+                hospital: hospitalName,
+                newPlan: planMap[newPlan],
+                conflictShift: conflictShift, // 改为冲突时段
+                scheduleType: scheduleType,
+                workDesc: workDesc,
+                dayOfWeek
+                // displayText: `${date} ${planMap[newPlan]} 与 ${hospitalName} ${conflictShift} 冲突`
+            };
+
+            console.log('创建冲突信息:', conflict);
+            return conflict;
+        },
+        getWeekDayName(weekDay) {
+            const weekDays = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
+            return weekDays[weekDay - 1] || `周${weekDay}`;
+        },
+        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; // 无冲突
+        },
+        formatWorktimesArray(worktimes) {
+            return Object.entries(worktimes).map(([key, value]) => ({
+                type: parseInt(key),
+                plan: value.plan
+            }));
+        },
+
+    }
+}
+</script>
+<style scoped lang="scss">
+
+.visitContent {
+    max-height: 300px;
+    overflow-y: auto;
+}
+.conflictTitle {
+  display: flex;
+  margin-bottom: 24px;
+  font-size: 14px;
+  color: #333;
+  line-height: 1.5;
+  flex-wrap: wrap;
+  word-wrap: break-word;
+  word-break: break-word;
+  white-space: normal;
+}
+
+.conflictTitle b {
+  color: #1890ff;
+  font-weight: 600;
+  margin: 0 4px;
+  word-break: break-all;
+}
+.hosPlanItem {
+    p {
+        color: #1E2226;
+        margin-bottom: 14px;
+    }
+
+    div {
+        color: #8A9099;
+    }
+}
+
+.conflictTip {
+    height: 22px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 2px 10px;
+    gap: 6px;
+    border-radius: 4px;
+    background: #FFF1F0;
+    box-sizing: border-box;
+    border: 1px solid #FFA39E;
+    font-size: 14px;
+    font-weight: normal;
+    line-height: normal;
+    text-align: center;
+    letter-spacing: 0.08em;
+    color: #FF4D4F;
+    box-sizing: border-box;
+    margin-right: 6px;
+}
+
+</style>
\ No newline at end of file