From 007d3884ad259883d7a5db6714876e46525ae717 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 26 十一月 2024 14:49:38 +0800
Subject: [PATCH] 测试完成

---
 src/api/AiCentre/index.js                                |    3 
 src/views/repositoryai/verbaltrick/index.vue             |   14 
 dist.zip                                                 |    0 
 vue.config.js                                            |    3 
 src/views/repositoryai/templateku/configurat/index.vue   |  184 +++++---
 src/views/patient/patient/index.vue                      |   13 
 src/assets/logo/logoxh.png                               |    0 
 src/views/outsideChainnew.vue                            |  199 +++++----
 src/utils/request.js                                     |    5 
 /dev/null                                                |    0 
 src/views/patient/patient/ExternalPatient.vue            |  282 ++----------
 src/views/followvisit/record/detailpage/index.vue        |  245 +++++++++--
 src/views/repositoryai/verbaltrick/particulars/index.vue |   10 
 src/components/Regular/index.vue                         |   40 +
 src/views/patient/patient/profile/index.vue              |   28 +
 src/api/AiCentre/patientexternal.js                      |   33 +
 src/assets/logo/logoxh2.png                              |    0 
 src/views/patient/propaganda/Missioncreation.vue         |    1 
 src/views/patient/propaganda/particty.vue                |  141 ++++-
 src/api/AiCentre/external.js                             |   32 +
 src/views/followvisit/discharge/index.vue                |   16 
 21 files changed, 725 insertions(+), 524 deletions(-)

diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..d754c67
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/api/AiCentre/external.js b/src/api/AiCentre/external.js
index 5bccb7d..410edef 100644
--- a/src/api/AiCentre/external.js
+++ b/src/api/AiCentre/external.js
@@ -3,25 +3,25 @@
 // 澶栭摼鑾峰彇闅忚
 export function getExternalfollowup(data) {
   return request({
-    url: "/servicetask/getScriptInfoByCondition",
+    url: "/smartor/servicetask/getScriptInfoByCondition",
     // url: "/servicetask/getScriptInfoByCondition",
     method: "post",
     data: data
   });
 }
-// 鍒犻櫎閫氱敤妯℃澘
+// 鍒犻櫎閫氱敤妯℃澘s
 export function geturlinfo(id) {
   return request({
-    url: "/outPath/getInfoByParam",
+    url: "/smartor/outPath/getInfoByParam",
     method: 'post',
-    data: {param:id}
+    params: {param:id}
   });
 }
 // 鎻愪氦銆侀殢璁�
 export function SetsaveQuestionAnswer(data) {
   return request({
     // url: "/ivrtaskcalldetail/saveQuestionAnswer",
-    url: "/serviceSubtask/saveQuestionAnswer",
+    url: "/smartor/serviceSubtask/saveQuestionAnswer",
     method: "post",
     data: data
   });
@@ -30,7 +30,7 @@
 // 缂撳瓨闂嵎
 export function Cachequestionnaire(data) {
   return request({
-    url: "/subtaskAnswer/saveQuestionCache",
+    url: "/smartor/subtaskAnswer/saveQuestionCache",
     method: "post",
     data: data
   });
@@ -38,7 +38,7 @@
 // 鎷跨紦瀛橀棶鍗�
 export function getCachequestionnaire(data) {
   return request({
-    url: "/subtaskAnswer/getQuestionCache",
+    url: "/smartor/subtaskAnswer/getQuestionCache",
     method: "post",
     data: data
   });
@@ -46,7 +46,7 @@
 // 鎻愪氦闂嵎
 export function Submitaquestionnaire(data) {
   return request({
-    url: "/subtaskAnswer/saveQuestionAnswer",
+    url: "/smartor/subtaskAnswer/saveQuestionAnswer",
     method: "post",
     data: data
   });
@@ -68,3 +68,19 @@
     data: data
   });
 }
+// 鑾峰彇璇煶鏈嶅姟锛堝唴锛�
+export function getPersonVoices(data) {
+  return request({
+    url: "/smartor/smartor/serviceSubtaskDetail/getPersonVoice",
+    method: "post",
+    data: data
+  });
+}
+// 鑾峰彇璇煶鏈嶅姟锛堝唴锛�
+export function updatePersonVoices(data) {
+  return request({
+    url: "/smartor/serviceSubtaskDetail/batchEdit",
+    method: "post",
+    data: data
+  });
+}
diff --git a/src/api/AiCentre/index.js b/src/api/AiCentre/index.js
index 59fe59e..1265370 100644
--- a/src/api/AiCentre/index.js
+++ b/src/api/AiCentre/index.js
@@ -8,5 +8,4 @@
 export * from './SingleTask'
 export * from './external'
 export * from './Homeimage'
-
-
+export * from './patientexternal'
diff --git a/src/api/AiCentre/patientexternal.js b/src/api/AiCentre/patientexternal.js
new file mode 100644
index 0000000..6a89b43
--- /dev/null
+++ b/src/api/AiCentre/patientexternal.js
@@ -0,0 +1,33 @@
+import request from "@/utils/request";
+
+
+// 鍒犻櫎澶栭儴鎮h�呰〃
+export function delExternal(Id) {
+  return request({
+    url: "/smartor/import/remove/" + Id,
+    method: "get",
+  });
+}
+// 鏌ヨ澶栭儴鎮h�呰〃
+export function Externallist(data) {
+  return request({
+    url: "/smartor/import/list",
+    method: "post",
+    data: data,
+  });
+}
+// 淇敼澶栭儴鎮h�呰〃
+export function Externaledit(data) {
+  return request({
+    url: "/smartor/import/edit",
+    method: "post",
+    data: data,
+  });
+}
+// 鎮h�呰鎯�
+export function Externalpatient(userId) {
+  return request({
+    url: '/smartor/import/getInfo/' + userId,
+    method: 'get',
+  })
+};
diff --git a/src/assets/logo/logoxh.png b/src/assets/logo/logoxh.png
index 580aeca..c0760d3 100644
--- a/src/assets/logo/logoxh.png
+++ b/src/assets/logo/logoxh.png
Binary files differ
diff --git a/src/assets/logo/logoxh1.png b/src/assets/logo/logoxh1.png
deleted file mode 100644
index c0760d3..0000000
--- a/src/assets/logo/logoxh1.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/logo/logoxh2.png b/src/assets/logo/logoxh2.png
new file mode 100644
index 0000000..580aeca
--- /dev/null
+++ b/src/assets/logo/logoxh2.png
Binary files differ
diff --git a/src/components/Regular/index.vue b/src/components/Regular/index.vue
index 04dc972..8985f3e 100644
--- a/src/components/Regular/index.vue
+++ b/src/components/Regular/index.vue
@@ -1,6 +1,10 @@
 <template>
   <div>
-    <div class="topicxq" v-for="item in TargetoptionList">
+    <div
+      class="topicxq"
+      v-for="item in TargetoptionList"
+      v-if="item.isoperation != 3"
+    >
       <el-form :inline="true" :rules="rules" :model="item" label-width="80px">
         <el-row :gutter="10">
           <el-col :span="12"
@@ -47,11 +51,11 @@
           ></el-col>
         </el-row>
         <el-form-item label="缁撴潫瀵硅瘽">
-              <el-radio-group v-model="item.isEnd">
-                <el-radio :label="1">鏄�</el-radio>
-                <el-radio :label="0">鍚�</el-radio>
-              </el-radio-group>
-            </el-form-item>
+          <el-radio-group v-model="item.isEnd">
+            <el-radio :label="1">鏄�</el-radio>
+            <el-radio :label="0">鍚�</el-radio>
+          </el-radio-group>
+        </el-form-item>
 
         <el-row :gutter="10" v-if="intent">
           <el-col :span="12"
@@ -78,17 +82,17 @@
           ></el-col>
         </el-row>
         <el-row :gutter="10" v-if="scriptType == 1">
-                      <el-form-item label="閫変腑鎻愮ず">
-                        <el-input
-                          style="width: 24vw"
-                          type="textarea"
-                          autosize
-                          placeholder="璇疯緭鍏ュ唴瀹�"
-                          v-model="item.prompt"
-                        >
-                        </el-input
-                      ></el-form-item>
-                    </el-row>
+          <el-form-item label="閫変腑鎻愮ず">
+            <el-input
+              style="width: 24vw"
+              type="textarea"
+              autosize
+              placeholder="璇疯緭鍏ュ唴瀹�"
+              v-model="item.prompt"
+            >
+            </el-input
+          ></el-form-item>
+        </el-row>
         <el-row>
           <el-form-item label="鍏抽敭瀛�(鍚�)" prop="desc" v-if="hasValue">
             <div class="xinz-inf">
@@ -288,7 +292,7 @@
     },
     scriptType: {
       type: String,
-      default: '1',
+      default: "1",
     },
     addoption: {
       type: Boolean,
diff --git a/src/utils/request.js b/src/utils/request.js
index 9d1aebb..3b6bcf6 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -49,11 +49,12 @@
       const s_url = sessionObj.url;                  // 璇锋眰鍦板潃
       const s_data = sessionObj.data;                // 璇锋眰鏁版嵁
       const s_time = sessionObj.time;                // 璇锋眰鏃堕棿
-      const interval = 4;                         // 闂撮殧鏃堕棿(ms)锛屽皬浜庢鏃堕棿瑙嗕负閲嶅鎻愪氦
+      const interval = 1;                         // 闂撮殧鏃堕棿(ms)锛屽皬浜庢鏃堕棿瑙嗕负閲嶅鎻愪氦
       if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
         const message = '鏁版嵁姝e湪澶勭悊锛岃鍕块噸澶嶆彁浜�';
         console.warn(`[${s_url}]: ` + message)
-        return Promise.reject(new Error(message))
+        return Promise.reject(message)
+        // return Promise.reject(new Error(message))
       } else {
         cache.session.setJSON('sessionObj', requestObj)
       }
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 780a4eb..7548036 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -410,6 +410,7 @@
         <el-table-column
           label="鎿嶄綔"
           align="center"
+          fixed="right"
           width="200"
           class-name="small-padding fixed-width"
         >
@@ -829,7 +830,7 @@
       this.loading = true;
       getTaskservelist(this.topqueryParams).then((response) => {
         this.userList = response.rows[0].serviceSubtaskList;
-        this.total=response.total
+        this.total = response.total;
         this.cardlist[0].value =
           Number(response.rows[0].wzx) + Number(response.rows[0].ysf);
         this.cardlist[1].value = response.rows[0].ysf;
@@ -845,7 +846,7 @@
             item.endDay = this.daysBetween(item.endtime);
           }
           if (item.endtime) {
-           idArray = item.preachform.split(",");
+            idArray = item.preachform.split(",");
           }
 
           item.preachform = idArray.map((value) => {
@@ -1082,9 +1083,18 @@
     },
     // 璺宠浆璇︽儏椤�
     Seedetails(row) {
+      let type = "";
+      if (row.preachform == 3) {
+        type = 1;
+      }
       this.$router.push({
         path: "/followvisit/record/detailpage/",
-        query: { taskid: row.taskid, patid: row.patid, id: row.id },
+        query: {
+          taskid: row.taskid,
+          patid: row.patid,
+          id: row.id,
+          Voicetype: type,
+        },
       });
     },
     // 渚挎嵎鎸夐挳
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index 93964f2..0074af5 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -28,20 +28,30 @@
           </el-table-column>
           <el-table-column prop="sendstate" align="center" label="鏈嶅姟鐘舵��">
             <template slot-scope="scope">
-            <div v-if="scope.row.sendstate == 1">
-              <el-tag type="primary"
-              :disable-transitions="false">琚鍙�</el-tag></div>
-            <div v-if="scope.row.sendstate == 2">
-              <el-tag type="primary"
-              :disable-transitions="false">寰呭彂閫�</el-tag>
+              <div v-if="scope.row.sendstate == 1">
+                <el-tag type="primary" :disable-transitions="false"
+                  >琚鍙�</el-tag
+                >
               </div>
-            <div v-if="scope.row.sendstate == 3"> <el-tag type="success"
-              :disable-transitions="false">宸插彂閫佹湭棰嗗彇</el-tag></div>
-            <div v-if="scope.row.sendstate == 4"> <el-tag type="info"
-              :disable-transitions="false">涓嶆墽琛�</el-tag></div>
-            <div v-if="scope.row.sendstate == 5"> <el-tag type="danger"
-              :disable-transitions="false">鍙戦�佸け璐�</el-tag></div>
-          </template>
+              <div v-if="scope.row.sendstate == 2">
+                <el-tag type="primary" :disable-transitions="false"
+                  >寰呭彂閫�</el-tag
+                >
+              </div>
+              <div v-if="scope.row.sendstate == 3">
+                <el-tag type="success" :disable-transitions="false"
+                  >宸插彂閫佹湭棰嗗彇</el-tag
+                >
+              </div>
+              <div v-if="scope.row.sendstate == 4">
+                <el-tag type="info" :disable-transitions="false">涓嶆墽琛�</el-tag>
+              </div>
+              <div v-if="scope.row.sendstate == 5">
+                <el-tag type="danger" :disable-transitions="false"
+                  >鍙戦�佸け璐�</el-tag
+                >
+              </div>
+            </template>
           </el-table-column>
           <el-table-column
             prop="finishtime"
@@ -177,19 +187,20 @@
       </div>
     </div>
     <div>
-      <el-tabs type="border-card">
-        <el-tab-pane>
+      <el-tabs v-model="activeName" type="border-card">
+        <el-tab-pane name="wj">
           <span class="mulsz" slot="label"
             ><i class="el-icon-notebook-1"></i> 闂嵎闅忚缁撴灉</span
           >
           <div class="CONTENT">
             <div class="title">{{ taskname ? taskname : "闂嵎" }}</div>
-            <div class="preview-left">
+            <!-- 闂嵎浠诲姟灞曠ず -->
+            <div class="preview-left" v-if="!Voicetype">
               <!-- 鍗曢�� -->
               <div
                 class="topic-dev"
                 v-for="(item, index) in tableDatatop"
-                :key="item.aaa"
+                :key="item.id"
               >
                 <div
                   :class="
@@ -280,41 +291,121 @@
                 </div>
               </div>
             </div>
-            <el-button type="primary" @click="getdetail">淇濆瓨闂嵎</el-button>
+            <!-- 璇煶闂嵎褰㈠紡灞曠ず -->
+            <div class="preview-left" v-else>
+              <!-- 鍗曢�� -->
+              <div
+                class="topic-dev"
+                v-for="(item, index) in tableDatatop"
+                :key="item.id"
+              >
+                <div v-if="item.targetvalue">
+                  <div class="dev-text">
+                    {{ index + 1 }}銆乕鍗曢�塢<span>{{ item.questiontext }}</span>
+                  </div>
+                  <div class="dev-xx">
+                    <el-radio-group
+                      v-model="item.matchedtext"
+                      @change="handleOptionChange($event, index, item)"
+                    >
+                      <el-radio
+                        v-for="(items, index) in item.scriptResult"
+                        :key="items"
+                        :label="items"
+                        >{{ items }}</el-radio
+                      >
+                    </el-radio-group>
+                  </div>
+                  <div v-show="item.prompt">
+                    <el-alert :title="item.prompt" type="warning"> </el-alert>
+                  </div>
+                </div>
+
+                <!-- 濉┖ -->
+                <div class="scriptTopic-dev" :key="index" v-else>
+                  <div class="dev-text">
+                    {{ index + 1 }}銆乕闂瓟]<span>{{ item.questiontext }}</span>
+                  </div>
+                  <div class="dev-xx">
+                    <el-input
+                      type="textarea"
+                      :rows="2"
+                      placeholder="璇疯緭鍏ョ瓟妗�"
+                      v-model="item.matchedtext"
+                      clearable
+                    >
+                    </el-input>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <el-button v-if="Voicetype" type="primary" @click="yuyingetdetail"
+              >淇濆瓨鏈嶅姟璇︽儏</el-button
+            >
+            <el-button v-else type="primary" @click="getdetail"
+              >淇濆瓨鏈嶅姟璇︽儏</el-button
+            >
           </div>
         </el-tab-pane>
-        <el-tab-pane>
+        <!-- 璇煶闅忚璇︽儏---------------------- -->
+        <el-tab-pane name="yy">
           <span class="mulsz" slot="label"
             ><i class="el-icon-headset"></i> 璇煶闅忚璇︽儏</span
           >
           <div class="borderdiv">
             <div class="title">{{ taskname ? taskname : "闂嵎" }}</div>
+            <div
+              style="
+                display: flex;
+                text-align: center;
+                align-items: center;
+                color: #59a0f0;
+              "
+            >
+              瀹屾暣璇煶锛�
+              <mini-audio
+                :audio-source="
+                  voice ? voice : 'https://example.com/example.mp3'
+                "
+              ></mini-audio>
+            </div>
             <div class="preview-left">
-              <div class="leftside">
-                <i class="el-icon-phone-outline"></i
-                ><span>鎮ㄤ粖澶╄韩浣撴儏鍐垫�庝箞鏍�</span>
-              </div>
-              <div class="offside">
-                <i class="el-icon-user"></i>
-                <div class="offside-value">
-                  <el-input v-model="input"></el-input>
-                  <el-radio v-model="radio" label="1">寰堟</el-radio>
-                  <el-radio v-model="radio" label="2">杩樺彲浠�</el-radio>
-                  <el-radio v-model="radio" label="3">涓嶅お濂�</el-radio>
-                  <el-radio v-model="radio" label="4">姣旇緝宸�</el-radio>
-                  <div>
-                    <mini-audio
-                          :audio-source="
-                            topicobj.ivrVoice
-                              ? topicobj.ivrVoice
-                              : 'https://example.com/example.mp3'
-                          "
-                        ></mini-audio>
+              <div v-for="item in voiceDatatop">
+                <div class="leftside">
+                  <i class="el-icon-phone-outline"></i
+                  ><span>{{ item.questiontext }}</span>
+                </div>
+                <div class="offside">
+                  <i class="el-icon-user"></i>
+                  <div class="offside-value">
+                    <el-input
+                      type="textarea"
+                      :autosize="{ minRows: 1 }"
+                      v-model="item.asrtext"
+                    ></el-input>
+                    <!-- <el-radio v-model="radio" label="1">寰堟</el-radio>
+                    <el-radio v-model="radio" label="2">杩樺彲浠�</el-radio>
+                    <el-radio v-model="radio" label="3">涓嶅お濂�</el-radio>
+                    <el-radio v-model="radio" label="4">姣旇緝宸�</el-radio> -->
+                    <div>
+                      <mini-audio
+                        :audio-source="
+                          item.questionvoice
+                            ? item.questionvoice
+                            : 'https://example.com/example.mp3'
+                        "
+                      ></mini-audio>
+                    </div>
                   </div>
                 </div>
               </div>
             </div>
-            <el-button type="primary" @click="getdetail">淇濆瓨闅忚璇︽儏</el-button>
+            <el-button v-if="Voicetype" type="primary" @click="yuyingetdetail"
+              >淇濆瓨闅忚璇︽儏</el-button
+            >
+            <el-button v-else type="primary" @click="getdetail"
+              >淇濆瓨闅忚璇︽儏</el-button
+            >
           </div>
         </el-tab-pane>
       </el-tabs>
@@ -325,24 +416,30 @@
 <script>
 import {
   getsearchrResults,
+  getPersonVoices,
   getTaskservelist,
+  getTaskparticty,
   Editsingletaskson,
   serviceSubtaskDetailedit,
   serviceSubtaskDetailadd,
+  updatePersonVoices,
 } from "@/api/AiCentre/index";
 export default {
   dicts: ["sys_normal_disable", "sys_user_sex", "sys_yujing", "sys_suggest"],
   data() {
     return {
-      radio: "1",
       userid: "",
       input: "浠婂ぉ韬綋杩樹笉閿�",
       radio: "2",
       taskname: "",
+      activeName: "wj",
+      voice: "",
       tableDatatop: [], //棰樼洰琛�
+      voiceDatatop: [], //棰樼洰琛�
       Whetherall: false, //鏄惁鍏ㄩ儴璁板綍灞曠ず
+      Voicetype: 0, //鏄惁涓鸿闊虫湇鍔�
       logsheetlist: [],
-      topicobj:{},
+      topicobj: {},
       sendname: null,
       serviceType: null,
       id: null,
@@ -356,8 +453,13 @@
     this.id = this.$route.query.id;
     this.sendname = this.$route.query.sendname;
     this.patid = this.$route.query.patid;
+    this.Voicetype = this.$route.query.Voicetype;
     this.serviceType = this.$route.query.serviceType;
-    this.getsearchrResults();
+    if (this.Voicetype) {
+      this.getPersonVoices();
+    } else {
+      this.getsearchrResults();
+    }
     this.getTaskservelist(this.taskid);
   },
 
@@ -368,7 +470,7 @@
         taskid: this.taskid,
         patid: this.patid,
         subId: this.id,
-        isFinish:false,
+        isFinish: false,
       }).then((res) => {
         if (res.code === 200) {
           this.tableDatatop = res.data.scriptResult.script;
@@ -383,6 +485,42 @@
           });
           this.taskname = res.data.taskName;
           this.overdata();
+        }
+      });
+    },
+    // 鑾峰彇璇煶鏁版嵁
+    getPersonVoices() {
+      let obj = {
+        taskid: this.taskid,
+        patid: this.patid,
+        subId: this.id,
+      };
+      console.log(this.voiceDatatop, "111");
+
+      getPersonVoices(obj).then((res) => {
+        console.log("222");
+        if (res.code == 200) {
+          this.voiceDatatop = res.data.serviceSubtaskDetails;
+          this.voice = res.data.voice;
+          this.activeName = "yy";
+          this.taskname = res.data.taskName;
+          // 闂嵎灞曠ず鏁版嵁澶勭悊
+          this.tableDatatop = res.data.filteredDetails;
+          this.tableDatatop.forEach((item) => {
+            if (item.targetvalue) {
+              item.scriptResult = item.targetvalue.split("&");
+            } else {
+              item.scriptResult = [];
+            }
+          });
+        }
+      });
+    },
+    // 鑾峰彇闂嵎瀹屾暣鏁版嵁姣斿
+    puttaskid(id) {
+      getTaskparticty(id).then((res) => {
+        if (res.code == 200) {
+
         }
       });
     },
@@ -431,6 +569,16 @@
       });
       this.Editsingletasksonyic(excep);
     },
+    yuyingetdetail() {
+      this.tableDatatop.forEach((item) => {
+        item.scriptResult = item.scriptResult.join("&");
+      });
+      updatePersonVoices(this.tableDatatop).then((res) => {
+        if (res.code == 200) {
+          this.$modal.msgSuccess("鏈嶅姟淇敼鎴愬姛");
+        }
+      });
+    },
     // 鑾峰彇鎮h�呰褰�
     getTaskservelist(taskid) {
       this.taskid = taskid;
@@ -445,6 +593,7 @@
       }).then((res) => {
         if (res.code == 200) {
           this.logsheetlist = res.rows[0].serviceSubtaskList;
+          this.puttaskid(this.logsheetlist[0].templateid)
         }
       });
     },
@@ -474,7 +623,7 @@
       }).then((res) => {
         if (res.code == 200) {
           objson = res.rows[0].serviceSubtaskList[0];
-          console.log(objson,'obj');
+          console.log(objson, "obj");
 
           objson.excep = excep;
           Editsingletaskson(objson).then((res) => {
@@ -569,7 +718,7 @@
     text-align: center;
   }
   .leftside {
-    margin-bottom: 30px;
+    margin: 30px 0;
     span {
       width: 400px;
       margin-left: 20px;
@@ -645,6 +794,10 @@
     right: -5px; /* 鏍规嵁闇�瑕佽皟鏁� */
     top: 0;
   }
+  ::v-deep.el-input-group__textarea {
+    white-space: pre-wrap; /* 淇濇寔绌虹櫧绗﹀簭鍒楀苟姝e父鎹㈣ */
+    word-break: break-all; /* 鍦ㄩ暱鍗曡瘝鎴朥RL鍦板潃鍐呴儴杩涜鎹㈣ */
+  }
   ::v-deep.el-checkbox__label {
     position: relative;
     padding-right: 10px; /* 鏍规嵁闇�瑕佽皟鏁� */
diff --git a/src/views/outsideChainnew.vue b/src/views/outsideChainnew.vue
index 4c9d925..347ad7d 100644
--- a/src/views/outsideChainnew.vue
+++ b/src/views/outsideChainnew.vue
@@ -30,20 +30,20 @@
             <div class="dev-xx">
               <el-radio-group
                 class="custom-radio"
-                v-model="item.scriptResult"
+                v-model="item.questionResult"
                 @change="handleOptionChange($event, index, item)"
               >
                 <el-radio
                   border
-                  v-for="(items, index) in item.svyLibTemplateTargetoptions"
+                  v-for="(items, index) in item.ivrLibaScriptTargetoptionList"
                   :class="
-                    items.isabnormal && item.scriptResult == items.optioncontent
+                    items.isabnormal && item.questionResult == items.targetvalue
                       ? 'red-star'
                       : ''
                   "
                   :key="index"
-                  :label="items.optioncontent"
-                  >{{ items.optioncontent }}</el-radio
+                  :label="items.targetvalue"
+                  >{{ items.targetvalue }}</el-radio
                 >
               </el-radio-group>
             </div>
@@ -62,27 +62,27 @@
             <div class="dev-xx">
               <el-checkbox-group
                 class="custom-radio"
-                v-model="item.scriptResult"
+                v-model="item.questionResult"
                 @change="updateScore($event, index, item)"
               >
                 <el-checkbox
                   border
                   @change="$forceUpdate()"
-                  v-for="(items, indexs) in item.svyLibTemplateTargetoptions"
+                  v-for="(items, indexs) in item.ivrLibaScriptTargetoptionList"
                   :key="indexs"
-                  :label="items.optioncontent"
+                  :label="items.targetvalue"
                 >
-                  {{ items.optioncontent }}
+                  {{ items.targetvalue }}
                 </el-checkbox>
               </el-checkbox-group>
             </div>
             <!-- :class="items.isabnormal ? 'red-star' : ''" -->
-            <div v-show="item.prompt && item.scriptResult[0]">
+            <div v-show="item.prompt && item.questionResult[0]">
               <el-alert :title="item.prompt" type="warning"> </el-alert>
             </div>
           </div>
           <!-- 濉┖ -->
-          <div class="scriptTopic-dev" :key="index" v-if="item.scriptType == 4">
+          <div class="scriptTopic-dev" :key="index" v-if="item.scriptType == 4||item.scriptType == 3">
             <div class="dev-text">
               {{ index + 1 }}銆�<span style="line-height: 1.5"
                 >{{ item.scriptContent
@@ -94,7 +94,7 @@
                 type="textarea"
                 :rows="3"
                 placeholder="璇疯緭鍏ョ瓟妗�"
-                v-model="item.scriptResult"
+                v-model="item.questionResult"
                 clearable
               >
               </el-input>
@@ -153,6 +153,7 @@
   Submitaquestionnaire,
   geturlinfo,
 } from "@/api/AiCentre/index";
+import { type } from "jquery";
 import JSEncrypt from "jsencrypt";
 export default {
   data() {
@@ -161,91 +162,92 @@
       patid: 265823,
       kcb: "",
       excep: "",
+      taskname: "",
       questionList: [
         // {
         //   scriptType: 1,
         //   scriptContent: "鎮ㄧ殑骞撮緞鑼冨洿鏄紵",
-        //   scriptResult: null,
-        //   svyLibTemplateTargetoptions: [
-        //     { optioncontent: "18-25", value: "18-25", isabnormal: true },
-        //     { optioncontent: "26-35", value: "26-35" },
-        //     { optioncontent: "36-45", value: "36-45" },
-        //     { optioncontent: "46-55", value: "46-55" },
-        //     { optioncontent: "56+", value: "56+" },
+        //   questionResult: null,
+        //   ivrLibaScriptTargetoptionList: [
+        //     { targetvalue: "18-25", value: "18-25", isabnormal: true },
+        //     { targetvalue: "26-35", value: "26-35" },
+        //     { targetvalue: "36-45", value: "36-45" },
+        //     { targetvalue: "46-55", value: "46-55" },
+        //     { targetvalue: "56+", value: "56+" },
         //   ],
         //   required: true,
         // },
         // {
         //   scriptType: 1,
         //   scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵",
-        //   scriptResult: null,
-        //   svyLibTemplateTargetoptions: [
-        //     { optioncontent: "瀛︾敓", value: "student" },
-        //     { optioncontent: "鏁欏笀", value: "teacher" },
-        //     { optioncontent: "宸ョ▼甯�", value: "engineer" },
-        //     { optioncontent: "鍖荤敓", value: "doctor" },
-        //     { optioncontent: "鍏朵粬", value: "other" },
+        //   questionResult: null,
+        //   ivrLibaScriptTargetoptionList: [
+        //     { targetvalue: "瀛︾敓", value: "student" },
+        //     { targetvalue: "鏁欏笀", value: "teacher" },
+        //     { targetvalue: "宸ョ▼甯�", value: "engineer" },
+        //     { targetvalue: "鍖荤敓", value: "doctor" },
+        //     { targetvalue: "鍏朵粬", value: "other" },
         //   ],
         //   required: false,
         // },
         // {
         //   scriptType: 2,
         //   scriptContent: "鎮ㄦ劅鍏磋叮鐨勬椿鍔ㄦ湁鍝簺锛�",
-        //   scriptResult: [],
-        //   svyLibTemplateTargetoptions: [
-        //     { optioncontent: "鏃呮父", value: "travel", isabnormal: true },
-        //     { optioncontent: "闃呰", value: "reading", isabnormal: true },
-        //     { optioncontent: "杩愬姩", value: "sports", isabnormal: true },
-        //     { optioncontent: "闊充箰", value: "music" },
-        //     { optioncontent: "鐢靛奖", value: "movies" },
+        //   questionResult: [],
+        //   ivrLibaScriptTargetoptionList: [
+        //     { targetvalue: "鏃呮父", value: "travel", isabnormal: true },
+        //     { targetvalue: "闃呰", value: "reading", isabnormal: true },
+        //     { targetvalue: "杩愬姩", value: "sports", isabnormal: true },
+        //     { targetvalue: "闊充箰", value: "music" },
+        //     { targetvalue: "鐢靛奖", value: "movies" },
         //   ],
         //   required: false,
         // },
         // {
         //   scriptType: 1,
         //   scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵",
-        //   scriptResult: null,
-        //   svyLibTemplateTargetoptions: [
-        //     { optioncontent: "瀛︾敓", value: "student" },
-        //     { optioncontent: "鏁欏笀", value: "teacher" },
-        //     { optioncontent: "宸ョ▼甯�", value: "engineer" },
-        //     { optioncontent: "鍖荤敓", value: "doctor" },
-        //     { optioncontent: "鍏朵粬", value: "other" },
+        //   questionResult: null,
+        //   ivrLibaScriptTargetoptionList: [
+        //     { targetvalue: "瀛︾敓", value: "student" },
+        //     { targetvalue: "鏁欏笀", value: "teacher" },
+        //     { targetvalue: "宸ョ▼甯�", value: "engineer" },
+        //     { targetvalue: "鍖荤敓", value: "doctor" },
+        //     { targetvalue: "鍏朵粬", value: "other" },
         //   ],
         //   required: false,
         // },
         // {
         //   scriptType: 1,
         //   scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵",
-        //   scriptResult: null,
-        //   svyLibTemplateTargetoptions: [
-        //     { optioncontent: "瀛︾敓", value: "student" },
-        //     { optioncontent: "鏁欏笀", value: "teacher" },
-        //     { optioncontent: "宸ョ▼甯�", value: "engineer", isabnormal: true },
-        //     { optioncontent: "鍖荤敓", value: "doctor" },
-        //     { optioncontent: "鍏朵粬", value: "other" },
+        //   questionResult: null,
+        //   ivrLibaScriptTargetoptionList: [
+        //     { targetvalue: "瀛︾敓", value: "student" },
+        //     { targetvalue: "鏁欏笀", value: "teacher" },
+        //     { targetvalue: "宸ョ▼甯�", value: "engineer", isabnormal: true },
+        //     { targetvalue: "鍖荤敓", value: "doctor" },
+        //     { targetvalue: "鍏朵粬", value: "other" },
         //   ],
         //   required: false,
         // },
         // {
         //   scriptType: 1,
         //   scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵",
-        //   scriptResult: null,
-        //   svyLibTemplateTargetoptions: [
-        //     { optioncontent: "瀛︾敓", value: "student" },
-        //     { optioncontent: "鏁欏笀", value: "teacher" },
-        //     { optioncontent: "宸ョ▼甯�", value: "engineer" },
-        //     { optioncontent: "鍖荤敓", value: "doctor" },
-        //     { optioncontent: "鍏朵粬", value: "other" },
+        //   questionResult: null,
+        //   ivrLibaScriptTargetoptionList: [
+        //     { targetvalue: "瀛︾敓", value: "student" },
+        //     { targetvalue: "鏁欏笀", value: "teacher" },
+        //     { targetvalue: "宸ョ▼甯�", value: "engineer" },
+        //     { targetvalue: "鍖荤敓", value: "doctor" },
+        //     { targetvalue: "鍏朵粬", value: "other" },
         //   ],
         //   required: false,
         // },
         // {
         //   scriptType: 4,
         //   scriptContent: "鎮ㄧ殑濮撳悕鏄粈涔堬紵",
-        //   scriptResult: "name",
+        //   questionResult: "name",
         //   required: true,
-        //   scriptResult: null,
+        //   questionResult: null,
         // },
       ],
       jsy: null,
@@ -282,28 +284,33 @@
       // let url = 'http://218.108.11.22:8093/sf/003';
       // let urlid = this.extractLastSegmentFromUrl(url);
 
-      geturlinfo( url ).then((res) => {
-       if (res.code==200) {
-         this.getQuestionnaire(res.data.param1,res.data.param2,res.data.param3,res.data.param5,)
-       }
+      geturlinfo(url).then((res) => {
+        if (res.code == 200) {
+          this.getQuestionnaire(
+            res.data.param1,
+            res.data.param2,
+            res.data.param3,
+            res.data.param5
+          );
+        }
       });
     },
-//     extractLastSegmentFromUrl(url) {
-//     // 鎵惧埌鏈�鍚庝竴涓�'/'鐨勪綅缃�
-//     const lastSlashIndex = url.lastIndexOf('/');
-//     // 濡傛灉鎵惧埌浜�'/'锛屾埅鍙栧叾鍚庣殑鎵�鏈夊瓧绗�
-//     if (lastSlashIndex !== -1) {
-//         return url.substring(lastSlashIndex + 1);
-//     }
-//     // 濡傛灉娌℃湁鎵惧埌'/'锛岃繑鍥炵┖瀛楃涓�
-//     return '';
-// },
+    //     extractLastSegmentFromUrl(url) {
+    //     // 鎵惧埌鏈�鍚庝竴涓�'/'鐨勪綅缃�
+    //     const lastSlashIndex = url.lastIndexOf('/');
+    //     // 濡傛灉鎵惧埌浜�'/'锛屾埅鍙栧叾鍚庣殑鎵�鏈夊瓧绗�
+    //     if (lastSlashIndex !== -1) {
+    //         return url.substring(lastSlashIndex + 1);
+    //     }
+    //     // 濡傛灉娌℃湁鎵惧埌'/'锛岃繑鍥炵┖瀛楃涓�
+    //     return '';
+    // },
 
     // 鑾峰彇鏁版嵁
-    getQuestionnaire(param1,param2,param3) {
+    getQuestionnaire(param1, param2, param3) {
       this.taskid = decodeURIComponent(param1);
       this.patid = decodeURIComponent(param2);
-      this.taskname = param3;
+      // this.taskname = param3;
       // let taskid =
       //   "OFp7tn/B6x7IzKJetvGWHdSWBj7msRlnlj6am9dyuHTH6sEt4uBbVCUXs5kcF/e4O2W6vqHf2Bz9K3/evbYDmw==";
       // let patid =
@@ -320,10 +327,10 @@
             this.accomplish = res.data.submit;
             if (this.questionList[0]) {
               this.questionList.forEach((item) => {
-                if (item.scriptResult && item.scriptType != 2) {
-                  item.scriptResult = JSON.parse(item.scriptResult);
-                } else if (item.scriptResult && item.scriptType == 2) {
-                  item.scriptResult = item.scriptResult.split("&");
+                if (item.questionResult && item.scriptType != 2) {
+                  item.questionResult = JSON.parse(item.questionResult);
+                } else if (item.questionResult && item.scriptType == 2) {
+                  item.questionResult = item.questionResult.split("&");
                 }
               });
               return;
@@ -344,11 +351,14 @@
             this.questionList = res.data.script;
             this.jsy = res.data.jsy;
             this.kcb = res.data.kcb;
+            this.taskname = res.data.taskName;
+            this.type = res.data.type;
+
             // 澶勭悊棰樼洰鏀堕泦缁撴灉鏍煎紡
             this.questionList.forEach((item) => {
               item.nextScriptno = Number(item.nextScriptno);
               if (item.scriptType == 2) {
-                item.scriptResult = [];
+                item.questionResult = [];
               }
             });
           }
@@ -374,13 +384,14 @@
         param1: this.taskid,
         param2: this.patid,
         excep: this.excep,
+        type: this.type,
         serviceSubtaskDetailList: [],
       };
       const arr = structuredClone(this.questionList);
       // arr.forEach((item) => {
-      //   item.asrtext = JSON.stringify(item.scriptResult);
-      //   if (item.scriptType == 2 && item.scriptResult[0]) {
-      //     item.scriptResult = item.scriptResult.join("&");
+      //   item.asrtext = JSON.stringify(item.questionResult);
+      //   if (item.scriptType == 2 && item.questionResult[0]) {
+      //     item.questionResult = item.questionResult.join("&");
       //   }
       // });
       form.serviceSubtaskDetailList = arr;
@@ -400,14 +411,18 @@
       let form = {
         param1: this.taskid,
         param2: this.patid,
-        svyLibTemplateScriptVOS: [],
+        type: this.type,
+        ivrLibaTemplateScriptVOList: [],
       };
       const arr = structuredClone(this.questionList);
       console.log(arr, "srr");
       arr.forEach((item, index) => {
-        var obj = item.svyLibTemplateTargetoptions.find(
-          (items) => items.optioncontent == item.scriptResult
+        if (item.scriptType == 3||item.scriptType == 4) return;
+        var obj = item.ivrLibaScriptTargetoptionList.find(
+          (items) => items.targetvalue == item.questionResult
         );
+        console.log(obj, "isabnormal");
+
         if (obj.isabnormal) {
           console.log(obj.isabnormal);
           form.excep = 1;
@@ -416,13 +431,13 @@
       });
 
       arr.forEach((item) => {
-        if (item.scriptType == 2 && item.scriptResult[0]) {
-          item.scriptResult = item.scriptResult.join("&");
-        } else if (item.scriptType != 2 && item.scriptResult) {
-          item.scriptResult = JSON.stringify(item.scriptResult);
+        if (item.scriptType == 2 && item.questionResult[0]) {
+          item.questionResult = item.questionResult.join("&");
+        } else if (item.scriptType != 2 && item.questionResult) {
+          item.questionResult = JSON.stringify(item.questionResult);
         }
       });
-      form.svyLibTemplateScriptVOS = arr;
+      form.ivrLibaTemplateScriptVOList = arr;
       Cachequestionnaire(form).then((res) => {
         if (res.code == 200) {
           if (subm) {
@@ -434,8 +449,8 @@
     // 澶勭悊鍗曢�夐�夐」
     handleOptionChange(selectedvalue, index, arr) {
       // 鏌ユ壘閫変腑鐨勯�夐」瀵硅薄
-      const selectedOption = arr.svyLibTemplateTargetoptions.find(
-        (option) => option.optioncontent == selectedvalue
+      const selectedOption = arr.ivrLibaScriptTargetoptionList.find(
+        (option) => option.targetvalue == selectedvalue
       );
       if (selectedOption) {
         // 灏嗛�変腑鐨勯�夐」瀵硅薄鐨� id 璧嬪�肩粰 obj.sonId
@@ -449,8 +464,8 @@
       // 锟斤拷鍔犲垎鏁�
       let score = 0;
       selectedvalues.forEach((value) => {
-        const selectedOption = arr.svyLibTemplateTargetoptions.find(
-          (option) => option.optioncontent == value
+        const selectedOption = arr.ivrLibaScriptTargetoptionList.find(
+          (option) => option.targetvalue == value
         );
         if (selectedOption) {
           score += Number(selectedOption.score);
diff --git a/src/views/patient/patient/ExternalPatient.vue b/src/views/patient/patient/ExternalPatient.vue
index 055b5e9..a4d5e2f 100644
--- a/src/views/patient/patient/ExternalPatient.vue
+++ b/src/views/patient/patient/ExternalPatient.vue
@@ -1,51 +1,8 @@
 <template>
   <div class="Questionnairemanagement">
-    <!-- 宸︿晶鏍� -->
-    <div class="sidecolumn">
-      <div class="sidecolumn-top">
-        <div class="top-wj">鍖婚櫌鎮h��</div>
-      </div>
-
-      <div class="bottom-fl">
-        <el-tabs
-          tab-position="right"
-          v-model="queryParams.allhosp"
-          @tab-click="handleClick"
-        >
-          <!-- <el-tab-pane label="鎮h�呭垪琛�" name="0"></el-tab-pane> -->
-          <el-tab-pane label="鍑哄叆闄㈡偅鑰�" name="1"></el-tab-pane>
-          <el-tab-pane label="闂ㄨ瘖鎮h��" name="2"></el-tab-pane>
-          <el-tab-pane label="浣撴鎮h��" name="3"></el-tab-pane>
-        </el-tabs>
-      </div>
-    </div>
     <!-- 鍙充晶鏁版嵁 -->
 
     <div class="leftvlue">
-      <!-- <div>
-        <el-row :gutter="10">
-          <el-col :span="2.5" v-for="(item, index) in cardlist" :key="index">
-            <el-card
-              shadow="hover"
-              :body-style="item.router ? ' cursor: pointer' : 'cursor: default'"
-            >
-              <div style="padding: 8px" @click="$router.push(item.router)">
-                <span>{{ item.name }}</span>
-                <div
-                  style="
-                    text-align: center;
-                    font-size: 18px;
-                    margin-top: 10px;
-                    font-weight: 600;
-                  "
-                >
-                  {{ item.value }}
-                </div>
-              </div>
-            </el-card>
-          </el-col>
-        </el-row>
-      </div> -->
       <div class="leftvlue-bg">
         <el-row :gutter="20">
           <!--鐢ㄦ埛鏁版嵁-->
@@ -58,49 +15,7 @@
               v-show="showSearch"
               label-width="98px"
             >
-              <!-- <el-form-item label="闄㈠尯" prop="userName">
-                <el-select v-model="queryParams.value1" placeholder="璇烽�夋嫨">
-                  <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item> -->
-              <!-- <el-form-item label="绉戝/鐥呭尯" prop="userName">
-                <el-select v-model="queryParams.value2" placeholder="璇烽�夋嫨">
-                  <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item> -->
-              <el-form-item
-                label-width="138px"
-                label="涓绘不鍖荤敓"
-                prop="userName"
-              >
-                <el-input
-                  v-model="queryParams.drname"
-                  placeholder="璇疯緭鍏ュ尰鐢熷鍚�"
-                  maxlength="30"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
 
-              <el-form-item label="闂ㄨ瘖缂栧彿" prop="visitno">
-                <el-input
-                  v-model="queryParams.visitno"
-                  placeholder="璇疯緭鍏ョ紪鍙�"
-                  maxlength="30"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
               <el-form-item label="鎮h�呭鍚�" prop="name">
                 <el-input
                   v-model="queryParams.name"
@@ -109,20 +24,7 @@
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item>
-              <el-form-item label="鎮h�呰寖鍥�" prop="tagId">
-            <el-select
-                v-model="queryParams.searchscope"
-                placeholder="璇烽�夋嫨鎮h�呰寖鍥�"
-              >
-                <el-option
-                  v-for="item in source"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
-          </el-form-item>
+
               <el-form-item label="鑱旂郴鐢佃瘽" prop="telcode">
                 <el-input
                   v-model="queryParams.telcode"
@@ -174,16 +76,7 @@
                   >鍒犻櫎</el-button
                 >
               </el-col>
-              <el-col :span="1.5">
-                <el-button
-                  type="primary"
-                  plain
-                  icon="el-icon-s-promotion"
-                  size="medium"
-                  @click="distribute"
-                  >鍚戜换鍔℃淳鍙戞偅鑰�</el-button
-                >
-              </el-col>
+
               <el-col :span="6">
                 <div class="documentf">
                   <div class="document">
@@ -215,7 +108,7 @@
             <el-table
               v-loading="loading"
               :data="userList"
-               height="660"
+              height="660"
               @selection-change="handleSelectionChange"
             >
               <el-table-column type="selection" width="50" align="center" />
@@ -254,28 +147,6 @@
               >
               </el-table-column>
               <el-table-column
-                label="灞呬綇鍦�"
-                align="center"
-                key="placeOfResidence"
-                prop="placeOfResidence"
-                width="150"
-                :show-overflow-tooltip="true"
-              />
-              <el-table-column
-                label="鎮h�呮爣绛�"
-                align="center"
-                key="tagList"
-                prop="tagList"
-                width="160"
-                :show-overflow-tooltip="true"
-              >
-                <template slot-scope="scope">
-                  <span v-for="item in scope.row.tagList"
-                    >{{ item.tagname }}
-                  </span>
-                </template>
-              </el-table-column>
-             <el-table-column
                 label="璇佷欢鍙风爜"
                 align="center"
                 key="idcardno"
@@ -297,7 +168,7 @@
                 prop="createTime"
                 width="160"
               >
-              <template slot-scope="scope">
+                <template slot-scope="scope">
                   <span>{{ formatTime(scope.row.createTime) }}</span>
                 </template>
               </el-table-column>
@@ -319,33 +190,13 @@
                 class-name="small-padding fixed-width"
               >
                 <template slot-scope="scope">
+
                   <el-button
                     size="medium"
                     type="text"
-                    @click="
-                      $router.push({
-                        path: '/patient/patient/profile/',
-                        query: { id: scope.row.id },
-                      })
-                    "
-                    ><span class="button-textsc"
-                      ><i class="el-icon-zoom-in"></i>璇︽儏缂栬緫</span
-                    ></el-button
-                  >
-                  <el-button
-                    size="medium"
-                    type="text"
-                    @click="handleUpdate(scope.row)"
-                    ><span class="button-textxga"
-                      ><i class="el-icon-edit"></i>鎮h�呰繃婊�</span
-                    ></el-button
-                  >
-                  <el-button
-                    size="medium"
-                    type="text"
-                    @click="Distributionservice(scope.row)"
+                    @click="handleDelete(scope.row)"
                     ><span class="button-textxg"
-                      ><i class="el-icon-menu"></i>鏈嶅姟</span
+                      ><i class="el-icon-menu"></i>鍒犻櫎</span
                     ></el-button
                   >
                 </template>
@@ -524,7 +375,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row  v-if="!amendtag">
+        <el-row v-if="!amendtag">
           <el-col :span="8">
             <el-form-item label="姘戞棌" prop="name">
               <el-input
@@ -575,7 +426,7 @@
         </el-row>
 
         <el-row>
-          <el-col :span="amendtag?12:24"v-if="!amendtag" >
+          <el-col :span="amendtag ? 12 : 24" v-if="!amendtag">
             <el-form-item label="鎮h�呯被鍨�">
               <el-select v-model="form.pattype" placeholder="璇烽�夋嫨绫诲瀷">
                 <el-option
@@ -685,27 +536,22 @@
       <!-- 瀵煎叆妫�鏌� -->
       <div class="uploading" v-else-if="dractive == 2">
         <el-table :data="uploadingData" style="width: 100%">
-          <el-table-column prop="serial" label="搴忓彿"> </el-table-column>
+          <el-table-column prop="serial" label="鎮h�卛d"> </el-table-column>
           <el-table-column prop="name" label="濮撳悕"> </el-table-column>
           <el-table-column prop="sex" label="鎬у埆"> </el-table-column>
-
-          <el-table-column prop="certificatenum" label="璇佷欢鍙风爜">
-          </el-table-column>
+          <el-table-column prop="idcardno" width="300" label="璇佷欢鍙风爜"> </el-table-column>
           <el-table-column prop="goday" label="鍑虹敓鏃ユ湡"> </el-table-column>
-          <el-table-column prop="menum" label="鏈汉鑱旂郴鏂瑰紡"> </el-table-column>
-          <el-table-column prop="younum" label="浜插睘鑱旂郴鏂瑰紡">
+          <el-table-column prop="telcode" width="200" label="鑱旂郴鏂瑰紡"> </el-table-column>
+          <el-table-column prop="createTime"  width="200" label="鍒涘缓鏃ユ湡">
           </el-table-column>
-          <el-table-column prop="tag" label="鎮h�呮爣绛�"> </el-table-column>
-          <el-table-column prop="erry" label="閿欒鍘熷洜"> </el-table-column>
-          <el-table-column prop="opinion" label="澶勭悊鎰忚"> </el-table-column>
         </el-table>
-        <pagination
+        <!-- <pagination
           v-show="total > 0"
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
           @pagination="geterryList"
-        />
+        /> -->
       </div>
       <!-- 瀹屾垚 -->
       <div class="drexamine" v-else-if="dractive == 3">
@@ -713,11 +559,12 @@
         <p>瀵煎叆鎮h�呮垚鍔燂紒</p>
         <p>
           鏈
-          <span style="color: #158bb8; font-size: 20px">{{
+          <!-- <span style="color: #158bb8; font-size: 20px">{{
             ImportQuantity
           }}</span>
-          鏉℃暟鎹垚鍔熷鍏�<span style="color: #72d3a9; font-size: 20px">{{
-            ImportQuantity
+          鏉℃暟鎹� -->
+          鎴愬姛瀵煎叆<span style="color: #72d3a9; font-size: 20px">{{
+            uploadingData.length?uploadingData.length:0
           }}</span
           >浣嶆偅鑰�
         </p>
@@ -749,7 +596,7 @@
       <div slot="footer" class="dialog-footer" v-if="dractive == 3">
         <!-- <el-button type="primary" @click="submitFileForm">涓嬩竴姝�</el-button> -->
         <el-button @click="submitclose">瀹屾垚</el-button>
-        <el-button type="warning" @click="submitclose">瀵煎嚭澶辫触鏁版嵁</el-button>
+        <!-- <el-button type="warning" @click="submitclose">瀵煎嚭澶辫触鏁版嵁</el-button> -->
       </div>
       <div slot="footer" v-else>
         <el-button type="primary" @click="submitFileForm">涓嬩竴姝�</el-button>
@@ -778,17 +625,13 @@
 
 <script>
 import { delUser } from "@/api/system/user";
-
 import {
-  messagelistpatient,
-  alterpatient,
-  addpatient,
-  particularpatient,
-  deletepatient,
-  Exporterrorpatient,
-  toleadpatient,
-} from "@/api/patient/homepage";
-import { getTasklist } from "@/api/AiCentre/index";
+  getTasklist,
+  Externallist,
+  Externaledit,
+  Externalpatient,
+  delExternal,
+} from "@/api/AiCentre/index";
 import { listtag } from "@/api/system/label";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
@@ -797,7 +640,12 @@
 
 export default {
   name: "Patient",
-  dicts: ["sys_normal_disable", "task_status", "sys_user_sex",'futter_patient'],
+  dicts: [
+    "sys_normal_disable",
+    "task_status",
+    "sys_user_sex",
+    "futter_patient",
+  ],
   components: { Treeselect },
   data() {
     return {
@@ -822,6 +670,7 @@
       // 閮ㄩ棬鏍戦�夐」
       deptOptions: undefined,
       options: [],
+      uploadingData:[],
       // 鏄惁鏄剧ず寮瑰嚭灞�
       open: false,
       // 閮ㄩ棬鍚嶇О
@@ -874,7 +723,6 @@
           value: 2,
           label: "濂�",
         },
-
       ],
 
       cardlist: [
@@ -954,14 +802,8 @@
       // 鏌ヨ鍙傛暟
       queryParams: {
         pageNum: 1,
-        allhosp: "1",
         pageSize: 10,
-        searchscope:2,
-        idcardno: undefined,
-        name: undefined,
-        status: undefined,
-        tagIds: undefined,
-        telcode: undefined,
+
       },
       // 琛ㄥ崟鏍¢獙
       rules: {
@@ -996,9 +838,7 @@
             trigger: "blur",
           },
         ],
-        placeOfResidence: [
-          { required: true, message: "灞呬綇鍦颁笉鑳戒负绌�", trigger: "blur" },
-        ],
+
       },
     };
   },
@@ -1017,24 +857,8 @@
   methods: {
     /** 鏌ヨ鎮h�呭垪琛� */
     getList() {
-      if (this.queryParams.searchscope == 1) {
-        this.queryParams.leaveldeptcodes = store.getters.belongDepts.map(
-          (obj) => obj.deptCode
-        );
-        this.queryParams.leavehospitaldistrictcodes=null;
-      } else if (this.queryParams.searchscope == 2) {
-        this.queryParams.leavehospitaldistrictcodes =
-          store.getters.belongWards.map((obj) => obj.districtCode);
-          this.queryParams.leaveldeptcodes=null;
-      } else {
-        this.queryParams.leaveldeptcodes = store.getters.belongDepts.map(
-          (obj) => obj.deptCode
-        );
-        this.queryParams.leavehospitaldistrictcodes =
-          store.getters.belongWards.map((obj) => obj.districtCode);
-      }
       this.loading = true;
-      messagelistpatient(this.queryParams).then((response) => {
+      Externallist(this.queryParams).then((response) => {
         this.userList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -1095,7 +919,6 @@
     },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {
-
       this.queryParams.pageNum = 1;
       this.getList();
     },
@@ -1122,7 +945,7 @@
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate(row) {
       const userIds = row.id || this.ids;
-      particularpatient(userIds).then((response) => {
+      Externalpatient(userIds).then((response) => {
         console.log(response);
         this.form = response.data;
       });
@@ -1136,7 +959,7 @@
           if (this.amendtag) {
             this.form.isoperation = 2;
             this.form.notrequiredFlag = 1;
-            alterpatient(this.form)
+            Externaledit(this.form)
               .then((response) => {
                 console.log(response);
               })
@@ -1146,7 +969,7 @@
               });
           } else {
             this.form.isoperation = 1;
-            alterpatient(this.form)
+            Externaledit(this.form)
               .then((response) => {
                 console.log(response);
               })
@@ -1164,11 +987,11 @@
 
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
-      const userIds = row.userId || this.ids;
+      const userIds =[ row.id]
       this.$modal
         .confirm('鏄惁纭鍒犻櫎鐢ㄦ埛缂栧彿涓�"' + userIds + '"鐨勬暟鎹」锛�')
         .then(function () {
-          return deletepatient(userIds);
+          return delExternal(userIds);
         })
         .then(() => {
           this.getList();
@@ -1237,17 +1060,18 @@
     },
     // 鏂囦欢涓婁紶鎴愬姛澶勭悊
     handleFileSuccess(response, file, fileList) {
-      this.upload.open = false;
+      // this.upload.open = false;
       this.upload.isUploading = false;
+      this.uploadingData = response.rows;
       this.$refs.upload.clearFiles();
-      this.$alert(
-        "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-          response.msg +
-          "</div>",
-        "瀵煎叆缁撴灉",
-        { dangerouslyUseHTMLString: true }
-      );
-      this.getList();
+      // this.$alert(
+      //   "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+      //     response.msg +
+      //     "</div>",
+      //   "瀵煎叆缁撴灉",
+      //   { dangerouslyUseHTMLString: true }
+      // );
+      // this.getList();
     },
     // 鎻愪氦涓婁紶鏂囦欢
     submitFileForm() {
@@ -1262,6 +1086,8 @@
     submitclose() {
       this.upload.open = false;
       this.dractive = 1;
+      this.uploadingData=[],
+      this.getList();
     },
   },
 };
@@ -1350,7 +1176,7 @@
   cursor: pointer; /* 榧犳爣鎮诞鏃跺彉涓烘墜褰� */
 }
 .leftvlue {
-  width: 80%;
+  width: 100%;
   margin-top: 10px;
 }
 .leftvlue-bg {
diff --git a/src/views/patient/patient/index.vue b/src/views/patient/patient/index.vue
index 055b5e9..fb70456 100644
--- a/src/views/patient/patient/index.vue
+++ b/src/views/patient/patient/index.vue
@@ -150,7 +150,7 @@
             </el-form>
 
             <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
+              <!-- <el-col :span="1.5">
                 <el-button
                   type="primary"
                   plain
@@ -160,7 +160,7 @@
                   v-hasPermi="['system:user:add']"
                   >鏂板</el-button
                 >
-              </el-col>
+              </el-col> -->
 
               <el-col :span="1.5">
                 <el-button
@@ -556,7 +556,7 @@
 
         <el-row v-if="!amendtag">
           <el-col :span="12">
-            <el-form-item label="鍑虹敓鍦�" prop="idcardno">
+            <el-form-item label="鍑虹敓鍦�" prop="birthplace">
               <el-input
                 v-model="form.birthplace"
                 placeholder="鍥姐�佺渷銆佸湴甯傘�佸尯鍘裤�佽閬撶瓑璇︾粏淇℃伅"
@@ -564,7 +564,7 @@
               />
             </el-form-item> </el-col
           ><el-col :span="12">
-            <el-form-item label="灞呬綇鍦�" prop="idcardno">
+            <el-form-item label="灞呬綇鍦�" prop="placeOfResidence">
               <el-input
                 v-model="form.placeOfResidence"
                 placeholder="鍥姐�佺渷銆佸湴甯傘�佸尯鍘裤�佽閬撶瓑璇︾粏淇℃伅"
@@ -988,7 +988,7 @@
         ],
 
         idcardno: [
-          { required: true, message: "璇佷欢鍙疯兘涓虹┖", trigger: "blur" },
+          { required: true, message: "璇佷欢鍙峰彲鑳戒负绌�", trigger: "blur" },
           {
             pattern:
               /^\d{6}((((((19|20)\d{2})(0[13-9]|1[012])(0[1-9]|[12]\d|30))|(((19|20)\d{2})(0[13578]|1[02])31)|((19|20)\d{2})02(0[1-9]|1\d|2[0-8])|((((19|20)([13579][26]|[2468][048]|0[48]))|(2000))0229))\d{3})|((((\d{2})(0[13-9]|1[012])(0[1-9]|[12]\d|30))|((\d{2})(0[13578]|1[02])31)|((\d{2})02(0[1-9]|1\d|2[0-8]))|(([13579][26]|[2468][048]|0[048])0229))\d{2}))(\d|X|x)$/,
@@ -999,6 +999,9 @@
         placeOfResidence: [
           { required: true, message: "灞呬綇鍦颁笉鑳戒负绌�", trigger: "blur" },
         ],
+        birthplace: [
+          { required: true, message: "鍑虹敓鍦颁笉鑳戒负绌�", trigger: "blur" },
+        ],
       },
     };
   },
diff --git a/src/views/patient/patient/profile/index.vue b/src/views/patient/patient/profile/index.vue
index a981c61..07ef578 100644
--- a/src/views/patient/patient/profile/index.vue
+++ b/src/views/patient/patient/profile/index.vue
@@ -872,13 +872,33 @@
       record: [
         {
           name: "瀹f暀浠诲姟",
+          serviceType:'4',
+          templatename:'绠¢ゲ瀹f暀涓�鏈�',
+          createTime:'2024-11-10',
+          finishtime:'2024-11-12',
+          createBy:'鐜嬫斂',
+          drname:'鍒樻槑',
+          nurseName:'寮犳窇鐞�',
+          excep:'0',
+          deptname:'鍛煎惛绉�',
+          leavehospitaldistrictname:'浜旂梾鍖�',
         },
         {
-          name: "閫氱煡浠诲姟",
+          name: "闅忚浠诲姟",
+          serviceType:'2',
+          templatename:'蹇冭绠¢殢璁夸竴鏈�',
+          createTime:'2024-11-11',
+          finishtime:'2024-11-14',
+          createBy:'绔犵▼',
+          drname:'鍒樻槑',
+          nurseName:'鏉庝附',
+          excep:'0',
+          deptname:'鍛煎惛绉�',
+          leavehospitaldistrictname:'浜旂梾鍖�',
         },
-        {
-          name: "闂嵎璋冩煡",
-        },
+        // {
+        //   name: "闂嵎璋冩煡",
+        // },
       ],
       inputVisible: false,
       AddanumberVisible: false,
diff --git a/src/views/patient/propaganda/Missioncreation.vue b/src/views/patient/propaganda/Missioncreation.vue
index edbe31c..e50cc2b 100644
--- a/src/views/patient/propaganda/Missioncreation.vue
+++ b/src/views/patient/propaganda/Missioncreation.vue
@@ -1573,7 +1573,6 @@
     handleFileSuccess(response, file, fileList) {
       this.upload.isUploading = false;
       this.uploadingData = response.rows;
-      console.log(response, "鏂囦欢");
 
       this.$refs.upload.clearFiles();
     },
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index a6a2788..a7618ae 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -78,7 +78,7 @@
                       v-for="(item, index) in checkboxlist"
                       :key="index"
                       :label="item.value"
-                       @change="checkboxChange($event, item.value)"
+                      @change="checkboxChange($event, item.value)"
                     >
                       {{ item.label }}</el-checkbox
                     >
@@ -94,7 +94,7 @@
                       :disable-transitions="false"
                       @close="handleClosetag(tag)"
                     >
-                      ({{index+1}}){{ tag.label }}
+                      ({{ index + 1 }}){{ tag.label }}
                     </el-tag>
                   </el-form-item>
                 </div>
@@ -253,9 +253,9 @@
                         <el-option
                           class="ruleFormaa"
                           v-for="item in belongWards"
-                          :key="item.districtCode"
-                          :label="item.districtName"
-                          :value="item.districtCode"
+                          :key="item.deptCode"
+                          :label="item.label"
+                          :value="item.deptCode"
                         >
                         </el-option>
                       </el-select> </el-form-item
@@ -394,15 +394,36 @@
                     </el-col>
 
                     <el-col :span="1.5">
-                      <el-button
-                        type="primary"
-                        plain
-                        icon="el-icon-plus"
-                        size="medium"
-                        :disabled="!patientqueryParams.allhosp"
-                        @click="handleQuery"
-                        >鏂板</el-button
-                      >
+                      <div v-if="form.longTask">
+                        <el-tooltip
+
+                          class="item"
+                          effect="dark"
+                          content="闀挎湡浠诲姟涓嶆敮鎸佹墜鍔ㄦ坊鍔犳偅鑰咃紒"
+                          placement="top-start"
+                        >
+                          <el-button
+                            type="primary"
+                            plain
+                            disabled
+                            icon="el-icon-plus"
+                            size="medium"
+                            @click="handleQuery"
+                            >鏂板</el-button
+                          >
+                        </el-tooltip>
+                      </div>
+                      <div v-else>
+                        <el-button
+                          type="primary"
+                          plain
+                          icon="el-icon-plus"
+                          size="medium"
+                          :disabled="!patientqueryParams.allhosp"
+                          @click="handleQuery"
+                          >鏂板</el-button
+                        >
+                      </div>
                     </el-col>
 
                     <!-- <el-col :span="1.5">
@@ -568,7 +589,7 @@
               <el-row :gutter="20">
                 <el-col :span="14">
                   <el-form-item label="鍙敤鐘舵��" prop="isenable">
-                    <el-radio-group v-model="objyl.usestate">
+                    <el-radio-group v-model="objyl.isenable">
                       <el-radio
                         v-for="(item, index) in usable"
                         :label="item.value"
@@ -646,7 +667,7 @@
                         class="ruleFormaa"
                         v-for="item in belongDepts"
                         :key="item.deptCode"
-                        :label="item.deptName"
+                        :label="item.label"
                         :value="item.deptCode"
                       >
                       </el-option>
@@ -667,9 +688,9 @@
                       <el-option
                         class="ruleFormaa"
                         v-for="item in belongWards"
-                        :key="item.districtCode"
-                        :label="item.districtName"
-                        :value="item.districtCode"
+                        :key="item.deptCode"
+                        :label="item.label"
+                        :value="item.deptCode"
                       >
                       </el-option>
                     </el-select> </el-form-item
@@ -892,6 +913,8 @@
   getFollowupclassify,
   depthospgetsonlist,
 } from "@/api/AiCentre/index";
+import { deptTreeSelect } from "@/api/system/user";
+
 
 import SFtable from "@/components/SFtable"; //琛ㄦ牸缁勪欢
 
@@ -904,6 +927,7 @@
       id: "", //
       previewid: "", //浠诲姟妯℃澘浼犻�抜d
       libName: "",
+      username: "",
       objyl: {},
       overallCase: [], //閫夋嫨鎮h�呮��
       allpids: [],
@@ -961,10 +985,10 @@
       ],
 
       tableLabelwj: [
+      { label: "鍒涘缓浜�", width: "", prop: "createBy" },
         { label: "妯℃澘鏍囬", width: "", prop: "templateName" },
         { label: "闅忚鎻忚堪", width: "", prop: "note" },
         { label: "淇敼鏃ユ湡", width: "", prop: "updateTime" },
-        { label: "鍒涘缓浜�", width: "", prop: "createBy" },
       ],
       // 鍙橀噺
       tableLabelvariable: [
@@ -1083,8 +1107,8 @@
         templatename: "",
         templateid: null,
         libtemplateid: null,
-        kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瑙傜湅杩欎唤瀹f暀璧勮銆�",
-        jsy: "璇锋偍娉ㄦ剰浼戞伅鍜岃惀鍏伙紝鐢熸椿涓婅鍔抽�哥粨鍚堬紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈瀹f暀鍐呭灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
+        kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝杩涜鏈鍥炶鏈嶅姟銆�",
+        jsy: "璇锋偍娉ㄦ剰浼戞伅鍜岃惀鍏伙紝鐢熸椿涓婅鍔抽�哥粨鍚堬紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶鍐呭灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
       },
       taskoptions: [
         {
@@ -1180,7 +1204,7 @@
       // 绉戝闄㈠尯鏌ヨ鍏ュ弬
       queryParamsdept: {
         tempid: "",
-        type: 11,
+        type: 2,
       },
       quote: false,
       serviceType: null,
@@ -1190,8 +1214,9 @@
 
   created() {
     this.appraiselist = store.getters.appraiselist;
-    this.belongWards = store.getters.belongWards;
-    this.belongDepts = store.getters.belongDepts;
+    // this.belongWards = store.getters.belongWards;
+    // this.belongDepts = store.getters.belongDepts;
+    this.username = store.getters.name;
     this.mode = store.getters.Askmode;
     this.id = this.$route.query.id;
     this.newadd = this.$route.query.newadd;
@@ -1201,12 +1226,14 @@
     this.form.serviceType = Number(this.$route.query.serviceType);
     this.Acquisitiontype();
     this.Getdetails();
+    this.getDeptTree();
     this.getFollowupclassify();
   },
   activated() {
     if (this.id != this.$route.query.id) {
       this.Acquisitiontype();
       this.Getdetails();
+      this.getDeptTree();
       this.getFollowupclassify();
     }
   },
@@ -1239,6 +1266,33 @@
         result[item.name] = innerObj;
       });
       return result;
+    },
+    getDeptTree() {
+      // 绉戝鍒楄〃
+      deptTreeSelect().then((response) => {
+        let flatArray = this.flattenArray(response.data);
+        this.belongWards = flatArray;
+        this.belongDepts = flatArray;
+      });
+    },
+    flattenArray(multiArray) {
+      let result = [];
+
+      // 閫掑綊鍑芥暟锛岀敤浜庡皢澶氱骇鏁扮粍杞崲涓轰竴缁存暟缁勶紝鍙寘鍚渶搴曞眰鐨勫厓绱�
+      function flatten(element) {
+        // 濡傛灉褰撳墠鍏冪礌鏈夊瓙鍏冪礌锛岀户缁�掑綊
+        if (element.children && element.children.length > 0) {
+          element.children.forEach((child) => flatten(child));
+        } else {
+          // 鍏嬮殕鍏冪礌浠ラ伩鍏嶄慨鏀瑰師濮嬫暟鎹�
+          let item = JSON.parse(JSON.stringify(element));
+          result.push(item); // 灏嗘渶搴曞眰鐨勫厓绱犳坊鍔犲埌缁撴灉鏁扮粍
+        }
+      }
+
+      // 浠庨《灞傚厓绱犲紑濮嬮�掑綊
+      multiArray.forEach((element) => flatten(element));
+      return result; // 杩斿洖鍙寘鍚渶搴曞眰鍏冪礌鐨勪竴缁存暟缁�
     },
     // 鑾峰彇褰撳墠绫诲瀷
     Acquisitiontype() {
@@ -1372,6 +1426,16 @@
           xh: 1,
         },
       ];
+      if (
+        (this.belongWards[0] || this.belongWards[0]) &&
+        this.username == "andmin"
+      ) {
+        if (this.tempbelongWards[0] || this.tempbelongWards[0]) {
+        } else {
+          this.$modal.msgError("璇烽�夋嫨绉戝鎴栫梾鍖�");
+          return;
+        }
+      }
       if (this.checkList[0]) {
         this.form.preachform = this.checkList.join(",");
       } else {
@@ -1462,7 +1526,7 @@
             if (this.form.longTask) {
               this.objyl.longTemp = 1;
             }
-            this.queryParamsdept.type = 1;
+            this.queryParamsdept.type = 2;
             this.queryParamsdept.tempid = row.id;
             this.listDept();
 
@@ -1486,7 +1550,7 @@
           if (this.objyl.suitway)
             this.objyl.suitway = this.objyl.suitway.split(",");
           this.queryParamsdept.tempid = this.form.templateid;
-          this.queryParamsdept.type = 11;
+          this.queryParamsdept.type = 21;
           this.getillness(this.form.libtemplateid);
           // 鎵ц鑾峰彇璇ヤ换鍔℃ā鏉縤d
           this.listDept();
@@ -1551,7 +1615,7 @@
           { label: "鍑洪櫌鏃ユ湡", width: "150", prop: "endtime" },
           { label: "鎮h��", width: "", prop: "name" },
           { label: "韬唤璇�", width: "200", prop: "idcardno" },
-        { label: "鐢佃瘽鍙风爜", width: "180", prop: "telcode" },
+          { label: "鐢佃瘽鍙风爜", width: "180", prop: "telcode" },
           { label: "鎬у埆", width: "", prop: "sex" },
           { label: "骞撮緞", width: "", prop: "age" },
           { label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
@@ -1565,7 +1629,7 @@
           { label: "鍏ラ櫌鏃ユ湡", width: "150", prop: "starttime" },
           { label: "鎮h��", width: "", prop: "name" },
           { label: "韬唤璇�", width: "200", prop: "idcardno" },
-        { label: "鐢佃瘽鍙风爜", width: "180", prop: "telcode" },
+          { label: "鐢佃瘽鍙风爜", width: "180", prop: "telcode" },
           { label: "鎬у埆", width: "", prop: "sex" },
           { label: "骞撮緞", width: "", prop: "age" },
           { label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
@@ -1585,6 +1649,7 @@
         this.patientqueryParams.cry = 1;
       } else if (this.patientqueryParams.allhosp == 4) {
         this.patientqueryParams.cry = 0;
+        this.patientqueryParams.allhosp = "1";
       }
       // 鏉ユ簮鍒ゆ柇
 
@@ -1725,7 +1790,7 @@
         templatename: "",
         templateid: null,
         libtemplateid: null,
-        kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闅忚銆�",
+        kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚銆�",
         jsy: "璇锋偍娉ㄦ剰浼戞伅鍜岃惀鍏伙紝鐢熸椿涓婅鍔抽�哥粨鍚堬紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
       };
 
@@ -1905,6 +1970,9 @@
       this.objyl.ivrTaskTemplateScriptVOList =
         this.objyl.ivrLibaTemplateScriptVOList;
       this.objyl.isoperation = 1;
+      if (this.form.id) {
+        this.objyl.taskid=this.form.id
+      }
       if (this.form.templateid) {
         deleteTaskparticty(this.form.templateid).then((res) => {
           if (res.code == 200) {
@@ -1950,9 +2018,7 @@
         }
       });
     },
-    checkboxChange(checked, value){
-
-    },
+    checkboxChange(checked, value) {},
     // 鏈嶅姟褰㈠紡閫夊彇
     handleCheckedCitiesChange(row) {
       console.log(row, "鏈嶅姟");
@@ -1965,9 +2031,10 @@
       console.log(tag, "tag");
       console.log(this.foncheckList, "foncheckList");
       this.checkList = this.checkList.filter((item) => item != tag.value);
-      this.foncheckList = this.foncheckList.filter(obj => obj.value !== tag.value);
+      this.foncheckList = this.foncheckList.filter(
+        (obj) => obj.value !== tag.value
+      );
       console.log(this.checkList, "checkList");
-
     },
     // 绉戝澶勭悊
     Departmenttreatment() {
@@ -1977,7 +2044,7 @@
           longTemp: this.form.longTask,
           deptCode: item,
           tempid: null,
-          type: 11,
+          type: 21,
         });
       });
 
@@ -1987,7 +2054,7 @@
           longTemp: this.form.longTask,
           deptCode: item,
           tempid: null,
-          type: 11,
+          type: 21,
         });
       });
       console.log(33);
diff --git a/src/views/repositoryai/templateku/configurat/index.vue b/src/views/repositoryai/templateku/configurat/index.vue
index abef0d2..874472d 100644
--- a/src/views/repositoryai/templateku/configurat/index.vue
+++ b/src/views/repositoryai/templateku/configurat/index.vue
@@ -101,7 +101,7 @@
             <el-col :span="12">
               <el-form-item label="鍙敤鐘舵��" prop="region">
                 <el-select
-                  v-model="ruleForm.usestate"
+                  v-model="ruleForm.isenable"
                   size="medium"
                   placeholder="璇烽�夋嫨"
                 >
@@ -567,8 +567,8 @@
                   v-if="topicobj.scriptType == 1"
                 >
                   <el-radio-group v-model="topicobj.branchFlag">
-                    <el-radio :label="1">鏄�</el-radio>
-                    <el-radio :label="0">鍚�</el-radio>
+                    <el-radio :label="'1'">鏄�</el-radio>
+                    <el-radio :label="'0'">鍚�</el-radio>
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item label="閫変腑鎻愮ず" v-if="topicobj.scriptType != 1">
@@ -989,6 +989,20 @@
                   :show-overflow-tooltip="true"
                 />
                 <el-table-column
+                  label="闂绫诲瀷"
+                  align="center"
+                  key="valueType"
+                  prop="valueType"
+                  width="120"
+                >
+                  <template slot-scope="scope">
+                    <dict-tag
+                      :options="valuetypes"
+                      :value="scope.row.valueType"
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column
                   label="閫夐」鍐呭"
                   align="center"
                   key="targetoptions"
@@ -1294,64 +1308,7 @@
                       </el-col>
                     </el-row>
                   </div>
-                  <div class="topicxq">
-                    <el-row :gutter="10">
-                      <el-col :span="20"
-                        ><el-form-item label="鍚笉娓呰瘽鏈�">
-                          <el-input
-                            style="width: 400px"
-                            type="textarea"
-                            placeholder="璇疯緭鍏�"
-                            v-model="indexform.noClearlyText"
-                            show-word-limit
-                          >
-                          </el-input> </el-form-item
-                      ></el-col>
-                    </el-row>
 
-                    <el-row>
-                      <el-col :span="6">
-                        <el-form-item label="鍚笉娓呰闊�" prop="verbaltrickyy">
-                          <el-upload
-                            class="upload-demo"
-                            :action="uploadImgUrl"
-                            :show-file-list="false"
-                            :headers="headers"
-                            :on-success="
-                              (response, file) =>
-                                handleChange(response, file, 4)
-                            "
-                            accept=".wav,.mp3"
-                            :limit="1"
-                          >
-                            <el-button size="small" type="primary"
-                              >鐐瑰嚮涓婁紶</el-button
-                            >
-                          </el-upload>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="6">
-                        <span
-                          style="font-size: 12px"
-                          v-if="indexform.noclearlyvoice"
-                          >{{
-                            indexform.noclearlyvoice.substring(
-                              indexform.noclearlyvoice.lastIndexOf("/") + 1
-                            )
-                          }}</span
-                        >
-                      </el-col>
-                      <el-col :span="6">
-                        <mini-audio
-                          :audio-source="
-                            indexform.noclearlyvoice
-                              ? indexform.noclearlyvoice
-                              : 'https://example.com/example.mp3'
-                          "
-                        ></mini-audio>
-                      </el-col>
-                    </el-row>
-                  </div>
                   <div class="topicxq">
                     <el-row :gutter="10">
                       <el-col :span="20"
@@ -1404,6 +1361,64 @@
                           :audio-source="
                             indexform.sliencevoice
                               ? indexform.sliencevoice
+                              : 'https://example.com/example.mp3'
+                          "
+                        ></mini-audio>
+                      </el-col>
+                    </el-row>
+                  </div>
+                  <div class="topicxq">
+                    <el-row :gutter="10">
+                      <el-col :span="20"
+                        ><el-form-item label="鍚笉娓呰瘽鏈�">
+                          <el-input
+                            style="width: 400px"
+                            type="textarea"
+                            placeholder="璇疯緭鍏�"
+                            v-model="indexform.noClearlyText"
+                            show-word-limit
+                          >
+                          </el-input> </el-form-item
+                      ></el-col>
+                    </el-row>
+
+                    <el-row>
+                      <el-col :span="6">
+                        <el-form-item label="鍚笉娓呰闊�" prop="verbaltrickyy">
+                          <el-upload
+                            class="upload-demo"
+                            :action="uploadImgUrl"
+                            :show-file-list="false"
+                            :headers="headers"
+                            :on-success="
+                              (response, file) =>
+                                handleChange(response, file, 4)
+                            "
+                            accept=".wav,.mp3"
+                            :limit="1"
+                          >
+                            <el-button size="small" type="primary"
+                              >鐐瑰嚮涓婁紶</el-button
+                            >
+                          </el-upload>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="6">
+                        <span
+                          style="font-size: 12px"
+                          v-if="indexform.noclearlyvoice"
+                          >{{
+                            indexform.noclearlyvoice.substring(
+                              indexform.noclearlyvoice.lastIndexOf("/") + 1
+                            )
+                          }}</span
+                        >
+                      </el-col>
+                      <el-col :span="6">
+                        <mini-audio
+                          :audio-source="
+                            indexform.noclearlyvoice
+                              ? indexform.noclearlyvoice
                               : 'https://example.com/example.mp3'
                           "
                         ></mini-audio>
@@ -1494,7 +1509,7 @@
       ruleForm: {
         templateName: "",
         revisitBefore:
-          "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闅忚銆�",
+          "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚銆�",
         revisitAfter:
           "璇锋偍娉ㄦ剰浼戞伅鍜岃惀鍏伙紝鐢熸椿涓婅鍔抽�哥粨鍚堬紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
         ivrLibaTemplateTagList: [],
@@ -1532,6 +1547,7 @@
       usable: [],
       required: [],
       valuetype: [],
+      valuetypes: [],
       askvaluetype: [],
       mode: [],
       inputVisible: false,
@@ -1613,6 +1629,7 @@
     this.usable = store.getters.usable;
     this.required = store.getters.required;
     this.valuetype = store.getters.valuetype;
+    this.valuetypes = store.getters.valuetypelb;
     this.askvaluetype = store.getters.askvaluetype;
     this.languagelist = store.getters.languagelist;
     this.courtyardlist = store.getters.courtyardlist;
@@ -1685,7 +1702,7 @@
             console.log(2211);
             this.ruleForm = res.data;
             if (this.ruleForm.deptNames)
-              this.tempDetpRelevanceslist = JSON.parse(this.ruleForm.deptNames);
+              // this.tempDetpRelevanceslist = JSON.parse(this.ruleForm.deptNames);
             this.ruleForm.suitway = this.ruleForm.suitway.split(",");
             if (this.ruleForm.campus)
               this.ruleForm.campus = this.ruleForm.campus.split(",");
@@ -1828,17 +1845,16 @@
         this.ruleForm.isoperation = 2;
         this.ruleForm.tempDetpRelevances = [];
         compileFollowup(this.ruleForm).then((res) => {
-          if (res.code==200) {
+          if (res.code == 200) {
             this.$modal.msgSuccess("淇敼鎴愬姛");
-          this.confirmillness();
-          this.putbelongDepts(this.id);
-          // this.$modal.closeLoading();
-          // this.$router.go(-1);
-          window.location.reload();
-          }else{
+            this.confirmillness();
+            this.putbelongDepts(this.id);
+            // this.$modal.closeLoading();
+            // this.$router.go(-1);
+            window.location.reload();
+          } else {
             this.$modal.closeLoading();
           }
-
         });
       } else {
         this.ruleForm.isoperation = 1;
@@ -1847,16 +1863,15 @@
           : "1.0";
         this.ruleForm.tempDetpRelevances = [];
         compileFollowup(this.ruleForm).then((res) => {
-          if (res.code==200) {
+          if (res.code == 200) {
             this.$modal.msgSuccess("鏂板鎴愬姛");
             this.confirmillness(res.data);
             this.putbelongDepts(res.data);
             this.$modal.closeLoading();
             this.$router.go(-1);
-          }else{
+          } else {
             this.$modal.closeLoading();
           }
-
         });
       }
     },
@@ -2165,6 +2180,8 @@
     },
     // 闂鎺掑簭
     sortFn() {
+      console.log(this.ruleForm.ivrLibaTemplateScriptVOList);
+
       this.ruleForm.ivrLibaTemplateScriptVOList.forEach((item, index) => {
         item.sort = Number(index) + 1;
         console.log(this.ruleForm.ivrLibaTemplateScriptVOList.length);
@@ -2175,7 +2192,7 @@
         } else {
           item.nextScriptno = item.sort + 1;
         }
-        if (item.ivrLibaScriptTargetoptionList) {
+        if (item.ivrLibaScriptTargetoptionList&&!item.branchFlag) {
           item.ivrLibaScriptTargetoptionList.forEach((items) => {
             items.nextQuestion = Number(item.sort) + 1;
           });
@@ -2186,7 +2203,22 @@
       console.log(this.ruleForm.ivrLibaTemplateScriptVOList);
     },
     // -----------------------璇濇湳閫夐」
-    deloption() {},
+    deloption(item) {
+      const index = this.topicobj.ivrLibaScriptTargetoptionList.indexOf(item);
+      if (index != -1) {
+        if (item.id) {
+          console.log(item, "chunz");
+          item.isoperation = 3;
+          console.log(this.topicobj.ivrLibaScriptTargetoptionList);
+          this.$forceUpdate();
+        } else {
+          this.topicobj.ivrLibaScriptTargetoptionList.splice(index, 1); // 浠庣储寮曚綅缃垹闄や竴涓厓绱�
+        }
+        // this.sortFn();
+      } else {
+        console.log("鏈壘鍒拌瀵硅薄");
+      }
+    },
     // 淇敼棰樼洰淇℃伅
     Submittopicobj() {
       this.$modal
@@ -2206,7 +2238,7 @@
           this.drawer = false;
 
           this.sortFn();
-          this.$modal.msgSuccess("棰樼洰鏂板鎴愬姛锛屼繚瀛樻ā鏉垮け鏁�");
+          this.$modal.msgSuccess("棰樼洰鏂板鎴愬姛锛屼繚瀛樻ā鏉跨敓鏁�");
         });
     },
 
diff --git a/src/views/repositoryai/verbaltrick/index.vue b/src/views/repositoryai/verbaltrick/index.vue
index 7dfaf18..e3f02ae 100644
--- a/src/views/repositoryai/verbaltrick/index.vue
+++ b/src/views/repositoryai/verbaltrick/index.vue
@@ -86,7 +86,6 @@
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item>
-
               <el-form-item label="璇█" prop="status">
                 <el-select v-model="queryParams.language" placeholder="璇烽�夋嫨">
                   <el-option
@@ -204,6 +203,17 @@
               >
                 <template slot-scope="scope">
                   <dict-tag :options="mode" :value="scope.row.suitway" />
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="闂绫诲瀷"
+                align="center"
+                key="valueType"
+                prop="valueType"
+                width="120"
+              >
+                <template slot-scope="scope">
+                  <dict-tag :options="valuetype" :value="scope.row.valueType" />
                 </template>
               </el-table-column>
               <el-table-column
@@ -542,6 +552,7 @@
 
       mode: [],
       languagelist: [],
+      valuetype:[],
       qyoptions: [],
       // 鏌ヨ鍙傛暟
       queryParams: {
@@ -563,6 +574,7 @@
     this.getDeptTree();
     this.mode = store.getters.mode;
     this.languagelist = store.getters.languagelist;
+    this.valuetype = store.getters.valuetypelb;
     this.qyoptions = store.getters.usable;
   },
 
diff --git a/src/views/repositoryai/verbaltrick/particulars/index.vue b/src/views/repositoryai/verbaltrick/particulars/index.vue
index abac453..44205a7 100644
--- a/src/views/repositoryai/verbaltrick/particulars/index.vue
+++ b/src/views/repositoryai/verbaltrick/particulars/index.vue
@@ -62,6 +62,16 @@
                   @focus="handleInput('scriptContent')"
                 />
               </el-form-item>
+              <el-form-item label="闂鎻忚堪" prop="scriptDesc">
+                <el-input
+                  :rows="1"
+                  type="textarea"
+                  id="scriptDesc"
+                  show-word-limit
+                  placeholder="璇疯緭鍏ユ弿杩板唴瀹�"
+                  v-model.sync="indexform.scriptDesc"
+                />
+              </el-form-item>
           <el-row>
             <el-col :span="12">
               <el-form-item label="璇█" prop="deptId">
diff --git a/vue.config.js b/vue.config.js
index ea845cf..022196a 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,7 +36,8 @@
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://192.168.168.60:8095`,
-        target: `http://10.202.20.185:8095`,
+        // target: `http://10.202.20.185:8095`,
+        target: `http://192.168.2.13:8095`,
         // target:`http://localhost:8095`,
         // target: `http://192.168.101.135:8095`,
         // target: `http://192.168.101.166:8093`,

--
Gitblit v1.9.3