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

src/api/system/specialDiseaseRoute.js

@@ -26,6 +26,14 @@ export function addSpecialDiseaseRoute(data) {
     })
 }
 
+//删除主路径
+export function specialDiseaseRoutedel(id) {
+    return request({
+        url: `/system/specialDiseaseRoute/${id}`,
+        method: 'delete'
+    })
+}
+
 // 修改专病路径信息
 export function updateSpecialDiseaseRoute(data) {
     return request({
@@ -35,13 +43,6 @@ export function updateSpecialDiseaseRoute(data) {
     })
 }
 
-// 删除专病路径信息
-export function delSpecialDiseaseRoute(id) {
-    return request({
-        url: '/system/specialDiseaseRoute/' + id,
-        method: 'delete'
-    })
-}
 //科室
 export function selectDiseaseCount(departmentName, releaseStatus, servicePackageId) {
     return request({

src/views/manage/components/wangEditor.vue

@@ -55,7 +55,7 @@ export default ({
             toolbarConfig: {
                 insertKeys: {
                     index: 61,
-                    keys: ['MyButtonMenu', 'MyButtonMenutwo']
+                    keys: ['MyButtonMenu3', 'MyButtonMenu4']
                 },
                 excludeKeys: [
                     'fullScreen',
@@ -224,7 +224,7 @@ export default ({
         this.info();
     }
 })
-class MyButtonMenu {                       // JS 语法
+class MyButtonMenu3 {                       // JS 语法
     constructor(vueInstance) {
         this.vueInstance = vueInstance
         this.title = '添加画像标签字段'
@@ -249,7 +249,7 @@ class MyButtonMenu {                       // JS 语法
         this.vueInstance.labelshow = true
     }
 }
-class MyButtonMenutwo {                       // JS 语法
+class MyButtonMenu4 {                       // JS 语法
     constructor(vueInstance) {
         this.vueInstance = vueInstance
         this.title = '添加知识库字段'
@@ -275,15 +275,15 @@ class MyButtonMenutwo {                       // JS 语法
     }
 }
 const menuConf = {
-    key: 'MyButtonMenu', // 定义 menu key ：要保证唯一、不重复（重要）
+    key: 'MyButtonMenu3', // 定义 menu key ：要保证唯一、不重复（重要）
     factory() {
-        return new MyButtonMenu(that)
+        return new MyButtonMenu3(that)
     },
 };
 const menuConftwo = {
-    key: 'MyButtonMenutwo', // 定义 menu key ：要保证唯一、不重复（重要）
+    key: 'MyButtonMenu4', // 定义 menu key ：要保证唯一、不重复（重要）
     factory() {
-        return new MyButtonMenutwo(that)
+        return new MyButtonMenu4(that)
     },
 };
 const module = {                      // JS 语法

src/views/manage/visitout/index.vue

@@ -303,7 +303,10 @@
         <el-form-item label="手术记录" prop="surgicalRecord" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
           <el-input type="textarea" v-model="form.surgicalRecord" style="width:800px" placeholder="请输入手术记录" :rows="8" />
         </el-form-item>
-        <el-form-item label="病历内容">
+        <el-form-item label="入院病历">
+          <editor v-model="form.inHospitalInfo" :min-height="192" />
+        </el-form-item>
+        <el-form-item label="出院病历" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
           <editor v-model="form.outHospitalInfo" :min-height="192" />
         </el-form-item>
         <!-- <el-form-item label="患者来源" prop="patientSource">

src/views/system/specialDiseaseNode/index.vue

@@ -426,7 +426,18 @@ export default {
                     routeNodeName: item[keytwo],
                 }
             })
-            let keys = [...new Set(keysArr)]
+            let array = keysArr.filter((item, index, arr) =>
+                index === arr.findIndex(ite => (ite.routeNodeDay == item.routeNodeDay && ite.routeNodeName == item.routeNodeName))
+            )
+            // for (var i = 0; i < keysArr.length; i++) {
+            //     for (var j = i + 1; j < keysArr.length; j++) {
+            //         if (keysArr[i].routeNodeDay == keysArr[j].routeNodeDay && keysArr[i].routeNodeName == keysArr[j].routeNodeName) {
+            //             keysArr.splice(j, 1);
+            //             j--;
+            //         }
+            //     }
+            // }
+            let keys = [...new Set(array)]
             let newList = keys.map(item => {
                 return {
                     //这里写新的 数据结构 如下是整体复制

src/views/system/specialDiseaseRoute/index.vue

@@ -188,8 +188,8 @@
 
 <script>
 import {
-  listSpecialDiseaseRoute, getSpecialDiseaseRoute, delSpecialDiseaseRoute, addSpecialDiseaseRoute, updateSpecialDiseaseRoute,
+  listSpecialDiseaseRoute, getSpecialDiseaseRoute, addSpecialDiseaseRoute, updateSpecialDiseaseRoute,
-  editReleaseStatus, selectDiseaseCount, getDepartmentList, getdiseaseList
+  editReleaseStatus, selectDiseaseCount, getDepartmentList, getdiseaseList, specialDiseaseRoutedel
 } from "@/api/system/specialDiseaseRoute";
 import {
   servicepackageinfo