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

src/api/system/specialDiseaseRoute.js

@@ -52,11 +52,11 @@ export function updateSpecialDiseaseRoute(data) {
 }
 
 //科室
-export function selectDiseaseCount(departmentName, releaseStatus, servicePackageId) {
+export function selectDiseaseCount(query) {
     return request({
-        url: `/system/specialDiseaseRoute/departmentRouteCount?departmentName=${departmentName}&releaseStatus=${releaseStatus}&servicePackageId=${servicePackageId}`,
+        url: `/system/specialDiseaseRoute/departmentRouteCount`,
         method: 'get',
-
+        params: query
     })
 }
 //所属科室

src/views/components/DepartmentList.vue

@@ -65,6 +65,9 @@ import { listScriptNum } from "@/api/manage/script";
 import { listMessageNum } from "@/api/manage/message";
 import { selectNumByDept } from "@/api/manage/propaganda";
 import { listServicePackageNum } from "@/api/manage/servicepackage";
+import {
+    selectDiseaseCount
+} from "@/api/system/specialDiseaseRoute";
 export default {
     props: ['methods'],
     name: "DepartmentList",
@@ -181,6 +184,8 @@ export default {
                 method = listServicePackageNum(this.querydepartmen)
             } else if (this.methods == 'getDepartmentList') {
                 method = getDepartmentList(this.querydepartmen)
+            } else if (this.methods == 'selectDiseaseCount') {
+                method = selectDiseaseCount(this.querydepartmen)
             }
             method.then(response => {
                 this.DepartmentoList = response.data.deptNumList;
@@ -191,14 +196,6 @@ export default {
                         this.count += item.countNum;
                     }
                 });
-                if (this.methods == 'getDepartmentList') {
-                    this.$emit("clickdepartment", {
-                        hospitalAgencyId: this.querydepartmen.hospitalAgencyId,
-                        itemid: '',
-                        itemName: '',
-                        hospitalAgencyName: this.hospitalAgencyName
-                    });
-                }
                 this.$emit("clickdepartment", {
                     hospitalAgencyId: this.querydepartmen.hospitalAgencyId,
                     itemid: '',

src/views/system/specialDiseaseRoute/index.vue

@@ -2,55 +2,19 @@
   <div class="app-container" ref="layout">
     <el-row :gutter="20">
       <el-col :span="5">
-        <div class="left" ref="box">
+        <DepartmentList ref="DepartmentList" @clickdepartment="clickdepartment" :methods="'selectDiseaseCount'">
-          <div class="name">科室名称</div>
+        </DepartmentList>
-          <div style="padding: 10px 0;">
-            <el-input v-model="departmentName" placeholder="请输入科室名称" clearable @keyup.enter.native="handleQuery" />
-          </div>
-          <div class="listitem" v-for="(item, index) in DepartmentoList" :key="index" @click="clickDepartmenitem(item)">
-            <div :class="queryParams.departmentId == item.id ? 'allactive' : 'all'">
-              {{ item.departmentName }}
-            </div>
-            <span class="count">{{ item.countNum }}</span>
-          </div>
-        </div>
       </el-col>
       <el-col :span="19">
         <div ref="topform" class="form">
           <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
             label-width="68px">
-            <!-- <el-form-item label="所属科室id" prop="departmentId">
-        <el-input v-model="queryParams.departmentId" placeholder="请输入所属科室id" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="所属科室名称" prop="departmentName">
-        <el-input v-model="queryParams.departmentName" placeholder="请输入所属科室名称" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="病种id" prop="diseaseTypeId">
-        <el-input v-model="queryParams.diseaseTypeId" placeholder="请输入病种id" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="病种名称" prop="diseaseTypeName">
-        <el-input v-model="queryParams.diseaseTypeName" placeholder="请输入病种名称" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="路径名称" prop="routeName">
-        <el-input v-model="queryParams.routeName" placeholder="请输入路径名称" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="路径编码" prop="routeCode">
-        <el-input v-model="queryParams.routeCode" placeholder="请输入路径编码" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="版本号" prop="version">
-        <el-input v-model="queryParams.version" placeholder="请输入版本号" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>-->
             <el-form-item label="发布状态" prop="releaseStatus">
               <el-select v-model="queryParams.releaseStatus" placeholder="请选择">
                 <el-option label="已发布" value="PUBLISHED" />
                 <el-option label="未发布" value="UNPUBLISHED" />
               </el-select>
             </el-form-item>
-            <!-- ，全部：ALL，科室管理路径：DEPARTMENT_MANAGE_PATH，专病管理路径：SPECIAL_DIEASE_MANAGE_PATH -->
             <el-form-item label="路径分类" prop="routeClassify">
               <el-select v-model="queryParams.routeClassify" placeholder="请选择">
                 <el-option label="全部" value="ALL" />
@@ -58,19 +22,6 @@
                 <el-option label="专病管理路径" value="SPECIAL_DIEASE_MANAGE_PATH" />
               </el-select>
             </el-form-item>
-            <!-- <el-form-item
-        label="适用范围，在院：IN_THE_HOSPITAL，出院：DISCHARGE，门诊：OUTPATIENT_SERVICE，门诊+出院：OUTPATIENT_SERVICE_DISCHARGE"
-        prop="suitRange">
-        <el-input v-model="queryParams.suitRange"
-          placeholder="请输入适用范围，在院：IN_THE_HOSPITAL，出院：DISCHARGE，门诊：OUTPATIENT_SERVICE，门诊+出院：OUTPATIENT_SERVICE_DISCHARGE"
-          clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="排序" prop="routeSort">
-        <el-input v-model="queryParams.routeSort" placeholder="请输入排序" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="备注信息" prop="routeRemark">
-        <el-input v-model="queryParams.routeRemark" placeholder="请输入备注信息" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item> -->
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
               <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -115,11 +66,7 @@
                 <el-tag type="warning" v-else>未发布</el-tag>
               </template>
             </el-table-column>
-            <!-- <el-table-column label="更新时间" align="center" prop="updateTime" /> -->
             <el-table-column label="病种名称" align="center" prop="diseaseTypeName" />
-            <!-- <el-table-column
-        label="适用范围，在院：IN_THE_HOSPITAL，出院：DISCHARGE，门诊：OUTPATIENT_SERVICE，门诊+出院：OUTPATIENT_SERVICE_DISCHARGE"
-        align="center" prop="suitRange" /> -->
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
               <template slot-scope="scope">
                 <el-button size="mini" type="text" v-if="scope.row.releaseStatus == 'PUBLISHED'"
@@ -193,7 +140,6 @@
     </el-dialog>
   </div>
 </template>
-
 <script>
 import {
   listSpecialDiseaseRoute, getSpecialDiseaseRoute, addSpecialDiseaseRoute, updateSpecialDiseaseRoute,
@@ -202,8 +148,10 @@ import {
 import {
   servicepackageinfo
 } from '@/api/manage/signRecord.js'
+import DepartmentList from '../../components/DepartmentList.vue'
 export default {
   name: "SpecialDiseaseRoute",
+  components: { DepartmentList },
   data() {
     return {
       maxTableHeight: undefined,
@@ -243,6 +191,9 @@ export default {
         routeSort: null,
         routeRemark: null,
       },
+      addDepartmentquery: {
+        hospitalAgencyId: null,
+      },
       // 表单参数
       form: {},
       // 表单校验
@@ -272,8 +223,6 @@ export default {
           { required: true, message: "排序不能为空", trigger: "blur" }
         ],
       },
-      DepartmentoList: [],
-      departmentName: '',
       adddepartmentlist: [],
       adddiseaselist: [],
       addpackagelist: [],
@@ -281,25 +230,32 @@ export default {
   },
   created() {
     this.getList();
-    this.addinfo();
   },
   mounted() {
     this.getMaxTableHeight()
     this.screenChange()
   },
   watch: {
-    departmentName(val) {
-      this.infolists();
-    },
   },
   methods: {
+    //接收科室列表传值
+    clickdepartment(item) {
+      this.queryParams.hospitalAgencyId = item.hospitalAgencyId
+      this.queryParams.hospitalAgencyName = item.hospitalAgencyName
+      this.queryParams.departmentId = item.itemid
+      this.addDepartmentquery.hospitalAgencyId = item.hospitalAgencyId
+      if (item.hospitalAgencyId) {
+        this.getList();
+      }
+      this.$forceUpdate()
+    },
     updateCPage(index, size) {
       this.queryParams.pageNum = index
       this.queryParams.pageSize = size
       this.getList();
     },
     addinfo() {
-      getDepartmentList().then(res => {
+      getDepartmentList(this.addDepartmentquery).then(res => {
         this.adddepartmentlist = res.data
       })
     },
@@ -318,12 +274,6 @@ export default {
       this.queryParams.departmentId = item.id;
       this.getList();
     },
-    //科室
-    infolists() {
-      selectDiseaseCount(this.departmentName, '', '').then((res) => {
-        this.DepartmentoList = res.data;
-      });
-    },
     /** 查询专病路径信息列表 */
     getList() {
       this.loading = true;
@@ -332,7 +282,6 @@ export default {
         this.total = response.total;
         this.loading = false;
       });
-      this.infolists();
     },
     // 取消按钮
     cancel() {
@@ -371,6 +320,9 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.adddepartmentlist.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
+      this.queryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
+      this.$refs.DepartmentList.resetQuery()
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -384,7 +336,11 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
+      if (this.queryParams.departmentId) {
+        this.form.departmentId = this.queryParams.departmentId
+      }
       this.title = "添加专病路径信息";
+      this.addinfo();
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -431,6 +387,8 @@ export default {
         })
         this.form.routePackageList = routePackageList
       }
+      this.form.hospitalAgencyId = this.queryParams.hospitalAgencyId
+      this.form.hospitalAgencyName = this.queryParams.hospitalAgencyName
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
@@ -438,12 +396,14 @@ export default {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
+              this.$refs.DepartmentList.Departmentlist()
             });
           } else {
             addSpecialDiseaseRoute(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
+              this.$refs.DepartmentList.Departmentlist()
             });
           }
         }
@@ -493,6 +453,7 @@ export default {
         specialDiseaseRoutedel(row.id).then(res => {
           this.getList();
           this.$modal.msgSuccess("删除主路径成功");
+          this.$refs.DepartmentList.Departmentlist()
         })
       })
     },