Merge remote-tracking branch 'origin/dev' into dev

src/api/system/specialDiseaseRoute.js

@@ -43,9 +43,9 @@ export function delSpecialDiseaseRoute(id) {
     })
 }
 //科室
-export function selectDiseaseCount(departmentName) {
+export function selectDiseaseCount(departmentName, releaseStatus, servicePackageId) {
     return request({
-        url: `/system/specialDiseaseRoute/departmentRouteCount?departmentName=${departmentName}&releaseStatus=PUBLISHED`,
+        url: `/system/specialDiseaseRoute/departmentRouteCount?departmentName=${departmentName}&releaseStatus=${releaseStatus}&servicePackageId=${servicePackageId}`,
         method: 'get',
 
     })

src/utils/obtainendtime.js

@@ -2,7 +2,6 @@
 function obtainendtime(starttime, item) {
     let currentDate = new Date(starttime)
     let nextDate
-    console.log(item)
     if (item.packageTermUnit == '年') {
         currentDate.setFullYear(currentDate.getFullYear() + Number(item.packageTerm));
         currentDate.setDate(currentDate.getDate() - 1);

src/views/manage/components/RehabilitationPlanandRecords.vue

@@ -250,10 +250,10 @@ export default {
             });
             this.query.patientId = this.$route.query.patientId
             getList(this.query).then(res => {
-                if (res.data.length > 0) {
-                    this.categorylist = res.data
                 this.itemindex = index
                 this.loading.close();
+                if (res.data.length > 0) {
+                    this.categorylist = res.data
                 }
             })
         },

src/views/manage/components/specialDiseaseRoute.vue

@@ -50,11 +50,6 @@
                 {{ scope.row.routeClassify == 'SPECIAL_DIEASE_MANAGE_PATH' ? '专病管理路径' : '' }}
               </template>
             </el-table-column>
-            <el-table-column label="发布状态" align="center" prop="releaseStatus">
-              <template slot-scope="scope">
-                {{ scope.row.releaseStatus == 'PUBLISHED' ? '已发布' : '未发布' }}
-              </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">
@@ -79,7 +74,7 @@ import {
   selectDiseaseCount,
 } from "@/api/system/specialDiseaseRoute";
 export default {
-  props: ['routeId', 'routeName'],
+  props: ['routeId', 'routeName', 'servicePackageId'],
   name: "SpecialDiseaseRoute",
   data() {
     return {
@@ -117,6 +112,7 @@ export default {
         suitRange: null,
         routeSort: null,
         routeRemark: null,
+        servicePackageId: null,
       },
       // 表单校验
       rules: {},
@@ -127,6 +123,7 @@ export default {
     };
   },
   created() {
+    this.queryParams.servicePackageId = this.servicePackageId
     this.getList();
   },
   mounted() {
@@ -138,15 +135,17 @@ export default {
       this.infolists();
     },
     routeId(newValue, oldValue) {
-      if (newValue) {
       this.handleselectId = newValue;
+    },
+    servicePackageId(newValue, oldValue) {
+      if (newValue) {
+        this.queryParams.servicePackageId = newValue;
+        this.getList();
       }
     },
     routeName(newValue, oldValue) {
-      if (newValue) {
       this.handleselectName = newValue;
     }
-    }
   },
   methods: {
     nohandleselect() {
@@ -167,8 +166,7 @@ export default {
     },
     //科室
     infolists() {
-      this.DepartmentoList.releaseStatus = 'PUBLISHED'
+      selectDiseaseCount(this.departmentName, 'PUBLISHED', this.queryParams.servicePackageId).then((res) => {
-      selectDiseaseCount(this.departmentName).then((res) => {
         this.DepartmentoList = res.data;
       });
     },

src/views/manage/continueSigning/index.vue

@@ -101,6 +101,7 @@
                 :inline="true" style="padding-left:40px">
                 <el-form-item label="专病管理路径" prop="routeId">
                     <specialDiseaseRoute @on-template="onroute" :routeId="signPackage.routeId"
+                        v-if="signPackage.servicePackageId" :servicePackageId="signPackage.servicePackageId"
                         :routeName="signPackage.routeName">
                     </specialDiseaseRoute>
                 </el-form-item>

src/views/manage/newSigning/index.vue

@@ -30,7 +30,7 @@
             </el-descriptions>
             <el-form :model="form" :rules="rules" ref="form" label-width="110px" class="demo-ruleForm" :inline="true"
                 style="padding-left:40px">
-                <el-form-item label="健康管理师" prop="healthManageId">
+                <el-form-item label="健康管理师" required>
                     <el-select v-model="form.record.healthManageId" filterable placeholder="请选择健康管理师"
                         style="width:300px" clearable>
                         <el-option v-for="item in attendingPhysicianlist" :key="item.userId" :label="item.nickName"
@@ -93,7 +93,9 @@
             <el-form :model="route" :rules="rules" ref="route" label-width="110px" class="demo-ruleForm" :inline="true"
                 style="padding-left:40px">
                 <el-form-item label="专病管理路径" prop="routeId">
-                    <specialDiseaseRoute @on-template="ontemplate" v-if="signPackage.servicePackageId">
+                    <specialDiseaseRoute @on-template="ontemplate" v-if="signPackage.servicePackageId"
+                        :servicePackageId="signPackage.servicePackageId" :routeName="route.routeName"
+                        :routeId="route.routeId">
                     </specialDiseaseRoute>
                     <el-button size="small" @click="noservicePackageId" v-else
                         style="width: 200px;font-size:14px;color:#C0C4CC;text-align:left">
@@ -235,6 +237,8 @@ export default {
             this.route.routeName = item.routeName
         },
         tappackage(id) {
+            this.route.routeId = ''
+            this.route.routeName = ''
             let item = this.packagelist.find(e => e.id == id)
             this.signPackage = { ...this.signPackage, ...item }
             let datetime = new Date();

src/views/system/specialDiseaseNode/index.vue

@@ -48,10 +48,10 @@
                         <el-card v-for="(uitem, uindex) in item.list" :key="uitem.id"
                             @click.native='bottomclickevent(uitem, index, uindex)'
                             :class="listindex == index && itemindex == uindex ? 'cards' : ''">
-                            <h3 style="height: 20px;">{{ uitem.taskType }}</h3>
+                            <h3 style="height: 20px;">{{ uitem.taskTypeName }}</h3>
                             <el-tag v-if="uitem.routeCheckStatus == 'AGREE'" class="routeCheckStatus">已审核</el-tag>
                             <el-tag v-else type="warning" class="routeCheckStatus">未审核</el-tag>
-                            <p style="height: 16px;">{{ uitem.taskSubdivision }}</p>
+                            <p style="height: 16px;">{{ uitem.taskSubdivisionName }}</p>
                         </el-card>
                     </el-timeline-item>
                 </el-timeline>
@@ -61,28 +61,28 @@
                     <el-form ref="form" :inline="true" :model="form" class="form">
                         <el-form-item label="任务类型" prop="">
                             <el-select v-model="form.taskType" style="width:110px" @change="changeTaskType">
-                                <el-option v-for="item in selectTaskTypeList" :key="item.id" :label="item.taskTypeName"
+                                <el-option v-for="item in selectTaskTypeList" :key="item.taskTypeCode"
-                                    :value="item.taskTypeName">
+                                    :label="item.taskTypeName" :value="item.taskTypeCode">
                                 </el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item label="任务细分" prop="">
                             <el-select v-model="form.taskSubdivision" style="width:110px"
                                 @change="changetaskSubdivision">
-                                <el-option v-for="item in taskPartitionList" :key="item.id" :label="item.taskTypeName"
+                                <el-option v-for="item in taskPartitionList" :key="item.taskPartitionCode"
-                                    :value="item.taskTypeName">
+                                    :label="item.taskPartitionName" :value="item.taskPartitionCode">
                                 </el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item label="任务状态" prop="">
-                            <el-select v-model="form.taskStatus" style="width:100px">
+                            <el-select v-model="form.taskStatus" style="width:110px">
                                 <el-option v-for="item in taskStatusDictList" :key="item.id"
-                                    :label="item.taskStatusName" :value="item.taskStatusName">
+                                    :label="item.taskStatusName" :value="item.taskStatusCode">
                                 </el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item label="二级分类描述" prop="">
-                            <el-input v-model="form.secondClassifyDescribe" style="width:100px"></el-input>
+                            <el-input v-model="form.secondClassifyDescribe" style="width:110px"></el-input>
                         </el-form-item>
                         <el-form-item label="执行时间" prop="">
                             <el-time-select v-model="form.executionTime" style="width:120px" placeholder="选择时间">
@@ -262,7 +262,9 @@
         </div>
         <div slot="footer" class="dialog-footer">
             <el-button @click="TemporaryStorage">暂 存</el-button>
-            <el-button type="primary" @click="dialogVisible = true">审核完成 {{ agreeNumber ? agreeNumber : '0' }} / {{
+            <el-button type="primary" @click="dialogVisible = true" v-if="form.specialDiseaseNodeId">审核完成 {{ agreeNumber
+                    ? agreeNumber :
+                    '0' }} / {{
                     totalNumber ? totalNumber : '0' }}</el-button>
         </div>
         <el-dialog title="提交审核完成" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
@@ -351,7 +353,6 @@ export default {
     },
     created() {
         this.taskinfo();
-        this.info();
     },
     beforeDestroy() { },
     watch: {},
@@ -359,6 +360,7 @@ export default {
     },
     methods: {
         info() {
+            this.lists = []
             if (this.$route.query) {
                 this.updata.suitRange = this.$route.query.suitRange
                 this.updata.routeName = this.$route.query.routeName
@@ -489,33 +491,32 @@ export default {
         taskinfo() {
             selectTaskTypeList().then(res => {
                 this.selectTaskTypeList = res.data
+                this.info();
             })
             taskStatusDictList().then(res => {
                 this.taskStatusDictList = res.data
             })
         },
-        //任务细分
+        //任务类型
-        changeTaskType(name, taskSubdivision) {
+        changeTaskType(code, taskSubdivision) {
-            let id = this.selectTaskTypeList?.find(e => e.taskTypeName == name).id
+            let id = this.selectTaskTypeList?.find(e => e.taskTypeCode == code)?.id
+            this.form.taskTypeName = this.selectTaskTypeList?.find(e => e.taskTypeCode == code)?.taskTypeName
             taskPartitionList(id).then(res => {
                 this.taskPartitionList = res.data
                 this.form.taskSubdivision = ''
                 this.form.taskSubdivisionName = ''
                 this.form.taskSubdivisiontemplateType = ''
-                this.selectTaskTypeList.forEach(el => {
-                    if (name == el.taskTypeName) {
-                        this.form.taskTypeId = el.id
-                    }
-                })
                 if (taskSubdivision) {
+                    this.form.taskSubdivision = taskSubdivision
                     this.changetaskSubdivision(taskSubdivision, 1)
                 }
             })
         },
-        changetaskSubdivision(name, type) {
+        //点击任务细分
-            this.form.taskSubdivision = name
+        changetaskSubdivision(code, type) {
+            this.form.taskSubdivisionName = this.taskPartitionList?.find(e => e.taskPartitionCode == code).taskPartitionName
             this.taskPartitionList.forEach(el => {
-                if (name == el.taskTypeName) {
+                if (code == el.taskPartitionCode) {
                     this.form.executionTime = el.executionTime
                     this.form.taskSubdivisiontemplateType = el.templateType
                     if (!type) {
@@ -604,11 +605,11 @@ export default {
                         routeCheckRemark: this.routeform.routeCheckRemark,
                         routeCheckPerson: JSON.parse(localStorage.getItem('user')).nickName
                     }).then(res => {
+                        loading.close();
                         if (res.data == 1) {
                             this.info();
                             this.handleClose()
                             this.$modal.msgSuccess("审核成功!");
-                            loading.close();
                         }
                     })
                 }

src/views/system/specialDiseaseRoute/index.vue

@@ -305,7 +305,7 @@ export default {
     },
     //科室
     infolists() {
-      selectDiseaseCount(this.departmentName).then((res) => {
+      selectDiseaseCount(this.departmentName, '', '').then((res) => {
         this.DepartmentoList = res.data;
       });
     },