From 531e69ebdb975f785cb35daa6a1f2f2cbc8418fe Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Wed, 10 Apr 2024 16:15:47 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E9=9A=8F=E8=AE=BF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/followupsee/index.vue | 72 ++++++++------------------
 1 file changed, 23 insertions(+), 49 deletions(-)

diff --git a/src/views/system/followupsee/index.vue b/src/views/system/followupsee/index.vue
index 54e03af..12d2786 100644
--- a/src/views/system/followupsee/index.vue
+++ b/src/views/system/followupsee/index.vue
@@ -39,7 +39,6 @@
           <div style="width: 50%">出生日期：{{ list.birthDate }}</div>
         </div>
         <div class="bottom">
-          <!-- <div>注册时间：{{ $route.query.createTime }}</div> -->
           <div>家属电话：{{ list.familyMemberPhone }}</div>
           <div style="width: 50%">住址：{{ list.address }}</div>
         </div>
@@ -271,8 +270,6 @@
             </el-form>
           </div>
         </div>
-
-        <!-- 人工随访 -->
       </div>
     </div>
   </div>
@@ -281,9 +278,7 @@
     <script>
 import { selectFollowPatientInfo, question, addPatientQuestionResult } from "@/api/system/followupsee";
 import { getScript } from "@/api/manage/script";
-
 import Cookies from 'js-cookie'
-
 export default {
   name: "patientdetails",
   data() {
@@ -291,9 +286,8 @@ export default {
       obj: {},
       checkList: [],
       checked: false,
-      formlist:{},
+      formlist: {},
       form: {
-
         taskType: this.$route.query.taskType,
         routeHandleId: Cookies.get('userId'),
         routeHandlePerson: Cookies.get('userName'),
@@ -314,12 +308,6 @@ export default {
           { required: true, message: '请输入任务处理信息', trigger: 'change' }
         ],
       },
-
-      options: [
-        { id: 1, value: 'A', label: '选项A' },
-        { id: 2, value: 'B', label: '选项B', show: 'true' },
-        { id: 3, value: 'C', label: '选项C' }
-      ],
       radio: "B",
       id: "",
       list: [],
@@ -329,9 +317,7 @@ export default {
         totalScore: 0,  //总分
         routeHandlePerson: null,
         routeHandleId: null,
-
       },
-
     };
 
   },
@@ -344,9 +330,6 @@ export default {
       getScript(this.$route.query.templateId).then(response => {
         if (response.data) {
           this.formlist = response.data;
-          
-
-
         }
       });
     }
@@ -359,7 +342,6 @@ export default {
     },
     // 时间填空题 
     timepickerselect(e, index) {
-      console.log(e)
       this.questiondata.questionSubjectList[index].optionAnswer = e
     },
     radioGroupChange(e, item) {
@@ -386,14 +368,10 @@ export default {
       } else {
         this.questiondata.questionSubjectList[index].questionSubjectOptionList[aindex].optionChooseSign = '1'
       }
-      console.log(this.questiondata, '11111111复选框')
     },
-
     info() {
       selectFollowPatientInfo(this.id).then((res) => {
-
         this.list = res.data;
-
       });
 
     },
@@ -432,23 +410,9 @@ export default {
     /** 提交按钮 */
     submit() {
       if (this.$route.query.taskType == 'QUESTIONNAIRE_SCALE') {
-        console.log(this.questiondata, 'questiondata')
         // 对象.新名字=对象.原数组
         this.$delete(this.questiondata, 'updateBy',)
         this.$delete(this.questiondata, 'updateTime',)
-        this.questiondata.subjectResultDTOList = this.questiondata.questionSubjectList
-        this.obj = JSON.parse(JSON.stringify(this.questiondata))
-        delete this.obj.questionSubjectList;
-        this.obj.subjectResultDTOList.forEach(e => {
-          e.optionResultList = e.questionSubjectOptionList
-          if (e.optionResultList.optionSubmitAnswer) {
-            e.optionResultList.optionSubmitAnswer = e.optionResultList.optionSubmitAnswer
-          }
-          this.$delete(this.obj, '0', '')
-          delete e.questionSubjectOptionList;
-        });
-        console.log(this.obj, 'obj')
-
         var score = 0
         // 单选、多选、打分分值
         this.questiondata.questionSubjectList.forEach(e => {
@@ -460,12 +424,26 @@ export default {
                 }
               }
             })
-            console.log(score, 'score')
+            // console.log(score, 'score')
             this.questiondata.totalScore = score
 
           }
 
         })
+        this.questiondata.subjectResultDTOList = this.questiondata.questionSubjectList
+        this.obj = JSON.parse(JSON.stringify(this.questiondata))
+        delete this.obj.questionSubjectList;
+        this.obj.subjectResultDTOList.forEach(e => {
+          e.optionResultList = e.questionSubjectOptionList
+          if (e.optionResultList.optionSubmitAnswer) {
+            e.optionResultList.optionSubmitAnswer = e.optionResultList.optionSubmitAnswer
+          }
+          // this.$delete(this.obj, '0', '')
+          delete e.questionSubjectOptionList;
+        });
+        // console.log(this.obj, 'obj')
+
+
       } else if (this.$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP') {
         console.log(this.questiondata, 'questiondata')
         // 对象.新名字=对象.原数组
@@ -479,20 +457,17 @@ export default {
           if (e.optionResultList.optionSubmitAnswer) {
             e.optionResultList.optionSubmitAnswer = e.optionResultList.optionSubmitAnswer
           }
-          this.$delete(this.obj, '0', '')
+          // this.$delete(this.obj, '0', '')
           delete e.questionSubjectOptionList;
         });
-        console.log(this.obj, 'obj')
-        this.$delete(this.questiondata, 'totalScore',)
+        // this.$delete(this.obj, 'totalScore',)
 
 
       }
-
-
-      // return
       // 问卷、随访
       if (this.$route.query.taskType == 'QUESTIONNAIRE_SCALE' || this.$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP') {
-
+        // console.log(this.obj, 'objobj')
+        // return
         this.$refs["questiondata"].validate(valid => {
           if (valid) {
             addPatientQuestionResult(this.obj).then(response => {
@@ -515,6 +490,8 @@ export default {
           }
         });
       } else if (this.$route.query.taskType == 'PHONE_OUTBOUND') {
+        console.log(this.form, '话术')
+        // return
         this.$refs["form"].validate(valid => {
           if (valid) {
             this.form.departmentId=this.formlist.departmentId,
@@ -544,8 +521,6 @@ export default {
         });
 
       }
-
-
     },
     // 取消
     cencal() {
@@ -555,7 +530,6 @@ export default {
 
       });
     },
-
     handleClick(tab, event) {
       console.log(tab, event);
     },
@@ -563,7 +537,7 @@ export default {
 };
   </script>
     <style lang="scss" scoped>
-    ::v-deep .el-input.is-disabled .el-input__inner {
+::v-deep .el-input.is-disabled .el-input__inner {
   background: #fff !important;
   color: #606266;
 }

From 31236021c7f9660a0a48022c07db71cbb7074149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Wed, 10 Apr 2024 16:29:16 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/Auditing/index.vue           | 53 +++++++++++++++++++
 .../manage/components/signingRecords.vue      |  3 ++
 src/views/manage/manualReview/index.vue       |  2 +-
 3 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 src/views/manage/Auditing/index.vue

diff --git a/src/views/manage/Auditing/index.vue b/src/views/manage/Auditing/index.vue
new file mode 100644
index 0000000..5a8d36d
--- /dev/null
+++ b/src/views/manage/Auditing/index.vue
@@ -0,0 +1,53 @@
+<template>
+    <div class="card">
+        <div class="cardleft">
+            <img class="headsculpture" src="../../../assets/manage/touxiang.png" alt="">
+            <!-- <img class="headsculpture" src="../../../assets/manage/nvtouxiang.png" alt=""> -->
+        </div>
+        <div class="cardright">
+
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    name: "Auditing",
+    data() {
+        return {
+        };
+    },
+    created() {
+    },
+    methods: {
+    }
+};
+</script>
+<style lang="scss" scoped>
+.card {
+    width: 100%;
+    display: flex;
+    justify-content: space-evenly;
+    padding: 20px 0;
+    height: calc(100vh - 84px);
+    background-color: #F1F3F5;
+
+    .cardleft {
+        width: 35%;
+        background-color: #fff;
+        overflow: scroll;
+        padding: 20px;
+
+        .headsculpture {
+            width: 50px;
+            height: 50px;
+        }
+    }
+
+    .cardright {
+        overflow: scroll;
+        background-color: #fff;
+        width: 62%;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/manage/components/signingRecords.vue b/src/views/manage/components/signingRecords.vue
index 4287c73..7633603 100644
--- a/src/views/manage/components/signingRecords.vue
+++ b/src/views/manage/components/signingRecords.vue
@@ -32,6 +32,9 @@
                     </el-descriptions-item>
                     <el-descriptions-item label="签约时间">{{ ByRecord.signTime }}</el-descriptions-item>
                 </el-descriptions>
+                <el-descriptions title="专病管理路径" style="margin-top: 20px;">
+                    <el-descriptions-item label="路径名称">{{ ByRecord.routeName }}</el-descriptions-item>
+                </el-descriptions>
                 <el-descriptions title="硬件信息" style="margin-top: 20px;" class="descriptions">
                     <el-descriptions-item>
                         <el-table :data="ByRecord.signDevices" style="width: 100%">
diff --git a/src/views/manage/manualReview/index.vue b/src/views/manage/manualReview/index.vue
index 878b12e..a6ed3b3 100644
--- a/src/views/manage/manualReview/index.vue
+++ b/src/views/manage/manualReview/index.vue
@@ -14,7 +14,7 @@
                 <el-input v-model="queryParams.patientPhone" placeholder="请输入患者电话" clearable
                     @keyup.enter.native="handleQuery" style="width:200px" />
             </el-form-item>
-            <el-form-item label="出院/就诊时间" prop="dischargeTimeStart">
+            <el-form-item label="出院/就诊时间" prop="dischargeTimeStart" label-width="120px">
                 <el-date-picker v-model="dischargeTime" type="daterange" range-separator="至" start-placeholder="开始日期"
                     style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
                 </el-date-picker>

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

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

diff --git a/src/views/system/specialDiseaseNode/index.vue b/src/views/system/specialDiseaseNode/index.vue
index 4804913..3d1a99b 100644
--- a/src/views/system/specialDiseaseNode/index.vue
+++ b/src/views/system/specialDiseaseNode/index.vue
@@ -318,7 +318,7 @@ export default {
                 specialDiseaseNodeList: [],
             },
             form: {
-                nodeContent: '',
+                nodeContent: '<p></p>',
                 templateId: '',
                 templateName: '',
                 taskType: '',
@@ -383,7 +383,7 @@ export default {
                     routeNodeDay: '',
                     list: [
                         {
-                            nodeContent: '',
+                            nodeContent: '<p></p>',
                             templateId: '',
                             templateName: '',
                             taskType: '',
@@ -475,6 +475,7 @@ export default {
         },
         bottomclickevent(uitem, index, uindex) {
             this.form = uitem
+            this.form.nodeContent = uitem.nodeContent
             if (this.form.taskType) {
                 this.changeTaskType(this.form.taskType, this.form.taskSubdivision)
             }
@@ -530,7 +531,7 @@ export default {
                 routeNodeDay: '',
                 list: [
                     {
-                        nodeContent: '',
+                        nodeContent: '<p></p>',
                         templateId: '',
                         templateName: '',
                         taskType: '',
@@ -553,7 +554,7 @@ export default {
         },
         additem(item) {
             item.list.push({
-                nodeContent: '',
+                nodeContent: '<p></p>',
                 templateId: '',
                 templateName: '',
                 taskType: '',

From 91e4ed1aedf0e76d8351a76dee0c3c5f6011b12d Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Thu, 11 Apr 2024 14:04:09 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E9=9A=8F=E8=AE=BF=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/followup/index.vue    | 3 ++-
 src/views/system/followupsee/index.vue | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/system/followup/index.vue b/src/views/system/followup/index.vue
index da236c4..3cadf21 100644
--- a/src/views/system/followup/index.vue
+++ b/src/views/system/followup/index.vue
@@ -333,7 +333,7 @@
             size="mini"
             type="text"
             icon="el-icon-notebook-2"
-            @click="handledatail(scope.row)"
+            @click="handleUpdate(scope.row)"
             >详情</el-button
           >
         </template>
@@ -771,6 +771,7 @@ export default {
           age: row.birthDate ? getAge(row.birthDate) : "",
           manageRouteId: row.manageRouteId,
           manageRouteNodeId: row.manageRouteNodeId,
+          visitRecordId:row.visitRecordId,
 
           departmentId: row.departmentId,
           departmentName: row.departmentName,
diff --git a/src/views/system/followupsee/index.vue b/src/views/system/followupsee/index.vue
index 12d2786..1b4ee54 100644
--- a/src/views/system/followupsee/index.vue
+++ b/src/views/system/followupsee/index.vue
@@ -340,7 +340,7 @@ export default {
       this.questiondata.questionSubjectList[index].optionAnswer = e
 
     },
-    // 时间填空题 
+    // 时间填空题
     timepickerselect(e, index) {
       this.questiondata.questionSubjectList[index].optionAnswer = e
     },
@@ -388,6 +388,7 @@ export default {
         this.questiondata.manageRouteName = this.$route.query.manageRouteName
         this.questiondata.manageRouteNodeName = this.$route.query.manageRouteNodeName
         this.questiondata.taskType = this.$route.query.taskType
+        this.questiondata.visitRecordId=this.$route.query.visitRecordId
         this.questiondata.totalScore = 0
         this.questiondata.questionSubjectList.forEach(e => {
           if (e.questionType == 'MULTIPLE_CHOICE' || e.questionType == 'MULTIPLE_CHOICE_QUESTIONS' || e.questionType == 'SCORING_QUESTIONS' || e.questionType == 'COMBINATION_RADIO_SUBJECT' || e.questionType == 'COMBINATION_MULTIPLE_SUBJECT' || e.questionType == 'COMBINATION_SCORING_SUBJECT') {

From fdda28cea545c845f3eb9bf6000b285cc648a14a Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Thu, 11 Apr 2024 14:04:49 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E5=AE=A3=E6=95=99=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/manage/propaganda/index.vue b/src/views/manage/propaganda/index.vue
index 88f375e..0f18b4a 100644
--- a/src/views/manage/propaganda/index.vue
+++ b/src/views/manage/propaganda/index.vue
@@ -438,6 +438,7 @@
         </el-form-item>
         <el-form-item label="添加封面" prop="propagandaCoverPath">
           <stationAcatar
+          v-if="open"
             @imgUrl="imgUrl"
             :img="form.propagandaCoverPath"
             :type="'propagandaCoverUrl'"

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

---
 src/views/system/question/index.vue | 50 +++++++++++++++++++----------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/views/system/question/index.vue b/src/views/system/question/index.vue
index 0c0ec5a..8bd98e0 100644
--- a/src/views/system/question/index.vue
+++ b/src/views/system/question/index.vue
@@ -43,16 +43,20 @@
           <el-table-column label="问卷模板ID" align="center" prop="questionnaireId" />
           <el-table-column label="问卷状态" align="center" prop="questionnaireStatus">
             <template slot-scope="scope">
-              <!-- active-text="已发布" inactive-text="未发布" -->
-              <el-switch v-model="scope.row.questionnaireStatus" active-color="#13ce66" inactive-color="#ff4949"
-                active-value="PUBLISHED" inactive-value="UNPUBLISHED" @change="switchstatus($event, scope.row)">
-              </el-switch>
+              <el-tag type="success" v-if="scope.row.questionnaireStatus == 'PUBLISHED'">已发布</el-tag>
+              <el-tag type="warning" v-else>未发布</el-tag>
             </template>
           </el-table-column>
           <el-table-column label="病种名称" align="center" prop="diseaseTypeName" />
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-
             <template slot-scope="scope">
+              <!-- <el-switch v-model="scope.row.questionnaireStatus" active-color="#13ce66" inactive-color="#ff4949"
+                active-value="PUBLISHED" inactive-value="UNPUBLISHED" @change="switchstatus($event, scope.row)">
+              </el-switch> -->
+              <el-button size="mini" type="text" @click="switchstatus('PUBLISHED', scope.row)"
+                v-if="scope.row.questionnaireStatus == 'UNPUBLISHED'">发布</el-button>
+              <el-button size="mini" type="text" @click="switchstatus('UNPUBLISHED', scope.row)"
+                v-if="scope.row.questionnaireStatus == 'PUBLISHED'">取消发布</el-button>
               <el-button size="mini" type="text" @click="handleClassification(scope.row)"
                 v-hasPermi="['system:question:edit']">分类管理</el-button>
               <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
@@ -172,7 +176,7 @@ export default {
     },
     //分类管理
     handleClassification(row) {
-      this.classificationform = row
+      this.classificationform = JSON.parse(JSON.stringify(row))
       if (this.classificationform.departmentId) {
         let query = {
           departmentId: this.classificationform.departmentId
@@ -199,6 +203,8 @@ export default {
       }
       diseaseList(query).then(res => {
         this.diseaselist = res.data
+        this.classificationform.diseaseTypeId = ''
+        this.classificationform.diseaseTypeName = ''
       })
     },
     changediseaseType(e) {
@@ -207,22 +213,32 @@ export default {
     //切换发布状态
     switchstatus(e, item) {
       if (!item.departmentId && !this.diseaseTypeId) {
-        this.$message.error('请选择问卷所属的科室以及科室病种后发布！');
-        this.getList();
+        this.$message.error('请选择问卷所属的科室以及科室病种后发布 / 取消发布！');
         return
       }
-      let query = {
-        id: item.id,
-        questionnaireStatus: e
+      let text
+      if (e == 'PUBLISHED') {
+        text = '是否发布此问卷模板?'
+      } else {
+        text = '是否取消发布此问卷模板?'
       }
-      updateclassification(query).then(res => {
-        if (e == 'PUBLISHED') {
-          this.$modal.msgSuccess("修改为已发布");
-        } else if (e == 'UNPUBLISHED') {
-          this.$modal.msgSuccess("修改为未发布");
+      this.$confirm(`${text}`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+      }).then(() => {
+        let query = {
+          id: item.id,
+          questionnaireStatus: e
         }
+        updateclassification(query).then(res => {
+          if (e == 'PUBLISHED') {
+            this.$modal.msgSuccess("修改为已发布");
+          } else if (e == 'UNPUBLISHED') {
+            this.$modal.msgSuccess("修改为未发布");
+          }
+          this.getList();
+        })
       })
-      this.getList();
     },
     // 节点单击事件
     handleNodeClick(data) {

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

---
 src/views/system/question/index.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/system/question/index.vue b/src/views/system/question/index.vue
index 8bd98e0..721af31 100644
--- a/src/views/system/question/index.vue
+++ b/src/views/system/question/index.vue
@@ -53,10 +53,9 @@
               <!-- <el-switch v-model="scope.row.questionnaireStatus" active-color="#13ce66" inactive-color="#ff4949"
                 active-value="PUBLISHED" inactive-value="UNPUBLISHED" @change="switchstatus($event, scope.row)">
               </el-switch> -->
-              <el-button size="mini" type="text" @click="switchstatus('PUBLISHED', scope.row)"
-                v-if="scope.row.questionnaireStatus == 'UNPUBLISHED'">发布</el-button>
               <el-button size="mini" type="text" @click="switchstatus('UNPUBLISHED', scope.row)"
                 v-if="scope.row.questionnaireStatus == 'PUBLISHED'">取消发布</el-button>
+              <el-button size="mini" type="text" @click="switchstatus('PUBLISHED', scope.row)" v-else>发布</el-button>
               <el-button size="mini" type="text" @click="handleClassification(scope.row)"
                 v-hasPermi="['system:question:edit']">分类管理</el-button>
               <el-button size="mini" type="text" @click="handleUpdate(scope.row)"