From 6be49398a90a339a6c72ac9ea7a09fc368acda87 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 30 四月 2025 15:48:08 +0800
Subject: [PATCH] 测试完成

---
 src/api/AiCentre/index.js                               |    2 
 src/views/followvisit/tasklist/index.vue                |    2 
 src/views/index.vue                                     |   74 ++++++---
 src/views/followvisit/technology/index.vue              |    4 
 src/views/followvisit/SpecificDisease/index.vue         |    4 
 src/views/knowledge/questionnaire/compilequer/index.vue |   50 +++++
 src/views/patient/medtechnician/PatientChart.vue        |    2 
 src/views/followvisit/record/index.vue                  |    1 
 src/views/patient/propaganda/QuestionnaireTask.vue      |   44 ++++-
 /dev/null                                               |   35 ----
 src/views/followvisit/record/detailpage/index.vue       |   25 ++
 src/views/sfstatistics/percentage/index.vue             |   93 ++++++++---
 src/views/patient/patient/profile/index.vue             |    2 
 src/api/AiCentre/EChartsdata.js                         |   53 ++++++
 src/views/patient/propaganda/particty.vue               |   33 +++
 src/api/AiCentre/external.js                            |    2 
 src/views/followvisit/discharge/index.vue               |    6 
 17 files changed, 309 insertions(+), 123 deletions(-)

diff --git a/src/api/AiCentre/EChartsdata.js b/src/api/AiCentre/EChartsdata.js
new file mode 100644
index 0000000..94c3984
--- /dev/null
+++ b/src/api/AiCentre/EChartsdata.js
@@ -0,0 +1,53 @@
+import request from "@/utils/request";
+
+
+// 鏌ヨ闂ㄨ瘖鐪嬬梾浜烘鍜屼汉鏁�
+export function getEChartsPatMedOuthospCount(data) {
+  return request({
+    url: "/smartor/patouthosp/selectPatMedOuthospCount",
+    method: "post",
+    data: data,
+  });
+}
+// 鏌ヨ鍑恒�佸叆闄㈢湅鐥呬汉娆″拰浜烘暟
+export function getechartsListCountdata(data) {
+  return request({
+    url: "/smartor/patinhosp/selectPatMedInhospListCount",
+    method: "post",
+    data: data,
+  });
+}
+// 鏌ヨ鎮ｈ�呴棬璇婅褰曞垪琛�
+export function getechartsMedOuthospList(data) {
+  return request({
+    url: "/smartor/patouthosp/selectPatMedOuthospList",
+    method: "post",
+    data: data,
+  });
+}
+// 鏌ヨ鎮ｈ�呬綇闄㈣褰曞垪琛�
+export function getechartsMedInhospList(data) {
+  return request({
+    url: "/smartor/patinhosp/selectPatMedInhospList",
+    method: "post",
+    data: data,
+  });
+}
+
+// 鏌ヨ褰撳墠鐧婚檰浜鸿嚜宸憋紙鐥呭尯銆侀儴闂級鐨勬偅鑰呬綇闄㈣褰曞垪琛�
+export function getechartsandData(data) {
+  return request({
+    url: "/smartor/patinhosp/selectPatMedInhospListByCondition",
+    method: "post",
+    data: data,
+  });
+}
+
+// 鍚勭瀹ゆ湇鍔′汉娆�
+export function getDeptRanking(data) {
+  return request({
+    url: "/smartor/patinhosp/getDeptRanking",
+    method: "post",
+    data: data,
+  });
+}
diff --git a/src/api/AiCentre/Homeimage.js b/src/api/AiCentre/Homeimage.js
deleted file mode 100644
index 53286d8..0000000
--- a/src/api/AiCentre/Homeimage.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import request from "@/utils/request";
-
-// 闂ㄨ瘖鍩虹鏁版嵁
-export function getoutpatientamount(data) {
-  return request({
-    url: "/smartor/patouthosp/selectPatMedOuthospCount",
-    method: "post",
-    data: data,
-  });
-}
-// 鍦ㄩ櫌/鍑洪櫌鍩虹鏁版嵁
-export function getInhospital(data) {
-  return request({
-    url: "/smartor/patinhosp/selectPatMedInhospListCount",
-    method: "post",
-    data: data,
-  });
-}
-// 涓儴鏁版嵁鎹�
-export function getBarchart(data) {
-  return request({
-    url: "/smartor/serviceSubtask/getSfFzInfoEveryMonth",
-    method: "post",
-    data: data,
-  });
-}
-
-// 鎷垮彇涓儴鏁版嵁澶у浘
-export function getMissiondata(Id) {
-  return request({
-    url: "/smartor/serviceSubtask/getSfFzInfoEveryMonth",
-    ethod: "post",
-    data: data,
-  });
-}
diff --git a/src/api/AiCentre/external.js b/src/api/AiCentre/external.js
index ea123af..cba2ebd 100644
--- a/src/api/AiCentre/external.js
+++ b/src/api/AiCentre/external.js
@@ -95,7 +95,7 @@
 // 鏂板鏈嶅姟
 export function addserviceSubtask(data) {
   return request({
-    url: "/smartor/serviceSubtask/addSubTask",
+    url: "/smartor/serviceSubtask/addSubTaskAgain",
     method: "post",
     data: data
   });
diff --git a/src/api/AiCentre/index.js b/src/api/AiCentre/index.js
index 1265370..7db4067 100644
--- a/src/api/AiCentre/index.js
+++ b/src/api/AiCentre/index.js
@@ -7,5 +7,5 @@
 export * from './questionnaire'
 export * from './SingleTask'
 export * from './external'
-export * from './Homeimage'
 export * from './patientexternal'
+export * from './EChartsdata'
diff --git a/src/views/followvisit/SpecificDisease/index.vue b/src/views/followvisit/SpecificDisease/index.vue
index 0a9a515..c9eaba7 100644
--- a/src/views/followvisit/SpecificDisease/index.vue
+++ b/src/views/followvisit/SpecificDisease/index.vue
@@ -469,7 +469,7 @@
           class-name="small-padding fixed-width"
         >
           <template slot-scope="scope">
-            <el-tooltip
+            <!-- <el-tooltip
               class="item"
               effect="dark"
               content="鍐嶆闅忚"
@@ -484,7 +484,7 @@
                   ><i class="el-icon-s-promotion"></i>鍐嶆闅忚</span
                 ></el-button
               >
-            </el-tooltip>
+            </el-tooltip> -->
             <el-tooltip
               v-if="scope.row.sendstate == 1 || scope.row.sendstate == 2"
               class="item"
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 2c6f80d..cde20d4 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -226,7 +226,6 @@
       <el-table
         v-loading="loading"
         :data="userList"
-        height="968"
         :row-class-name="tableRowClassName"
         @selection-change="handleSelectionChange"
       >
@@ -510,7 +509,7 @@
           class-name="small-padding fixed-width"
         >
           <template slot-scope="scope">
-            <el-tooltip
+            <!-- <el-tooltip
               class="item"
               effect="dark"
               content="鍐嶆闅忚"
@@ -542,7 +541,7 @@
                   ><i class="el-icon-remove-outline"></i>鏆傚仠鏈嶅姟</span
                 ></el-button
               >
-            </el-tooltip>
+            </el-tooltip> -->
             <el-button size="medium" type="text" @click="Seedetails(scope.row)"
               ><span class="button-zx"
                 ><i class="el-icon-s-order"></i>鏌ョ湅璇︽儏</span
@@ -1580,6 +1579,7 @@
           form.id = null;
           form.sendstate = 2;
           form.preachform = form.preachformson;
+          form.longTask = 0;
           addserviceSubtask(form).then((res) => {
             if (res.code == 200) {
               this.$modal.msgSuccess("鍒涘缓鎴愬姛");
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index b51ea96..5e0f9e1 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -243,7 +243,11 @@
               <el-button plain type="info" @click="Editsingletaskson('5')"
                 >涓績闅忚</el-button
               >
-              <el-button type="primary" round v-if="this.form.isVisitAgain!=2" @click="sendAgain()"
+              <el-button
+                type="primary"
+                round
+                v-if="this.form.isVisitAgain != 2"
+                @click="sendAgain()"
                 >鍐嶆闅忚</el-button
               >
             </div>
@@ -599,7 +603,9 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">鍙� 娑�</el-button>
+        <el-button type="warning" @click="dialogFormVisible = false"
+          >鍙� 娑�</el-button
+        >
         <el-button type="primary" @click="setupsubtask">纭鍒涘缓鏈嶅姟</el-button>
       </div>
     </el-dialog>
@@ -957,7 +963,7 @@
     },
     // 璋冭捣鍐嶆鍙戦��
     sendAgain() {
- document.querySelector("#app").scrollTo(0, 0);
+      document.querySelector("#app").scrollTo(0, 0);
       // scrollTo(0, 0)
       this.dialogFormVisible = true;
     },
@@ -1026,16 +1032,25 @@
           form.finishtime = "";
           if (form.resource) {
             if (form.resource == 2) {
-              form.serviceType = 10;
+              form.serviceType = 13;
             }
           } else {
             this.$modal.msgError("鏈�夋嫨闅忚鏂瑰紡");
           }
-          form.id = null;
+          // form.id = null;
           form.sendstate = 2;
           addserviceSubtask(form).then((res) => {
             if (res.code == 200) {
               this.$modal.msgSuccess("鍒涘缓鎴愬姛");
+              if (form.serviceType == 13) {
+                this.$router.push({
+                  path: "/logisticsservice/record",
+                });
+              }else if (form.serviceType == 2) {
+                this.$router.push({
+                  path: "/followvisit/discharge",
+                });
+              }
             } else {
               this.$modal.msgError("鍒涘缓澶辫触");
             }
diff --git a/src/views/followvisit/record/index.vue b/src/views/followvisit/record/index.vue
index 85651b4..c70694d 100644
--- a/src/views/followvisit/record/index.vue
+++ b/src/views/followvisit/record/index.vue
@@ -216,7 +216,6 @@
       <el-table
         v-loading="loading"
         :data="userList"
-        height="806"
         :row-class-name="tableRowClassName"
         @selection-change="handleSelectionChange"
       >
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index d04ce6b..c2c7944 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -530,7 +530,7 @@
         },
         {
           value: "13",
-          label: "涓撶闅忚",
+          label: "涓撶梾闅忚",
         },
       ],
       tasktopic: "2", //鏂板绫诲瀷
diff --git a/src/views/followvisit/technology/index.vue b/src/views/followvisit/technology/index.vue
index 5f9e835..ef23760 100644
--- a/src/views/followvisit/technology/index.vue
+++ b/src/views/followvisit/technology/index.vue
@@ -482,7 +482,7 @@
           class-name="small-padding fixed-width"
         >
           <template slot-scope="scope">
-            <el-tooltip
+            <!-- <el-tooltip
               class="item"
               effect="dark"
               content="鍐嶆闅忚"
@@ -497,7 +497,7 @@
                   ><i class="el-icon-s-promotion"></i>鍐嶆闅忚</span
                 ></el-button
               >
-            </el-tooltip>
+            </el-tooltip> -->
             <el-tooltip
               v-if="scope.row.sendstate == 1 || scope.row.sendstate == 2"
               class="item"
diff --git a/src/views/index.vue b/src/views/index.vue
index fdb6d9e..b43ec1e 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -14,8 +14,7 @@
                   text-shadow: 2px 4px 7px rgb(85 132 255 / 50%);
                   color: black;
                 "
-                ></span
-              >
+              ></span>
               <span>{{ endatd }} ~ {{ statd }}</span>
             </div>
             <el-row :gutter="20">
@@ -49,7 +48,7 @@
         <el-col :span="9">
           <div class="grid-content bg-purple headerBox bgc2">
             <div class="title">
-              闂ㄨ瘖鏈嶅姟
+              鍑洪櫌鏈嶅姟
               <span
                 style="
                   font-size: 25px;
@@ -57,8 +56,7 @@
                   font-weight: 600;
                   color: red;
                 "
-                ></span
-              >
+              ></span>
               <span>{{ endatd }} ~ {{ statd }}</span>
             </div>
             <el-row :gutter="20">
@@ -69,7 +67,6 @@
                 <div class="text-color2">
                   <p>鍑洪櫌灏辫瘖閲忥紙浜烘锛�</p>
                 </div>
-
               </el-col>
               <el-col :span="10">
                 <div class="home-user-task-stats">
@@ -291,10 +288,12 @@
 
 <script>
 import {
-  getoutpatientamount,
-  getInhospital,
-  getBarchart,
-  getQtemplateobj,
+  getEChartsPatMedOuthospCount,
+  getechartsListCountdata,
+  getechartsMedOuthospList,
+  getechartsMedInhospList,
+  getechartsandData,
+  getDeptRanking,
 } from "@/api/AiCentre/index";
 import dayjs from "dayjs";
 
@@ -341,9 +340,9 @@
     },
   },
   created() {
-    // this.getoutpatientamount();
-    // this.getInhospital();
-    // this.getBarchart();
+    // this.getTopdata();
+    // this.getgraphdata();
+    // this.getranking();
     this.$nextTick(function () {
       this.getregionAmountCollect();
       this.getnodeCollect();
@@ -369,10 +368,10 @@
       } else {
         this.dyat = 360;
       }
+      this.getgraphdata();
+      this.getranking();
+      this.getTopdata();
       this.getregionAmountCollect();
-      // this.getoutpatientamount();
-      // this.getInhospital();
-      // this.getBarchart();
       this.getnodeCollect();
       this.getSkuTop();
     },
@@ -409,17 +408,44 @@
         { amount: 0, count: 67, skuId: "0", skuName: "鏀惧皠绉�2" },
       ];
     },
-    // 鑾峰彇闂ㄨ瘖鍩虹鏁版嵁
-    getoutpatientamount() {
-      getoutpatientamount().then((res) => {});
+    // 鑾峰彇澶撮儴鏁版嵁
+    getTopdata() {
+      let hospCountdata = {
+        startDate: this.endatd,
+        endDate: this.statd,
+        cy: 1,
+      };
+      let Countdata = {
+        startDate: this.endatd,
+        endDate: this.statd,
+        cy: 1,
+      };
+      getEChartsPatMedOuthospCount(hospCountdata).then((res) => {});
+      getechartsListCountdata(Countdata).then((res) => {});
     },
     // 鑾峰彇灏辫瘖鏁伴噺
-    getBarchart() {
-      getBarchart().then((res) => {});
+    getranking() {
+      let Rankingdata = {
+        startDate: this.endatd,
+        endDate: this.statd,
+        cy: 1,
+      };
+      getDeptRanking(Rankingdata).then((res) => {});
     },
-    // 鑾峰彇鎬婚噺鏁伴噺
-    getInhospital() {
-      getInhospital().then((res) => {});
+    // 鑾峰彇涓儴绾挎煴鍥炬暟鎹�
+    getgraphdata() {
+      let Outhospdata = {
+        startDate: this.endatd,
+        endDate: this.statd,
+        cy: 1,
+      };
+      let Inhospdata = {
+        startDate: this.endatd,
+        endDate: this.statd,
+        cy: 1,
+      };
+      getechartsMedOuthospList(Outhospdata).then((res) => {});
+      getechartsMedInhospList(Inhospdata).then((res) => {});
     },
 
     // 鑾峰彇绾跨姸鍥炬椂闂�
diff --git a/src/views/knowledge/questionnaire/compilequer/index.vue b/src/views/knowledge/questionnaire/compilequer/index.vue
index 208b3a9..5a12bb0 100644
--- a/src/views/knowledge/questionnaire/compilequer/index.vue
+++ b/src/views/knowledge/questionnaire/compilequer/index.vue
@@ -310,7 +310,7 @@
               >涓嬩竴姝�</el-button
             >
             <el-button type="info" @click="closeFm('ruleForm')">鍏抽棴</el-button>
-            <el-button @click="Departmenttreatment('ruleForm')"
+            <el-button @click="toExamine('ruleForm')"
               >淇濆瓨闂嵎鍩虹淇℃伅</el-button
             >
           </el-form-item>
@@ -635,8 +635,8 @@
                         >
                           <el-radio-group v-model="item.score">
                             <el-radio :label="1">A</el-radio>
-                          <el-radio :label="2">B</el-radio>
-                          <el-radio :label="3">C</el-radio>
+                            <el-radio :label="2">B</el-radio>
+                            <el-radio :label="3">C</el-radio>
                           </el-radio-group>
                         </el-form-item>
                         <el-form-item
@@ -747,7 +747,7 @@
         >
         <el-button type="primary" @click="laststep()">涓婁竴姝�</el-button>
         <el-button type="info" @click="closeFm('ruleForm')">鍏抽棴</el-button>
-        <el-button @click="Departmenttreatment('ruleForm')"
+        <el-button @click="toExamine('ruleForm')"
           >淇濆瓨闂鏁版嵁</el-button
         >
       </div>
@@ -1147,8 +1147,8 @@
                         >
                           <el-radio-group v-model="item.score">
                             <el-radio :label="1">A</el-radio>
-                          <el-radio :label="2">B</el-radio>
-                          <el-radio :label="3">C</el-radio>
+                            <el-radio :label="2">B</el-radio>
+                            <el-radio :label="3">C</el-radio>
                           </el-radio-group>
                         </el-form-item>
                         <el-form-item
@@ -1636,6 +1636,44 @@
         });
       }
     },
+    // 棰樼洰鏍￠獙
+    toExamine() {
+      // 閬嶅巻棰樼洰闆嗗悎
+      for (let i = 0; i <  this.ruleForm.svyTemplateLibScripts.length; i++) {
+        const question =  this.ruleForm.svyTemplateLibScripts[i];
+
+        // 濡傛灉 scriptType 涓� 4锛屽垯璺宠繃褰撳墠棰樼洰
+        if (question.scriptType === 4) {
+          continue;
+        }
+        // 鑾峰彇褰撳墠棰樼洰鐨勯�夐」闆嗗悎
+        const options = question.svyLibTemplateTargetoptions;
+
+        // 鍒涘缓涓�涓� Set 鏉ュ瓨鍌ㄩ�夐」鍚嶇О锛岀敤浜庢娴嬮噸澶�
+        const optionNames = new Set();
+
+        // 閬嶅巻閫夐」闆嗗悎
+        for (let j = 0; j < options.length; j++) {
+          const option = options[j];
+          const optionContent = option.optioncontent;
+
+          // 濡傛灉閫夐」鍚嶇О宸茬粡瀛樺湪浜� Set 涓紝璇存槑閲嶅
+          if (optionNames.has(optionContent)) {
+            this.$message.error(
+              `棰樼洰 ${question.id} 鐨勯�夐」鍚嶇О "${optionContent}" 閲嶅`
+            );
+            return false; // 杩斿洖 false 琛ㄧず鏍￠獙澶辫触
+          }
+          // 灏嗛�夐」鍚嶇О娣诲姞鍒� Set 涓�
+          optionNames.add(optionContent);
+        }
+      }
+
+      // 濡傛灉鎵�鏈夐鐩兘鏍￠獙閫氳繃锛岃繑鍥� true
+      console.log("鎵�鏈夐鐩牎楠岄�氳繃锛岄�夐」鍚嶇О鏃犻噸澶�");
+       this.Departmenttreatment();
+    },
+
     // 绉戝/闄㈠尯澶勭悊
     Departmenttreatment() {
       this.tempDetpRelevanceslist.forEach((item) => {
diff --git a/src/views/patient/medtechnician/PatientChart.vue b/src/views/patient/medtechnician/PatientChart.vue
index 72782ef..a513703 100644
--- a/src/views/patient/medtechnician/PatientChart.vue
+++ b/src/views/patient/medtechnician/PatientChart.vue
@@ -523,7 +523,7 @@
         },
         // {
         //   value: "13",
-        //   label: "涓撶闅忚",
+        //   label: "涓撶梾闅忚",
         // },
       ],
       tasktopic: "2", //鏂板绫诲瀷
diff --git a/src/views/patient/patient/profile/index.vue b/src/views/patient/patient/profile/index.vue
index 976aff7..2a42c54 100644
--- a/src/views/patient/patient/profile/index.vue
+++ b/src/views/patient/patient/profile/index.vue
@@ -383,7 +383,7 @@
           </el-table-column>
 
           <el-table-column
-            label="闂ㄨ瘖鍙�"
+            label="鐥呮鍙�"
             align="center"
             key="outhospno"
             prop="outhospno"
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index 64ad5eb..542a537 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -543,6 +543,12 @@
                   @keyup.enter.native="handleQuery"
                 ></el-input>
               </el-form-item>
+              <el-form-item label="鎮ｈ�呰瘖鏂細">
+                <el-input
+                  v-model="patientqueryParams.leavediagname"
+                  @keyup.enter.native="handleQuery"
+                ></el-input>
+              </el-form-item>
               <el-select
                 v-model="patientqueryParams.searchscope"
                 placeholder="璇烽�夋嫨鎮ｈ�呰寖鍥�"
@@ -587,6 +593,8 @@
           <pagination
             v-show="patienttotal > 0 && this.patientqueryParams.allhosp != 6"
             :total="patienttotal"
+            :page.sync="patientqueryParams.pageNum"
+              :limit.sync="patientqueryParams.pageSize"
             @pagination="handleAddpatient"
           />
         </div>
@@ -727,7 +735,7 @@
                   {{ item.sort }}銆乕澶氶�塢<span>{{ item.scriptContent }}</span>
                 </div>
                 <div class="dev-xx">
-                  <el-checkbox-group v-model="qremark">
+                  <el-checkbox-group v-model="item.qremark">
                     <el-checkbox
                       v-for="(items, index) in item.svyLibTemplateTargetoptions"
                       :key="index"
@@ -761,7 +769,7 @@
       </el-tabs>
 
       <span slot="footer" class="dialog-footer">
-        <!-- <el-button @click="previewGo">淇濆瓨妯℃澘璇︽儏淇敼</el-button> -->
+        <el-button @click="previewGo">淇濆瓨妯℃澘璇︽儏淇敼</el-button>
         <el-button type="primary" @click="Departmenttreatment"
           >淇濆瓨浣跨敤</el-button
         >
@@ -815,7 +823,7 @@
                 <el-button
                   icon="el-icon-refresh"
                   size="medium"
-                  @click="resetQuery"
+                  @click="resetQuerymb"
                   >閲嶇疆</el-button
                 >
               </el-form-item>
@@ -930,6 +938,7 @@
       tableLabelhz: [
         { label: "鍑洪櫌鏃ユ湡", width: "150", prop: "inhosptime" },
         { label: "鎮ｈ��", width: "", prop: "name" },
+        { label: "鎮ｈ�呰瘖鏂�", width: "", prop: "leavediagname" },
         { label: "韬唤璇�", width: "200", prop: "idcardno" },
         { label: "鎬у埆", width: "", prop: "sex" },
         { label: "骞撮緞", width: "", prop: "age" },
@@ -942,6 +951,7 @@
       tableLabelhzwb: [
         { label: "鍑洪櫌鏃ユ湡", width: "150", prop: "endtime" },
         { label: "鎮ｈ��", width: "", prop: "name" },
+        { label: "鎮ｈ�呰瘖鏂�", width: "", prop: "leavediagname" },
         { label: "韬唤璇�", width: "200", prop: "sfzh" },
         { label: "鎬у埆", width: "", prop: "sex" },
         { label: "骞撮緞", width: "", prop: "age" },
@@ -1169,7 +1179,7 @@
         },
         // {
         //   value: "13",
-        //   label: "涓撶闅忚",
+        //   label: "涓撶梾闅忚",
         // },
       ],
       // 绉戝/鐥呭尯
@@ -1537,11 +1547,13 @@
             this.tempbelongWards = [];
             this.objyl.suitway = this.objyl.suitway.split(",");
             this.questionList = res.rows[0].svyTemplateLibScripts;
+            this.questionList.forEach((item) => {
+              item.qremark = [];
+            });
             this.getillness(row.svyid);
             this.previewtf = true;
           }
         });
-        console.log(row.svyTemplateLibScripts);
         this.previewid = row.svyid;
         this.Variablehandling(row.svyTemplateLibScripts, 1);
       } else if (type == 2) {
@@ -1550,8 +1562,6 @@
     },
     // 棰勮
     previewfnmb() {
-      console.log(this.form.templateid);
-
       getTaskQuestioncomit(this.form.templateid).then((res) => {
         if (res.code == 200) {
           console.log(res, "棰勮鏁版嵁");
@@ -1565,6 +1575,9 @@
           getQtemplateobj({ svyid: this.form.libtemplateid }).then((res) => {
             if (res.code == 200) {
               this.questionList = res.rows[0].svyTemplateLibScripts;
+              this.questionList.forEach((item) => {
+                item.qremark = [];
+              });
               this.objyl.svyTemplateLibScripts =
                 res.rows[0].svyTemplateLibScripts;
             }
@@ -1662,6 +1675,7 @@
           // { label: "鍏ラ櫌鏃ユ湡", width: "170", prop: "starttime" },
           { label: "鍑洪櫌鏃ユ湡", width: "150", prop: "endtime" },
           { label: "鎮ｈ��", width: "", prop: "name" },
+        { label: "鎮ｈ�呰瘖鏂�", width: "", prop: "leavediagname" },
           { label: "韬唤璇�", width: "200", prop: "idcardno" },
           { label: "鎬у埆", width: "", prop: "sex" },
           { label: "骞撮緞", width: "", prop: "age" },
@@ -1675,6 +1689,7 @@
         this.tableLabelhz = [
           { label: "鍏ラ櫌鏃ユ湡", width: "150", prop: "starttime" },
           { label: "鎮ｈ��", width: "", prop: "name" },
+        { label: "鎮ｈ�呰瘖鏂�", width: "", prop: "leavediagname" },
           { label: "韬唤璇�", width: "200", prop: "idcardno" },
           { label: "鎬у埆", width: "", prop: "sex" },
           { label: "骞撮緞", width: "", prop: "age" },
@@ -1856,7 +1871,20 @@
       });
     },
 
-    resetQuery() {},
+    resetQuerymb() {
+      this.topqueryParams = { svyname: "" };
+      this.handleQuerymb();
+    },
+    resetQuery() {
+      this.patientqueryParams = {
+        pageNum: 1, //
+        pageSize: 10,
+        topica: 1, //0鍏ㄩ儴1绉戝2鐥呭尯
+        leavehospitaldistrictcodes: [],
+        leaveldeptcodes: [],
+      };
+      this.handleQuery();
+    },
     handleQuerymb() {
       getQtemplatelist(this.topqueryParams).then((response) => {
         this.userList = response.rows;
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index bfa6565..f7aa534 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -792,13 +792,13 @@
           @click="Departmenttreatment"
           >{{ form.templateid ? "鏇挎崲浣跨敤" : "閫夋嫨浣跨敤" }}</el-button
         >
-        <!-- <el-button
+        <el-button
           :type="previewtftype ? 'success' : 'warning'"
           @click="Modifytemplate"
           >{{
             previewtftype ? "鍓嶅線淇敼宸查�夋嫨妯℃澘" : "鏂板淇濆瓨骞跺墠寰�淇敼"
           }}</el-button
-        > -->
+        >
       </span>
     </el-dialog>
     <el-drawer
@@ -1114,7 +1114,10 @@
         templatename: "",
         templateid: null,
         libtemplateid: null,
-        kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄�"+localStorage.getItem("orgname")+"鐨勫尰鎶や汉鍛橈紝涓轰簡鏇村ソ鍦颁簡瑙ｆ偍鐨勫悍澶嶆儏鍐碉紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝杩涜鏈鍥炶鏈嶅姟銆�",
+        kcb:
+          "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄�" +
+          localStorage.getItem("orgname") +
+          "鐨勫尰鎶や汉鍛橈紝涓轰簡鏇村ソ鍦颁簡瑙ｆ偍鐨勫悍澶嶆儏鍐碉紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝杩涜鏈鍥炶鏈嶅姟銆�",
         jsy: "璇锋偍娉ㄦ剰浼戞伅鍜岃惀鍏伙紝鐢熸椿涓婅鍔抽�哥粨鍚堬紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶鍐呭灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
       },
       taskoptions: [
@@ -1205,7 +1208,7 @@
         },
         // {
         //   value: "13",
-        //   label: "涓撶闅忚",
+        //   label: "涓撶梾闅忚",
         // },
       ],
       // 绉戝/鐥呭尯
@@ -1262,7 +1265,7 @@
     this.form.typename = this.$route.query.typename;
     this.serviceType = Number(this.$route.query.serviceType);
     this.form.serviceType = Number(this.$route.query.serviceType);
-    console.log(localStorage.getItem("orgid"),'orgid');
+    console.log(localStorage.getItem("orgid"), "orgid");
 
     this.Acquisitiontype();
     this.getillnesslist();
@@ -1837,7 +1840,20 @@
         this.patientqueryParams.leaveldeptcodes = null;
       this.handleAddpatient();
     },
-    resetQuery() {},
+    resetQuerymb() {
+      this.topqueryParams = { svyname: "" };
+      this.handleQuerymb();
+    },
+    resetQuery() {
+      this.patientqueryParams = {
+        pageNum: 1, //
+        pageSize: 10,
+        topica: 1, //0鍏ㄩ儴1绉戝2鐥呭尯
+        leaveldeptcodes: [],
+        leavehospitaldistrictcodes: [],
+      };
+      this.handleQuery();
+    },
     handleQuerymb() {
       getFollowuplist(this.topqueryParams).then((response) => {
         this.userList = response.rows;
@@ -1869,7 +1885,10 @@
         templatename: "",
         templateid: null,
         libtemplateid: null,
-        kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄�"+localStorage.getItem("orgname")+"鐨勫尰鎶や汉鍛橈紝涓轰簡鏇村ソ鍦颁簡瑙ｆ偍鐨勫悍澶嶆儏鍐碉紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝杩涜鏈鍥炶鏈嶅姟銆�",
+        kcb:
+          "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄�" +
+          localStorage.getItem("orgname") +
+          "鐨勫尰鎶や汉鍛橈紝涓轰簡鏇村ソ鍦颁簡瑙ｆ偍鐨勫悍澶嶆儏鍐碉紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝杩涜鏈鍥炶鏈嶅姟銆�",
         jsy: "璇锋偍娉ㄦ剰浼戞伅鍜岃惀鍏伙紝鐢熸椿涓婅鍔抽�哥粨鍚堬紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
       };
 
diff --git a/src/views/sfstatistics/percentage/index.vue b/src/views/sfstatistics/percentage/index.vue
index a0d85e3..3d34079 100644
--- a/src/views/sfstatistics/percentage/index.vue
+++ b/src/views/sfstatistics/percentage/index.vue
@@ -67,13 +67,12 @@
                 </el-select> -->
                 <el-select
                   v-model="queryParams.leavehospitaldistrictcodes"
-
                   size="medium"
                   multiple
                   filterable
                   placeholder="璇烽�夋嫨鐥呭尯"
                 >
-                <el-option
+                  <el-option
                     v-for="item in flatArray"
                     :key="item.deptCode"
                     :label="item.label"
@@ -103,7 +102,24 @@
                 >
                 </el-date-picker>
               </el-form-item> -->
-              <el-form-item label="缁熻鏃ユ湡" prop="userName">
+              <el-select
+                v-model="queryParams.serviceType"
+                multiple
+                placeholder="璇烽�夋嫨"
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+              <el-form-item
+                label-width="200"
+                label="搴旈殢璁挎椂闂磋寖鍥�"
+                prop="userName"
+              >
                 <el-date-picker
                   v-model="queryParams.dateRange"
                   type="daterange"
@@ -218,7 +234,7 @@
               </el-table-column>
 
               <el-table-column
-                label="鎮ｈ�呰繃婊ゆ暟閲�"
+                label="涓嶆墽琛�"
                 align="center"
                 width="120"
                 key="bzxCount"
@@ -267,8 +283,8 @@
                 key="sfwcl"
                 prop="sfwcl"
               >
-              <template slot-scope="scope">
-                  <span>{{ (Number(scope.row.sfwcl)*100).toFixed(2) }}%</span>
+                <template slot-scope="scope">
+                  <span>{{ (Number(scope.row.sfwcl) * 100).toFixed(2) }}%</span>
                 </template>
               </el-table-column>
               <!-- <el-table-column
@@ -370,9 +386,9 @@
                     type="danger"
                     plain
                     @click="routerErr(scope.row)"
-                    ><span class="button-zx"
-                      >{{scope.row.yczs}}</span
-                    ></el-button
+                    ><span class="button-zx">{{
+                      scope.row.yczs
+                    }}</span></el-button
                   >
                 </template>
               </el-table-column>
@@ -462,9 +478,7 @@
   listtag,
   tagclassifylist,
 } from "@/api/system/label";
-import {
-  getSfStatistics,deptTreeSelect
-} from "@/api/system/user";
+import { getSfStatistics, deptTreeSelect } from "@/api/system/user";
 
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -513,7 +527,7 @@
       idds: "", //鍒嗙被id
       // 鎬绘潯鏁�
       total: 0,
-      flatArray:[],
+      flatArray: [],
       amendtag: false, //鏄惁淇敼绫诲埆
       lstamendtag: false, //鏄惁淇敼鏍囩
       scavisible: false, //鍒犻櫎寮规
@@ -554,21 +568,48 @@
       propss: { multiple: true },
 
       options: [
-        {
+      {
           value: 1,
-          label: "涓滃崡",
+          label: "鐩戞祴璇勪及",
         },
         {
           value: 2,
-          label: "瑗垮寳",
+          label: "鍑洪櫌闅忚",
         },
         {
           value: 3,
-          label: "浠ㄤ花浠�",
+          label: "闂ㄨ瘖闅忚",
         },
         {
           value: 4,
-          label: "鍏椋掗",
+          label: "瀹ｆ暀鍏虫��",
+        },
+        {
+          value: 5,
+          label: "澶嶈瘖绠＄悊",
+        },
+
+        {
+          value: 7,
+          label: "鎮ｈ�呮姤鍛�",
+        },
+
+        {
+          value: 9,
+          label: "浣撴闅忚",
+        },
+
+        {
+          value: 11,
+          label: "褰卞儚闅忚",
+        },
+        {
+          value: 12,
+          label: "蹇冪數闅忚",
+        },
+        {
+          value: 13,
+          label: "涓撶梾闅忚",
         },
       ],
       pickerOptions: {
@@ -587,7 +628,7 @@
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        serviceType:[2],
+        serviceType: [2],
         dateRange: [],
       },
       // 鍒椾俊鎭�
@@ -605,7 +646,7 @@
   watch: {},
   created() {
     this.getList();
-this.getDeptTree();
+    this.getDeptTree();
   },
 
   methods: {
@@ -635,10 +676,10 @@
       // 绉戝鍒楄〃
       deptTreeSelect().then((response) => {
         this.deptOptions = response.data;
-        console.log( this.deptOptions,' this.deptOptions');
+        console.log(this.deptOptions, " this.deptOptions");
 
         this.flatArray = this.flattenArray(response.data);
-        console.log(this.flatArray,'this.flatArray');
+        console.log(this.flatArray, "this.flatArray");
       });
     },
     flattenArray(multiArray) {
@@ -693,7 +734,7 @@
       };
     },
     routerErr(row) {
-      console.log(row,'璺宠浆寮傚父');
+      console.log(row, "璺宠浆寮傚父");
       this.$router.push({
         path: "/followvisit/discharge",
         query: {
@@ -741,14 +782,16 @@
     handleQuery() {
       this.queryParams.pageNum = 1;
       console.log();
-      this.queryParams.startTime = this.parseTime(this.queryParams.dateRange[0]);
+      this.queryParams.startTime = this.parseTime(
+        this.queryParams.dateRange[0]
+      );
       this.queryParams.endTime = this.parseTime(this.queryParams.dateRange[1]);
       this.getList();
     },
     /** 閲嶇疆鎸夐挳鎿嶄綔 */
     resetQuery() {
       this.queryParams.dateRange = [];
-      this.queryParams.leavehospitaldistrictcodes=[];
+      this.queryParams.leavehospitaldistrictcodes = [];
       this.handleQuery();
     },
     // 澶氶�夋閫変腑鏁版嵁

--
Gitblit v1.9.3