From 74b6ea0bb0b6f6aa7a1271c2d756c9f61a97a5fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Mon, 22 Apr 2024 15:09:00 +0800
Subject: [PATCH 01/13] xg

---
 src/views/system/specialDiseaseNode/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/system/specialDiseaseNode/index.vue b/src/views/system/specialDiseaseNode/index.vue
index 1fc18bf..93946f2 100644
--- a/src/views/system/specialDiseaseNode/index.vue
+++ b/src/views/system/specialDiseaseNode/index.vue
@@ -620,23 +620,23 @@ export default {
                         spinner: 'el-icon-loading',
                         background: 'rgba(0, 0, 0, 0.7)'
                     });
-                    if (!this.routeform.routeNodeDay) {
+                    if (!this.form.routeNodeDay) {
                         this.$message.error('请输入节点时间段天数');
                         return
                     }
-                    if (!this.routeform.routeNodeName) {
+                    if (!this.form.routeNodeName) {
                         this.$message.error('请选择节点时间段');
                         return
                     }
-                    if (!this.routeform.taskType) {
+                    if (!this.form.taskType) {
                         this.$message.error('请选择任务类型');
                         return
                     }
-                    if (!this.routeform.taskSubdivision) {
+                    if (!this.form.taskSubdivision) {
                         this.$message.error('请选择任务细分');
                         return
                     }
-                    if (!this.routeform.taskStatus) {
+                    if (!this.form.taskStatus) {
                         this.$message.error('请选择任务状态');
                         return
                     }

From deab2ebb0bc236d8aa75c064e1c6aad26a2080af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Mon, 22 Apr 2024 15:09:54 +0800
Subject: [PATCH 02/13] xg

---
 src/views/system/specialDiseaseNode/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/system/specialDiseaseNode/index.vue b/src/views/system/specialDiseaseNode/index.vue
index 93946f2..ccc8e6a 100644
--- a/src/views/system/specialDiseaseNode/index.vue
+++ b/src/views/system/specialDiseaseNode/index.vue
@@ -622,23 +622,23 @@ export default {
                     });
                     if (!this.form.routeNodeDay) {
                         this.$message.error('请输入节点时间段天数');
-                        return
+                        return loading.close();
                     }
                     if (!this.form.routeNodeName) {
                         this.$message.error('请选择节点时间段');
-                        return
+                        return loading.close();
                     }
                     if (!this.form.taskType) {
                         this.$message.error('请选择任务类型');
-                        return
+                        return loading.close();
                     }
                     if (!this.form.taskSubdivision) {
                         this.$message.error('请选择任务细分');
-                        return
+                        return loading.close();
                     }
                     if (!this.form.taskStatus) {
                         this.$message.error('请选择任务状态');
-                        return
+                        return loading.close();
                     }
                     updateRouteCheckStatus({
                         routeCheckStatus: this.routeform.routeCheckStatus,

From 15527d2288c50a710772466109762fa9f16bcd16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Mon, 22 Apr 2024 15:17:31 +0800
Subject: [PATCH 03/13] xg

---
 src/views/system/specialDiseaseNode/index.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/system/specialDiseaseNode/index.vue b/src/views/system/specialDiseaseNode/index.vue
index ccc8e6a..e936be4 100644
--- a/src/views/system/specialDiseaseNode/index.vue
+++ b/src/views/system/specialDiseaseNode/index.vue
@@ -50,6 +50,8 @@
                             :class="listindex == index && itemindex == uindex ? 'cards' : ''">
                             <h3 style="height: 20px;">{{ uitem.taskTypeName }}</h3>
                             <el-tag v-if="uitem.routeCheckStatus == 'AGREE'" class="routeCheckStatus">已审核</el-tag>
+                            <el-tag v-else-if="uitem.routeCheckStatus == 'DISAGREE'" type="danger"
+                                class="routeCheckStatus">不同意</el-tag>
                             <el-tag v-else type="warning" class="routeCheckStatus">未审核</el-tag>
                             <p style="height: 16px;">{{ uitem.taskSubdivisionName }}</p>
                         </el-card>

From 6249f1f0d9b13ec6c8e95992cf8a93b844170caf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Mon, 22 Apr 2024 17:05:23 +0800
Subject: [PATCH 04/13] xg

---
 src/views/system/specialDiseaseNode/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/system/specialDiseaseNode/index.vue b/src/views/system/specialDiseaseNode/index.vue
index e936be4..0f393e9 100644
--- a/src/views/system/specialDiseaseNode/index.vue
+++ b/src/views/system/specialDiseaseNode/index.vue
@@ -501,6 +501,7 @@ export default {
         bottomclickevent(uitem, index, uindex) {
             this.$refs.wangeditor.emit()
             this.form = uitem
+            this.taskPartitionList = []
             if (this.form.taskType) {
                 this.changeTaskType(this.form.taskType, this.form.taskSubdivision)
             }

From 90e3c947fd7f0a9b6bd55671c726d604e350183a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Mon, 22 Apr 2024 17:13:44 +0800
Subject: [PATCH 05/13] xg

---
 src/api/system/specialDiseaseNode.js          | 4 ++--
 src/views/system/specialDiseaseNode/index.vue | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/api/system/specialDiseaseNode.js b/src/api/system/specialDiseaseNode.js
index 2185f04..c12fb81 100644
--- a/src/api/system/specialDiseaseNode.js
+++ b/src/api/system/specialDiseaseNode.js
@@ -15,9 +15,9 @@ export function selectTaskTypeList() {
     })
 }
 // 任务状态
-export function taskStatusDictList() {
+export function taskStatusDictList(id) {
     return request({
-        url: '/system/taskStatus/taskStatusDictList',
+        url: `/system/taskStatus/taskStatusDictList?taskPartitionId=${id}`,
         method: 'get',
     })
 }
diff --git a/src/views/system/specialDiseaseNode/index.vue b/src/views/system/specialDiseaseNode/index.vue
index 0f393e9..a618359 100644
--- a/src/views/system/specialDiseaseNode/index.vue
+++ b/src/views/system/specialDiseaseNode/index.vue
@@ -517,9 +517,6 @@ export default {
                 this.selectTaskTypeList = res.data
                 this.info();
             })
-            taskStatusDictList().then(res => {
-                this.taskStatusDictList = res.data
-            })
         },
         //任务类型
         changeTaskType(code, taskSubdivision) {
@@ -539,6 +536,10 @@ export default {
         //点击任务细分
         changetaskSubdivision(code, type) {
             this.form.taskSubdivisionName = this.taskPartitionList?.find(e => e.taskPartitionCode == code)?.taskPartitionName
+            let id = this.taskPartitionList?.find(e => e.taskPartitionCode == code)?.id
+            taskStatusDictList(id).then(res => {
+                this.taskStatusDictList = res.data
+            })
             this.taskPartitionList.forEach(el => {
                 if (code == el.taskPartitionCode) {
                     this.form.executionTime = el.executionTime

From 798e30e60de4040333ccf7d621ced44765f17224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Mon, 22 Apr 2024 17:18:45 +0800
Subject: [PATCH 06/13] xg

---
 src/views/system/specialDiseaseNode/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/system/specialDiseaseNode/index.vue b/src/views/system/specialDiseaseNode/index.vue
index a618359..3ffe327 100644
--- a/src/views/system/specialDiseaseNode/index.vue
+++ b/src/views/system/specialDiseaseNode/index.vue
@@ -527,6 +527,7 @@ export default {
                 this.form.taskSubdivision = ''
                 this.form.taskSubdivisionName = ''
                 this.form.taskSubdivisiontemplateType = ''
+                this.taskStatusDictList = []
                 if (taskSubdivision) {
                     this.form.taskSubdivision = taskSubdivision
                     this.changetaskSubdivision(taskSubdivision, 1)

From bf09228aa53764db47b17b69ffa2b3571fab99ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Mon, 22 Apr 2024 17:33:14 +0800
Subject: [PATCH 07/13] xg

---
 src/views/system/components/wangEditor.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/system/components/wangEditor.vue b/src/views/system/components/wangEditor.vue
index 995ddf9..550b49c 100644
--- a/src/views/system/components/wangEditor.vue
+++ b/src/views/system/components/wangEditor.vue
@@ -182,6 +182,7 @@ export default ({
                 res.data.data.forEach(e => {
                     e.labelFieldContentList.forEach(el => {
                         el.labelFieldId = el.labelFieldContentId
+                        el.fieldName = el.contentName
                     })
                 })
                 this.labeloptions = res.data.data
@@ -190,6 +191,7 @@ export default ({
                 res.data.data.forEach(e => {
                     e.labelFieldContentList.forEach(el => {
                         el.labelFieldId = el.labelFieldContentId
+                        el.fieldName = el.contentName
                     })
                 })
                 this.fieldoptions = res.data.data

From 1b0fc0516d3f7554ce8a07d333bc790a3932a42a Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Tue, 23 Apr 2024 09:04:53 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E5=AE=A3=E6=95=99=E5=BA=93=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/propaganda/index.vue |  13 +-
 src/views/system/Editorxj/index.vue   | 281 ++++++++++++++++++++++++++
 2 files changed, 291 insertions(+), 3 deletions(-)
 create mode 100644 src/views/system/Editorxj/index.vue

diff --git a/src/views/manage/propaganda/index.vue b/src/views/manage/propaganda/index.vue
index c26705d..8c4d92f 100644
--- a/src/views/manage/propaganda/index.vue
+++ b/src/views/manage/propaganda/index.vue
@@ -372,7 +372,7 @@
               v-for="item in Departmentdata"
               :key="item.id"
               :label="item.departmentName"
-              :value="item.departmentCode"
+              :value="item.id"
             >
             </el-option>
           </el-select>
@@ -678,7 +678,13 @@
           <img :src="baseUrl + formview.propagandaCoverPath" alt="" />
           <div class="know">知识卡片</div>
           <div class="knowlist">
-            {{ formview.propagandaContent }}
+            <Editorxj
+            v-model="formview.propagandaContent"
+            :min-height="192"
+            style="width: 800px"
+          />
+
+            <!-- {{ formview.propagandaContent }} -->
             <!-- 二甲双胍的用药安全性良好，已经过多年临床用药实践论证。但不用于10岁以下患者、肝功能不全患者(尤其转氨酶高于3倍正常值的患者)、肾功能异 -->
           </div>
         </div>
@@ -839,10 +845,11 @@ import { listMaterials } from "@/api/manage/materials";
 import { selectAgencyList, getDepartmentList } from "@/api/manage/selectAgencyList";
 
 import stationAcatar from "../../system/stationAvatar/index.vue";
+import Editorxj from "../../system/Editorxj/index.vue";
 import { department, listDisease } from "@/api/manage/script";
 export default {
   name: "Propaganda",
-  components: { stationAcatar },
+  components: { stationAcatar ,Editorxj},
   data() {
     //验证身份证
     var isimgPath = (rule, value, callback) => {
diff --git a/src/views/system/Editorxj/index.vue b/src/views/system/Editorxj/index.vue
new file mode 100644
index 0000000..d1a9cd0
--- /dev/null
+++ b/src/views/system/Editorxj/index.vue
@@ -0,0 +1,281 @@
+<template>
+  <div>
+    <el-upload
+      :action="uploadUrl"
+      :before-upload="handleBeforeUpload"
+      :on-success="handleUploadSuccess"
+      :on-error="handleUploadError"
+      name="file"
+      :show-file-list="false"
+      :headers="headers"
+      style="display: none"
+      ref="upload"
+      v-if="this.type == 'url'"
+    >
+    </el-upload>
+    <div class="editor" ref="editor" :style="styles"></div>
+  </div>
+</template>
+
+<script>
+import Quill from "quill";
+import "quill/dist/quill.core.css";
+import "quill/dist/quill.snow.css";
+import "quill/dist/quill.bubble.css";
+import { getToken } from "@/utils/auth";
+
+export default {
+  name: "Editor",
+  props: {
+    /* 编辑器的内容 */
+    value: {
+      type: String,
+      default: "",
+    },
+    /* 高度 */
+    height: {
+      type: Number,
+      default: null,
+    },
+    /* 最小高度 */
+    minHeight: {
+      type: Number,
+      default: null,
+    },
+    /* 只读 */
+    readOnly: {
+      type: Boolean,
+      default: false,
+    },
+    // 上传文件大小限制(MB)
+    fileSize: {
+      type: Number,
+      default: 5,
+    },
+    /* 类型（base64格式、url格式） */
+    type: {
+      type: String,
+      default: "url",
+    }
+  },
+  data() {
+    return {
+      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
+      headers: {
+        Authorization: "Bearer " + getToken()
+      },
+      Quill: null,
+      currentValue: "",
+      options: {
+        theme: "snow",
+        bounds: document.body,
+        debug: "warn",
+        modules: {
+          // 工具栏配置
+          toolbar: [
+            // ["bold", "italic", "underline", "strike"],       // 加粗 斜体 下划线 删除线
+            // ["blockquote", "code-block"],                    // 引用  代码块
+            // [{ list: "ordered" }, { list: "bullet" }],       // 有序、无序列表
+            // [{ indent: "-1" }, { indent: "+1" }],            // 缩进
+            // [{ size: ["small", false, "large", "huge"] }],   // 字体大小
+            // [{ header: [1, 2, 3, 4, 5, 6, false] }],         // 标题
+            // [{ color: [] }, { background: [] }],             // 字体颜色、字体背景颜色
+            // [{ align: [] }],                                 // 对齐方式
+            // ["clean"],                                       // 清除文本格式
+            // ["link", "image", "video"]                       // 链接、图片、视频
+          ],
+        },
+        placeholder: "请输入内容",
+        readOnly: this.readOnly,
+      },
+    };
+  },
+  computed: {
+    styles() {
+      let style = {};
+      if (this.minHeight) {
+        style.minHeight = `${this.minHeight}px`;
+      }
+      if (this.height) {
+        style.height = `${this.height}px`;
+      }
+      return style;
+    },
+  },
+  watch: {
+    value: {
+      handler(val) {
+        if (val !== this.currentValue) {
+          this.currentValue = val === null ? "" : val;
+          if (this.Quill) {
+            this.Quill.pasteHTML(this.currentValue);
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
+  mounted() {
+    this.init();
+  },
+  beforeDestroy() {
+    this.Quill = null;
+  },
+  methods: {
+    init() {
+      const editor = this.$refs.editor;
+      this.Quill = new Quill(editor, this.options);
+      // 如果设置了上传地址则自定义图片上传事件
+      if (this.type == 'url') {
+        let toolbar = this.Quill.getModule("toolbar");
+        toolbar.addHandler("image", (value) => {
+          this.uploadType = "image";
+          if (value) {
+            this.$refs.upload.$children[0].$refs.input.click();
+          } else {
+            this.quill.format("image", false);
+          }
+        });
+      }
+      this.Quill.pasteHTML(this.currentValue);
+      this.Quill.on("text-change", (delta, oldDelta, source) => {
+        const html = this.$refs.editor.children[0].innerHTML;
+        const text = this.Quill.getText();
+        const quill = this.Quill;
+        this.currentValue = html;
+        this.$emit("input", html);
+        this.$emit("on-change", { html, text, quill });
+      });
+      this.Quill.on("text-change", (delta, oldDelta, source) => {
+        this.$emit("on-text-change", delta, oldDelta, source);
+      });
+      this.Quill.on("selection-change", (range, oldRange, source) => {
+        this.$emit("on-selection-change", range, oldRange, source);
+      });
+      this.Quill.on("editor-change", (eventName, ...args) => {
+        this.$emit("on-editor-change", eventName, ...args);
+      });
+    },
+    // 上传前校检格式和大小
+    handleBeforeUpload(file) {
+      // 校检文件大小
+      if (this.fileSize) {
+        const isLt = file.size / 1024 / 1024 < this.fileSize;
+        if (!isLt) {
+          this.$message.error(`上传文件大小不能超过 ${this.fileSize} MB!`);
+          return false;
+        }
+      }
+      return true;
+    },
+    handleUploadSuccess(res, file) {
+      // 获取富文本组件实例
+      let quill = this.Quill;
+      // 如果上传成功
+      if (res.code == 200) {
+        // 获取光标所在位置
+        let length = quill.getSelection().index;
+        // 插入图片  res.url为服务器返回的图片地址
+        quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName);
+        // 调整光标到最后
+        quill.setSelection(length + 1);
+      } else {
+        this.$message.error("图片插入失败");
+      }
+    },
+    handleUploadError() {
+      this.$message.error("图片插入失败");
+    },
+  },
+};
+</script>
+
+<style>
+.editor, .ql-toolbar {
+  white-space: pre-wrap !important;
+  line-height: normal !important;
+}
+.quill-img {
+  display: none;
+}
+.ql-toolbar.ql-snow{
+  display: none;
+  border: 1px solid #fff;
+
+
+}
+.ql-container.ql-snow {
+       border: 1px solid #fff;
+}
+.ql-snow .ql-tooltip[data-mode="link"]::before {
+  content: "请输入链接地址:";
+}
+.ql-snow .ql-tooltip.ql-editing a.ql-action::after {
+  border-right: 0px;
+  content: "保存";
+  padding-right: 0px;
+}
+
+.ql-snow .ql-tooltip[data-mode="video"]::before {
+  content: "请输入视频地址:";
+}
+
+.ql-snow .ql-picker.ql-size .ql-picker-label::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item::before {
+  content: "14px";
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="small"]::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="small"]::before {
+  content: "10px";
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="large"]::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="large"]::before {
+  content: "18px";
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="huge"]::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="huge"]::before {
+  content: "32px";
+}
+
+.ql-snow .ql-picker.ql-header .ql-picker-label::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item::before {
+  content: "文本";
+}
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="1"]::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="1"]::before {
+  content: "标题1";
+}
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="2"]::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="2"]::before {
+  content: "标题2";
+}
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="3"]::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="3"]::before {
+  content: "标题3";
+}
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="4"]::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="4"]::before {
+  content: "标题4";
+}
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="5"]::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="5"]::before {
+  content: "标题5";
+}
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="6"]::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="6"]::before {
+  content: "标题6";
+}
+
+.ql-snow .ql-picker.ql-font .ql-picker-label::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item::before {
+  content: "标准字体";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value="serif"]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value="serif"]::before {
+  content: "衬线字体";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value="monospace"]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value="monospace"]::before {
+  content: "等宽字体";
+}
+</style>

From 26f3ee61d77375951245b96defa4c5a5dbc50b55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Tue, 23 Apr 2024 09:43:35 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/blacklist/index.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/manage/blacklist/index.vue b/src/views/manage/blacklist/index.vue
index 43a1fd3..a873df4 100644
--- a/src/views/manage/blacklist/index.vue
+++ b/src/views/manage/blacklist/index.vue
@@ -344,8 +344,8 @@ export default {
         if (this.form.campusAgencyId) {
           this.changecampusAgency(this.form.campusAgencyId, 1, 2)
         }
-        if (this.form.abnormalCauseValue) {
-          this.changeabnormalCauseValue(this.form.abnormalCauseValue, 1)
+        if (this.form.abnormalCauseId) {
+          this.changeabnormalCauseValue(this.form.abnormalCauseId, 1)
         }
         this.open = true;
         this.title = "修改黑名单";
@@ -450,7 +450,6 @@ export default {
         this.queryParams.certificateIssuingDoctorId = null
       }
       // })
-      this.usergetListinfo(id, type)
     },
     //选中院区获取科室
     changecampusAgency(id, type, typetwo) {

From bafbcd541bea8218e2265e84188610775b055b91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Tue, 23 Apr 2024 09:59:19 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/blacklist/index.vue       |  21 +-
 src/views/manage/preHospitalized/index.vue |   8 +-
 src/views/manage/signRecord/index.vue      | 109 ++-----
 src/views/manage/visitin/index.vue         |   8 +-
 src/views/manage/visitout/index.vue        |   8 +-
 src/views/system/followup/index.vue        | 352 +++++----------------
 6 files changed, 135 insertions(+), 371 deletions(-)

diff --git a/src/views/manage/blacklist/index.vue b/src/views/manage/blacklist/index.vue
index a873df4..dc152c5 100644
--- a/src/views/manage/blacklist/index.vue
+++ b/src/views/manage/blacklist/index.vue
@@ -353,6 +353,15 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      if (this.form.hospitalAgencyId && this.hospitalAgencylist?.length > 0) {
+        this.form.hospitalAgencyName = this.hospitalAgencylist.find(e => e.id == this.form.hospitalAgencyId)?.agencyName
+      }
+      if (this.form.campusAgencyId && this.form_campusAgencylist?.length > 0) {
+        this.form.campusAgencyName = this.form_campusAgencylist.find(e => e.id == this.form.campusAgencyId)?.agencyName
+      }
+      if (this.form.departmentId && this.form_departmentlist?.length > 0) {
+        this.form.departmentName = this.form_departmentlist.find(e => e.id == this.form.departmentId)?.departmentName
+      }
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
@@ -487,20 +496,12 @@ export default {
       if (type) {
         this.form.departmentId = null
         this.form.wardId = null
+        this.getAgencyListinfo('HOSPITAL', this.form.hospitalAgencyId, type)
       } else {
         this.queryParams.departmentId = null
         this.queryParams.wardId = null
+        this.getAgencyListinfo('HOSPITAL', this.queryParams.hospitalAgencyId)
       }
-      this.getAgencyListinfo('HOSPITAL', this.queryParams.hospitalAgencyId, type)
-    },
-    //清空科室
-    cleardepartment(type) {
-      if (type) {
-        this.form.wardId = null
-      } else {
-        this.queryParams.wardId = null
-      }
-      this.getAgencyListinfo('CAMPUS', this.queryParams.campusAgencyId, type)
     },
     //获取异常原因
     causegetinfo() {
diff --git a/src/views/manage/preHospitalized/index.vue b/src/views/manage/preHospitalized/index.vue
index 03db30d..ee6e890 100644
--- a/src/views/manage/preHospitalized/index.vue
+++ b/src/views/manage/preHospitalized/index.vue
@@ -637,7 +637,7 @@ export default {
       if (this.form.departmentId && this.form_departmentlist?.length > 0) {
         this.form.departmentName = this.form_departmentlist.find(e => e.id == this.form.departmentId)?.departmentName
       }
-      if (this.form.hospitalAgencyId && this.form_wardlist?.length > 0) {
+      if (this.form.wardId && this.form_wardlist?.length > 0) {
         this.form.wardName = this.form_wardlist.find(e => e.id == this.form.wardId)?.departmentName
       }
       if (this.form.certificateIssuingDoctorId && this.form_attendingPhysicianlist?.length > 0) {
@@ -833,20 +833,22 @@ export default {
       if (type) {
         this.form.departmentId = null
         this.form.wardId = null
+        this.getAgencyListinfo('HOSPITAL', this.form.hospitalAgencyId, type)
       } else {
         this.queryParams.departmentId = null
         this.queryParams.wardId = null
+        this.getAgencyListinfo('HOSPITAL', this.queryParams.hospitalAgencyId)
       }
-      this.getAgencyListinfo('HOSPITAL', this.queryParams.hospitalAgencyId, type)
     },
     //清空科室
     cleardepartment(type) {
       if (type) {
         this.form.wardId = null
+        this.getAgencyListinfo('CAMPUS', this.form.campusAgencyId, type)
       } else {
         this.queryParams.wardId = null
+        this.getAgencyListinfo('CAMPUS', this.queryParams.campusAgencyId)
       }
-      this.getAgencyListinfo('CAMPUS', this.queryParams.campusAgencyId, type)
     },
     /** 下载模板操作 */
     importTemplate() {
diff --git a/src/views/manage/signRecord/index.vue b/src/views/manage/signRecord/index.vue
index 6dc1f9f..301c38e 100644
--- a/src/views/manage/signRecord/index.vue
+++ b/src/views/manage/signRecord/index.vue
@@ -559,7 +559,7 @@ export default {
       })
     },
     //获取下级单位
-    getAgencyListinfo(nodeType, id, type) {
+    getAgencyListinfo(nodeType, id) {
       let query = {
         nodeType: nodeType,
       }
@@ -571,116 +571,69 @@ export default {
         query.departmentId = id
       }
       getAgencyList(query).then(res => {
-        if (type) {
-          if (nodeType == 'HOSPITAL') {
-            this.form_campusAgencylist = res.data.campusList
-            this.form_departmentlist = res.data.departmentList
-          } else if (nodeType == 'CAMPUS') {
-            this.form_departmentlist = res.data.departmentList
-          }
-          this.form_wardlist = res.data.wardList
-        } else {
-          if (nodeType == 'HOSPITAL') {
-            this.campusAgencylist = res.data.campusList
-          }
-          if (nodeType == 'CAMPUS' || nodeType == 'HOSPITAL') {
-            this.departmentlist = res.data.departmentList
-          }
-          this.wardlist = res.data.wardList
+        if (nodeType == 'HOSPITAL') {
+          this.campusAgencylist = res.data.campusList
         }
+        if (nodeType == 'CAMPUS' || nodeType == 'HOSPITAL') {
+          this.departmentlist = res.data.departmentList
+        }
+        this.wardlist = res.data.wardList
       })
     },
     //选中医院获取院区
-    changehospitalAgency(id, type, typetwo) {
-      this.getAgencyListinfo('HOSPITAL', id, type)
+    changehospitalAgency(id) {
+      this.getAgencyListinfo('HOSPITAL', id)
       // let query = {
       //   agencyStatus: 'ON',
       //   nodeType: 'CAMPUS',
       //   parentId: id,
       // }
       // selectAgencyList(query).then(res => {
-      if (type) {
-        if (!typetwo) {
-          this.form.campusAgencyId = null
-          this.form.departmentId = null
-          this.form.wardId = null
-          this.form.certificateIssuingDoctorId = null
-        }
-      } else {
-        this.queryParams.campusAgencyId = null
-        this.queryParams.departmentId = null
-        this.queryParams.wardId = null
-        this.queryParams.certificateIssuingDoctorId = null
-      }
+      this.queryParams.campusAgencyId = null
+      this.queryParams.departmentId = null
+      this.queryParams.wardId = null
+      this.queryParams.certificateIssuingDoctorId = null
       // })
     },
     //选中院区获取科室
-    changecampusAgency(id, type, typetwo) {
-      this.getAgencyListinfo('CAMPUS', id, type)
+    changecampusAgency(id) {
+      this.getAgencyListinfo('CAMPUS', id)
       // let query = {
       //   nodeType: 'DEPARTMENT',
       //   agencyId: id,
       // }
       // getDepartmentList(query).then(res => {
-      if (type) {
-        if (!typetwo) {
-          this.form.departmentId = null
-          this.form.wardId = null
-        }
-      } else {
-        this.queryParams.departmentId = null
-        this.queryParams.wardId = null
-      }
+      this.queryParams.departmentId = null
+      this.queryParams.wardId = null
       // })
     },
     //选中科室获取病区
-    changedepartment(id, type, typetwo) {
-      this.getAgencyListinfo('DEPARTMENT', id, type)
+    changedepartment(id) {
+      this.getAgencyListinfo('DEPARTMENT', id)
       // let query = {
       //   nodeType: 'WARD',
       //   parentDepartmentId: id,
       // }
       // getDepartmentList(query).then(res => {
-      if (type) {
-        if (!typetwo) {
-          this.form.wardId = null
-        } else {
-          this.queryParams.wardId = null
-        }
-      }
+      this.queryParams.wardId = null
       // })
     },
     //清空医院
-    clearhospitalAgency(type) {
-      if (type) {
-        this.form.campusAgencyId = null
-        this.form.departmentId = null
-        this.form.wardId = null
-      } else {
-        this.queryParams.campusAgencyId = null
-        this.queryParams.departmentId = null
-        this.queryParams.wardId = null
-      }
+    clearhospitalAgency() {
+      this.queryParams.campusAgencyId = null
+      this.queryParams.departmentId = null
+      this.queryParams.wardId = null
     },
     //清空院区
-    clearcampusAgency(type) {
-      if (type) {
-        this.form.departmentId = null
-        this.form.wardId = null
-      } else {
-        this.queryParams.departmentId = null
-        this.queryParams.wardId = null
-      }
-      this.getAgencyListinfo('HOSPITAL', this.queryParams.hospitalAgencyId, type)
+    clearcampusAgency() {
+      this.queryParams.departmentId = null
+      this.queryParams.wardId = null
+      this.getAgencyListinfo('HOSPITAL', this.queryParams.hospitalAgencyId)
     },
     //清空科室
-    cleardepartment(type) {
-      if (type) {
-        this.form.wardId = null
-      } else {
-        this.queryParams.wardId = null
-      }
-      this.getAgencyListinfo('CAMPUS', this.queryParams.campusAgencyId, type)
+    cleardepartment() {
+      this.queryParams.wardId = null
+      this.getAgencyListinfo('CAMPUS', this.queryParams.campusAgencyId)
     },
     //续约
     handleContinue(row) {
diff --git a/src/views/manage/visitin/index.vue b/src/views/manage/visitin/index.vue
index 961ca4c..ed9c929 100644
--- a/src/views/manage/visitin/index.vue
+++ b/src/views/manage/visitin/index.vue
@@ -670,7 +670,7 @@ export default {
       if (this.form.departmentId && this.form_departmentlist?.length > 0) {
         this.form.departmentName = this.form_departmentlist.find(e => e.id == this.form.departmentId)?.departmentName
       }
-      if (this.form.hospitalAgencyId && this.form_wardlist?.length > 0) {
+      if (this.form.wardId && this.form_wardlist?.length > 0) {
         this.form.wardName = this.form_wardlist.find(e => e.id == this.form.wardId)?.departmentName
       }
       if (this.form.attendingPhysicianId && this.form_attendingPhysicianlist?.length > 0) {
@@ -853,20 +853,22 @@ export default {
       if (type) {
         this.form.departmentId = null
         this.form.wardId = null
+        this.getAgencyListinfo('HOSPITAL', this.form.hospitalAgencyId, type)
       } else {
         this.queryParams.departmentId = null
         this.queryParams.wardId = null
+        this.getAgencyListinfo('HOSPITAL', this.queryParams.hospitalAgencyId)
       }
-      this.getAgencyListinfo('HOSPITAL', this.queryParams.hospitalAgencyId, type)
     },
     //清空科室
     cleardepartment(type) {
       if (type) {
         this.form.wardId = null
+        this.getAgencyListinfo('CAMPUS', this.form.campusAgencyId, type)
       } else {
         this.queryParams.wardId = null
+        this.getAgencyListinfo('CAMPUS', this.queryParams.campusAgencyId)
       }
-      this.getAgencyListinfo('CAMPUS', this.queryParams.campusAgencyId, type)
     },
     /** 下载模板操作 */
     importTemplate() {
diff --git a/src/views/manage/visitout/index.vue b/src/views/manage/visitout/index.vue
index 8bb58a0..d1cd728 100644
--- a/src/views/manage/visitout/index.vue
+++ b/src/views/manage/visitout/index.vue
@@ -790,7 +790,7 @@ export default {
       if (this.form.departmentId && this.form_departmentlist?.length > 0) {
         this.form.departmentName = this.form_departmentlist.find(e => e.id == this.form.departmentId)?.departmentName
       }
-      if (this.form.hospitalAgencyId && this.form_wardlist?.length > 0) {
+      if (this.form.wardId && this.form_wardlist?.length > 0) {
         this.form.wardName = this.form_wardlist.find(e => e.id == this.form.wardId)?.departmentName
       }
       if (this.form.attendingPhysicianId && this.form_attendingPhysicianlist?.length > 0) {
@@ -990,20 +990,22 @@ export default {
       if (type) {
         this.form.departmentId = null
         this.form.wardId = null
+        this.getAgencyListinfo('HOSPITAL', this.form.hospitalAgencyId, type)
       } else {
         this.queryParams.departmentId = null
         this.queryParams.wardId = null
+        this.getAgencyListinfo('HOSPITAL', this.queryParams.hospitalAgencyId)
       }
-      this.getAgencyListinfo('HOSPITAL', this.queryParams.hospitalAgencyId, type)
     },
     //清空科室
     cleardepartment(type) {
       if (type) {
         this.form.wardId = null
+        this.getAgencyListinfo('CAMPUS', this.form.campusAgencyId, type)
       } else {
         this.queryParams.wardId = null
+        this.getAgencyListinfo('CAMPUS', this.queryParams.campusAgencyId)
       }
-      this.getAgencyListinfo('CAMPUS', this.queryParams.campusAgencyId, type)
     },
     /** 下载模板操作 */
     importTemplate() {
diff --git a/src/views/system/followup/index.vue b/src/views/system/followup/index.vue
index 09c853e..ecc40c8 100644
--- a/src/views/system/followup/index.vue
+++ b/src/views/system/followup/index.vue
@@ -4,142 +4,49 @@
       <el-tab-pane label="未执行" name="UNEXECUTED"></el-tab-pane>
       <el-tab-pane label="已执行" name="EXECUTED"></el-tab-pane>
     </el-tabs>
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-    >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="随访时间" prop="startDate">
-        <el-date-picker
-          v-model="intentionalTime"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始日期"
-          style="width: 300px"
-          value-format="yyyy-MM-dd"
-          end-placeholder="结束日期"
-          @change="chooseTime"
-        >
+        <el-date-picker v-model="intentionalTime" type="daterange" range-separator="至" start-placeholder="开始日期"
+          style="width: 300px" value-format="yyyy-MM-dd" end-placeholder="结束日期" @change="chooseTime">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="姓名" prop="patientName">
-        <el-input
-          v-model="queryParams.patientName"
-          placeholder="请输入姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.patientName" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="电话" prop="patientPhone">
-        <el-input
-          v-model="queryParams.patientPhone"
-          placeholder="请输入电话"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.patientPhone" placeholder="请输入电话" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
 
       <el-form-item label="医院" prop="hospitalAgencyId">
-        <el-select
-          v-model="queryParams.hospitalAgencyId"
-          filterable
-          placeholder="请选择医院"
-          style="width: 200px"
-          clearable
-          @clear="clearhospitalAgency"
-          @change="changehospitalAgency"
-        >
-          <el-option
-            v-for="item in hospitalAgencylist"
-            :key="item.id"
-            :label="item.agencyName"
-            :value="item.id"
-          >
+        <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width: 200px" clearable
+          @clear="clearhospitalAgency" @change="changehospitalAgency">
+          <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item
-        label="院区"
-        prop="campusAgencyId"
-        v-if="queryParams.hospitalAgencyId"
-      >
-        <el-select
-          v-model="queryParams.campusAgencyId"
-          filterable
-          placeholder="请选择院区"
-          style="width: 200px"
-          clearable
-          @clear="clearcampusAgency"
-          @change="changecampusAgency"
-        >
-          <el-option
-            v-for="item in campusAgencylist"
-            :key="item.id"
-            :label="item.agencyName"
-            :value="item.id"
-          >
+      <el-form-item label="院区" prop="campusAgencyId" v-if="queryParams.hospitalAgencyId">
+        <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width: 200px" clearable
+          @clear="clearcampusAgency" @change="changecampusAgency">
+          <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item
-        label="科室"
-        prop="departmentId"
-        v-if="queryParams.hospitalAgencyId"
-      >
-        <el-select
-          v-model="queryParams.departmentId"
-          filterable
-          placeholder="请选择科室"
-          style="width: 200px"
-          clearable
-          @clear="cleardepartment"
-          @change="changedepartment"
-        >
-          <el-option
-            v-for="item in departmentlist"
-            :key="item.id"
-            :label="item.departmentName"
-            :value="item.id"
-          >
+      <el-form-item label="科室" prop="departmentId" v-if="queryParams.hospitalAgencyId">
+        <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width: 200px" clearable
+          @clear="cleardepartment" @change="changedepartment">
+          <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item
-        label="病区"
-        prop="wardId"
-        v-if="queryParams.hospitalAgencyId"
-      >
-        <el-select
-          v-model="queryParams.wardId"
-          filterable
-          placeholder="请选择病区"
-          style="width: 200px"
-          clearable
-        >
-          <el-option
-            v-for="item in wardlist"
-            :key="item.id"
-            :label="item.departmentName"
-            :value="item.id"
-          >
+      <el-form-item label="病区" prop="wardId" v-if="queryParams.hospitalAgencyId">
+        <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width: 200px" clearable>
+          <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="就诊类型" prop="suitRange">
-        <el-select
-          v-model="queryParams.suitRange"
-          placeholder="请选择就诊类型"
-          clearable
-          @change="change"
-        >
-          <el-option
-            v-for="item in visitoptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
+        <el-select v-model="queryParams.suitRange" placeholder="请选择就诊类型" clearable @change="change">
+          <el-option v-for="item in visitoptions" :key="item.value" :label="item.label" :value="item.value">
           </el-option>
           <!-- <el-option
             v-for="dict in dict.type.visit_type"
@@ -150,91 +57,41 @@
         </el-select>
       </el-form-item>
       <el-form-item label="就诊流水号" prop="visitSerialNumber">
-        <el-input
-          v-model="queryParams.visitSerialNumber"
-          placeholder="请输入就诊流水号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.visitSerialNumber" placeholder="请输入就诊流水号" clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
 
       <el-form-item label="门诊/出院时间" prop="intentionalTimeStart">
-        <el-date-picker
-          @change="mzchange"
-          v-model="mzTime"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始日期"
-          style="width: 300px"
-          value-format="yyyy-MM-dd"
-          end-placeholder="结束日期"
-        >
+        <el-date-picker @change="mzchange" v-model="mzTime" type="daterange" range-separator="至"
+          start-placeholder="开始日期" style="width: 300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
 
       <el-form-item label="入院时间" prop="intentionalTimeStart">
-        <el-date-picker
-          v-model="ryTime"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始日期"
-          style="width: 300px"
-          value-format="yyyy-MM-dd"
-          end-placeholder="结束日期"
-          @change="rychange"
-        >
+        <el-date-picker v-model="ryTime" type="daterange" range-separator="至" start-placeholder="开始日期"
+          style="width: 300px" value-format="yyyy-MM-dd" end-placeholder="结束日期" @change="rychange">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="诊断" prop="mainDiagnosis">
-        <el-input
-          v-model="queryParams.mainDiagnosis"
-          placeholder="请选择诊断"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.mainDiagnosis" placeholder="请选择诊断" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
 
-      <el-form-item
-        label="主治医生"
-        prop="attendingPhysicianId"
-        v-if="queryParams.hospitalAgencyId"
-      >
-        <el-select
-          v-model="queryParams.attendingPhysicianId"
-          style="width: 200px"
-          filterable
-          placeholder="请选择主治医生"
-          clearable
-        >
-          <el-option
-            v-for="item in attendingPhysicianlist"
-            :key="item.userId"
-            :label="item.nickName"
-            :value="item.userId"
-          >
+      <el-form-item label="主治医生" prop="attendingPhysicianId" v-if="queryParams.hospitalAgencyId">
+        <el-select v-model="queryParams.attendingPhysicianId" style="width: 200px" filterable placeholder="请选择主治医生"
+          clearable>
+          <el-option v-for="item in attendingPhysicianlist" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
           </el-option>
         </el-select>
       </el-form-item>
 
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
-    <el-table
-      v-loading="loading"
-      :data="taskExecuteRecordList"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="taskExecuteRecordList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="姓名" align="center" prop="patientName" />
       <el-table-column label="电话" align="center" prop="patientPhone" />
@@ -249,62 +106,31 @@
       <el-table-column label="科室名称" align="center" prop="departmentName" />
       <el-table-column label="病区名称" align="center" prop="wardName" />
 
-      <el-table-column
-        label="门诊/住院号"
-        align="center"
-        prop="inHospitalNumber"
-        width="100"
-      />
-      <el-table-column
-        label="就诊流水号"
-        align="center"
-        prop="visitSerialNumber"
-        width="100"
-      />
+      <el-table-column label="门诊/住院号" align="center" prop="inHospitalNumber" width="100" />
+      <el-table-column label="就诊流水号" align="center" prop="visitSerialNumber" width="100" />
       <el-table-column label="诊断" align="center" prop="mainDiagnosis" />
       <el-table-column label="手术名称" align="center" prop="surgicalName" />
-      <el-table-column
-        label="主治医生"
-        align="center"
-        prop="attendingPhysicianName"
-      />
+      <el-table-column label="主治医生" align="center" prop="attendingPhysicianName" />
       <el-table-column label="就诊类型" align="center" prop="suitRange">
         <template slot-scope="scope">
-          <span
-            >{{ scope.row.suitRange == "OUTPATIENT_SERVICE" ? "门诊" : "" }}
+          <span>{{ scope.row.suitRange == "OUTPATIENT_SERVICE" ? "门诊" : "" }}
             {{ scope.row.suitRange == "IN_THE_HOSPITAL" ? "在院" : "" }}
             {{ scope.row.suitRange == "DISCHARGE" ? "出院" : "" }}
           </span>
-        </template></el-table-column
-      >
-      <el-table-column
-        label="入院时间"
-        align="center"
-        prop="admissionTime"
-        width="180"
-      >
+        </template></el-table-column>
+      <el-table-column label="入院时间" align="center" prop="admissionTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.admissionTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="门诊/出院时间"
-        align="center"
-        prop="visitOrDischargeTime"
-        width="180"
-      >
+      <el-table-column label="门诊/出院时间" align="center" prop="visitOrDischargeTime" width="180">
         <template slot-scope="scope">
           <span>{{
-            parseTime(scope.row.visitOrDischargeTime, "{y}-{m}-{d}")
-          }}</span>
+      parseTime(scope.row.visitOrDischargeTime, "{y}-{m}-{d}")
+    }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="随访时间"
-        align="center"
-        prop="executeTime"
-        width="180"
-      >
+      <el-table-column label="随访时间" align="center" prop="executeTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.executeTime, "{y}-{m}-{d}") }}</span>
         </template>
@@ -313,44 +139,22 @@
       <el-table-column label="随访模板" align="center" prop="templateName">
       </el-table-column>
 
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-        fixed="right"
-      >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
-          <el-button
-            v-if="queryParams.nodeExecuteStatus == 'UNEXECUTED'"
-            size="mini"
-            type="text"
-            icon="el-icon-bank-card"
-            @click="handleUpdate(scope.row)"
-            >处理</el-button
-          >
-          <el-button
-            v-if="queryParams.nodeExecuteStatus == 'EXECUTED'"
-            size="mini"
-            type="text"
-            icon="el-icon-notebook-2"
-            @click="handleadtail(scope.row)"
-            >详情</el-button
-          >
+          <el-button v-if="queryParams.nodeExecuteStatus == 'UNEXECUTED'" size="mini" type="text"
+            icon="el-icon-bank-card" @click="handleUpdate(scope.row)">处理</el-button>
+          <el-button v-if="queryParams.nodeExecuteStatus == 'EXECUTED'" size="mini" type="text"
+            icon="el-icon-notebook-2" @click="handleadtail(scope.row)">详情</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
   </div>
 </template>
 
-  <script>
+<script>
 
 import { manualFollowUpList } from "@/api/system/followup"
 import { usergetList } from "@/api/unitconfig/patientConfiguration";
@@ -465,24 +269,24 @@ export default {
         this.mzTime = [],
         this.ryTime = [],
         this.queryParams.dischargeStartTime = null
-        this.queryParams.dischargeEndTime = null
-        this.queryParams.clinicalStartTime = null
-        this.queryParams.clinicalEndTime = null
-        this.queryParams.followStartTime = null
-        this.queryParams.followEndTime = null
-        this.queryParams.admissionEndTime=null
-        this.queryParams.admissionStartTime=null
-        this.queryParams.mainDiagnosis=null
-        this.queryParams.visitSerialNumber=null
-        this.queryParams.attendingPhysicianId=null
-        this.queryParams.suitRange=null
-        this.queryParams.patientName=null
-        this.queryParams.hospitalAgencyId=null
-        this.queryParams.campusAgencyId=null
-        this.queryParams.departmentId=null
-        this.queryParams.wardId=null
-        this.queryParams.patientPhone=null
-        this.getList();
+      this.queryParams.dischargeEndTime = null
+      this.queryParams.clinicalStartTime = null
+      this.queryParams.clinicalEndTime = null
+      this.queryParams.followStartTime = null
+      this.queryParams.followEndTime = null
+      this.queryParams.admissionEndTime = null
+      this.queryParams.admissionStartTime = null
+      this.queryParams.mainDiagnosis = null
+      this.queryParams.visitSerialNumber = null
+      this.queryParams.attendingPhysicianId = null
+      this.queryParams.suitRange = null
+      this.queryParams.patientName = null
+      this.queryParams.hospitalAgencyId = null
+      this.queryParams.campusAgencyId = null
+      this.queryParams.departmentId = null
+      this.queryParams.wardId = null
+      this.queryParams.patientPhone = null
+      this.getList();
     },
     change(e) {
       if (e == 'DISCHARGE') {
@@ -771,7 +575,7 @@ export default {
           age: row.birthDate ? getAge(row.birthDate) : "",
           manageRouteId: row.manageRouteId,
           manageRouteNodeId: row.manageRouteNodeId,
-          visitRecordId:row.visitRecordId,
+          visitRecordId: row.visitRecordId,
 
           departmentId: row.departmentId,
           departmentName: row.departmentName,
@@ -789,11 +593,11 @@ export default {
           patientId: row.patientId,
           taskType: row.taskType,
           templateId: row.templateId,
-          manageRouteId:row.manageRouteId,
+          manageRouteId: row.manageRouteId,
 
-          visitRecordId:row.visitRecordId,
-          taskExecuteRecordId:row.taskExecuteRecordId,
-          routeHandleRemark:row.routeHandleRemark?row.routeHandleRemark:null,
+          visitRecordId: row.visitRecordId,
+          taskExecuteRecordId: row.taskExecuteRecordId,
+          routeHandleRemark: row.routeHandleRemark ? row.routeHandleRemark : null,
         },
       });
       console.log(row)
@@ -857,4 +661,4 @@ export default {
     },
   },
 };
-  </script>
+</script>

From d7d84aef454847c3b3ec5e2f3ada8e93da0a2773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Tue, 23 Apr 2024 10:08:30 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/manualReview/index.vue    |  8 +++++++-
 src/views/manage/patientInfo/index.vue     |  8 +++++++-
 src/views/manage/preHospitalized/index.vue | 16 ++++++++++++++--
 src/views/manage/signRecord/index.vue      |  8 +++++++-
 src/views/manage/visitin/index.vue         | 16 ++++++++++++++--
 src/views/manage/visitout/index.vue        | 16 ++++++++++++++--
 src/views/system/followup/index.vue        |  8 +++++++-
 7 files changed, 70 insertions(+), 10 deletions(-)

diff --git a/src/views/manage/manualReview/index.vue b/src/views/manage/manualReview/index.vue
index b4394ff..d04cc5b 100644
--- a/src/views/manage/manualReview/index.vue
+++ b/src/views/manage/manualReview/index.vue
@@ -348,7 +348,13 @@ export default {
         //清空科室
         cleardepartment() {
             this.queryParams.wardId = null
-            this.getAgencyListinfo('CAMPUS', this.queryParams.campusAgencyId)
+            if (this.queryParams.departmentId) {
+                this.getAgencyListinfo('DEPARTMENT', this.queryParams.departmentId)
+            } else if (this.queryParams.campusAgencyId) {
+                this.getAgencyListinfo('CAMPUS', this.queryParams.campusAgencyId)
+            } else if (this.queryParams.hospitalAgencyId) {
+                this.getAgencyListinfo('HOSPITAL', this.queryParams.hospitalAgencyId)
+            }
         },
     }
 };
diff --git a/src/views/manage/patientInfo/index.vue b/src/views/manage/patientInfo/index.vue
index 4bafb27..4014617 100644
--- a/src/views/manage/patientInfo/index.vue
+++ b/src/views/manage/patientInfo/index.vue
@@ -381,7 +381,13 @@ export default {
     //清空科室
     cleardepartment() {
       this.queryParams.wardId = null
-      this.getAgencyListinfo('CAMPUS', this.queryParams.campusAgencyId)
+      if (this.queryParams.departmentId) {
+        this.getAgencyListinfo('DEPARTMENT', this.queryParams.departmentId)
+      } else if (this.queryParams.campusAgencyId) {
+        this.getAgencyListinfo('CAMPUS', this.queryParams.campusAgencyId)
+      } else if (this.queryParams.hospitalAgencyId) {
+        this.getAgencyListinfo('HOSPITAL', this.queryParams.hospitalAgencyId)
+      }
     },
   }
 };
diff --git a/src/views/manage/preHospitalized/index.vue b/src/views/manage/preHospitalized/index.vue
index ee6e890..5beab4b 100644
--- a/src/views/manage/preHospitalized/index.vue
+++ b/src/views/manage/preHospitalized/index.vue
@@ -844,10 +844,22 @@ export default {
     cleardepartment(type) {
       if (type) {
         this.form.wardId = null
-        this.getAgencyListinfo('CAMPUS', this.form.campusAgencyId, type)
+        if (this.form.departmentId) {
+          this.getAgencyListinfo('DEPARTMENT', this.form.departmentId, type)
+        } else if (this.form.campusAgencyId) {
+          this.getAgencyListinfo('CAMPUS', this.form.campusAgencyId, type)
+        } else if (this.form.hospitalAgencyId) {
+          this.getAgencyListinfo('HOSPITAL', this.form.hospitalAgencyId, type)
+        }
       } else {
         this.queryParams.wardId = null
-        this.getAgencyListinfo('CAMPUS', this.queryParams.campusAgencyId)
+        if (this.queryParams.departmentId) {
+          this.getAgencyListinfo('DEPARTMENT', this.queryParams.departmentId)
+        } else if (this.queryParams.campusAgencyId) {
+          this.getAgencyListinfo('CAMPUS', this.queryParams.campusAgencyId)
+        } else if (this.queryParams.hospitalAgencyId) {
+          this.getAgencyListinfo('HOSPITAL', this.queryParams.hospitalAgencyId)
+        }
       }
     },
     /** 下载模板操作 */
diff --git a/src/views/manage/signRecord/index.vue b/src/views/manage/signRecord/index.vue
index 301c38e..5c16d57 100644
--- a/src/views/manage/signRecord/index.vue
+++ b/src/views/manage/signRecord/index.vue
@@ -633,7 +633,13 @@ export default {
     //清空科室
     cleardepartment() {
       this.queryParams.wardId = null
-      this.getAgencyListinfo('CAMPUS', this.queryParams.campusAgencyId)
+      if (this.queryParams.departmentId) {
+        this.getAgencyListinfo('DEPARTMENT', this.queryParams.departmentId)
+      } else if (this.queryParams.campusAgencyId) {
+        this.getAgencyListinfo('CAMPUS', this.queryParams.campusAgencyId)
+      } else if (this.queryParams.hospitalAgencyId) {
+        this.getAgencyListinfo('HOSPITAL', this.queryParams.hospitalAgencyId)
+      }
     },
     //续约
     handleContinue(row) {
diff --git a/src/views/manage/visitin/index.vue b/src/views/manage/visitin/index.vue
index ed9c929..60afdfe 100644
--- a/src/views/manage/visitin/index.vue
+++ b/src/views/manage/visitin/index.vue
@@ -864,10 +864,22 @@ export default {
     cleardepartment(type) {
       if (type) {
         this.form.wardId = null
-        this.getAgencyListinfo('CAMPUS', this.form.campusAgencyId, type)
+        if (this.form.departmentId) {
+          this.getAgencyListinfo('DEPARTMENT', this.form.departmentId, type)
+        } else if (this.form.campusAgencyId) {
+          this.getAgencyListinfo('CAMPUS', this.form.campusAgencyId, type)
+        } else if (this.form.hospitalAgencyId) {
+          this.getAgencyListinfo('HOSPITAL', this.form.hospitalAgencyId, type)
+        }
       } else {
         this.queryParams.wardId = null
-        this.getAgencyListinfo('CAMPUS', this.queryParams.campusAgencyId)
+        if (this.queryParams.departmentId) {
+          this.getAgencyListinfo('DEPARTMENT', this.queryParams.departmentId)
+        } else if (this.queryParams.campusAgencyId) {
+          this.getAgencyListinfo('CAMPUS', this.queryParams.campusAgencyId)
+        } else if (this.queryParams.hospitalAgencyId) {
+          this.getAgencyListinfo('HOSPITAL', this.queryParams.hospitalAgencyId)
+        }
       }
     },
     /** 下载模板操作 */
diff --git a/src/views/manage/visitout/index.vue b/src/views/manage/visitout/index.vue
index d1cd728..edd0972 100644
--- a/src/views/manage/visitout/index.vue
+++ b/src/views/manage/visitout/index.vue
@@ -1001,10 +1001,22 @@ export default {
     cleardepartment(type) {
       if (type) {
         this.form.wardId = null
-        this.getAgencyListinfo('CAMPUS', this.form.campusAgencyId, type)
+        if (this.form.departmentId) {
+          this.getAgencyListinfo('DEPARTMENT', this.form.departmentId, type)
+        } else if (this.form.campusAgencyId) {
+          this.getAgencyListinfo('CAMPUS', this.form.campusAgencyId, type)
+        } else if (this.form.hospitalAgencyId) {
+          this.getAgencyListinfo('HOSPITAL', this.form.hospitalAgencyId, type)
+        }
       } else {
         this.queryParams.wardId = null
-        this.getAgencyListinfo('CAMPUS', this.queryParams.campusAgencyId)
+        if (this.queryParams.departmentId) {
+          this.getAgencyListinfo('DEPARTMENT', this.queryParams.departmentId)
+        } else if (this.queryParams.campusAgencyId) {
+          this.getAgencyListinfo('CAMPUS', this.queryParams.campusAgencyId)
+        } else if (this.queryParams.hospitalAgencyId) {
+          this.getAgencyListinfo('HOSPITAL', this.queryParams.hospitalAgencyId)
+        }
       }
     },
     /** 下载模板操作 */
diff --git a/src/views/system/followup/index.vue b/src/views/system/followup/index.vue
index ecc40c8..fa1c0d9 100644
--- a/src/views/system/followup/index.vue
+++ b/src/views/system/followup/index.vue
@@ -387,7 +387,13 @@ export default {
     //清空科室
     cleardepartment() {
       this.queryParams.wardId = null
-      this.getAgencyListinfo('CAMPUS', this.queryParams.campusAgencyId)
+      if (this.queryParams.departmentId) {
+        this.getAgencyListinfo('DEPARTMENT', this.queryParams.departmentId)
+      } else if (this.queryParams.campusAgencyId) {
+        this.getAgencyListinfo('CAMPUS', this.queryParams.campusAgencyId)
+      } else if (this.queryParams.hospitalAgencyId) {
+        this.getAgencyListinfo('HOSPITAL', this.queryParams.hospitalAgencyId)
+      }
     },
     //获取医院list
     selectAgencyinfo() {

From cc3d50ba35ec7f71fc8c1aa0c9927691e12709ad Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Tue, 23 Apr 2024 10:25:13 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/Editorxj/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/Editorxj/index.vue b/src/views/system/Editorxj/index.vue
index d1a9cd0..224be24 100644
--- a/src/views/system/Editorxj/index.vue
+++ b/src/views/system/Editorxj/index.vue
@@ -190,7 +190,7 @@ export default {
 };
 </script>
 
-<style>
+<style lang="scss" scoped>
 .editor, .ql-toolbar {
   white-space: pre-wrap !important;
   line-height: normal !important;

From 4883b055177b952ddfab59e7b37f8e1e17acbd2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Tue, 23 Apr 2024 10:43:51 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/blacklist/index.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/manage/blacklist/index.vue b/src/views/manage/blacklist/index.vue
index dc152c5..36cc0b8 100644
--- a/src/views/manage/blacklist/index.vue
+++ b/src/views/manage/blacklist/index.vue
@@ -172,7 +172,6 @@ export default {
   data() {
     //验证身份证
     var isCardId = (rule, value, callback) => {
-      console.log(value)
       if (value == null) {
         callback(new Error("请输入患者身份证号"));
       } else {
@@ -362,6 +361,12 @@ export default {
       if (this.form.departmentId && this.form_departmentlist?.length > 0) {
         this.form.departmentName = this.form_departmentlist.find(e => e.id == this.form.departmentId)?.departmentName
       }
+      if (this.form.abnormalCauseId && this.abnormalCauselist?.length > 0) {
+        this.form.abnormalCauseValue = this.abnormalCauselist.find(e => e.id == this.form.abnormalCauseId)?.abnormalCauseValue
+      }
+      if (this.form.supplementIllustrateId && this.supplementIllustratelist?.length > 0) {
+        this.form.supplementIllustrateValue = this.supplementIllustratelist.find(e => e.id == this.form.supplementIllustrateId)?.abnormalCauseValue
+      }
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {