更改检查窗口的逻辑

admin-ui/src/views/work/patient/check/checkAPI.js

@@ -1,46 +0,0 @@
-import service from "@/utils/request";
-import {OBX_INIT_VALUE} from "@/views/work/patient/check/checkInitValues";
-
-/**
- * 获取患者的某一页检查项目列表
- * @param {string} patientId 患者id
- * @param {{pageNum: number, pageSize: number}} paginationQueryParam 分页查询参数
- * @return {{rows: import('index').ObxList, total: number,pages: number} }
- */
-export function getPageObxList(patientId, paginationQueryParam) {
-  /**
-   * @type {{rows: import('index').ObxList, total: number,pages: number} }
-   */
-  let result
-  service.get(`/work/result/patid/${patientId}`, (result) => {}, {
-    data: paginationQueryParam
-  }).then((response) => {
-
-    const {rows, total, pages} = response.data
-
-    result = {
-      rows,
-      total,
-      pages,
-    }
-  }).catch((error) => {
-    console.log(error)
-    result = {
-      rows: [OBX_INIT_VALUE],
-      total: 0,
-      pages: 0
-    }
-  })
-  return result
-}
-
-/**
- * 获取详细检测报告
- * @param patientId
- */
-export function getObr(patientId) {
-  service.get(`/work/request/patid/${patientId}`)
-  .then((response) => {
-    console.log(response)
-  })
-}

admin-ui/src/views/work/patient/index.vue

@@ -38,16 +38,16 @@
           <el-table-column label="出院时间" align="center" prop="dischargeTime" />
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-button size="mini" type="text" icon="el-icon-search" @click="op('search',scope.row)" v-hasPermi="['work:dg:edit']">查看就诊信息</el-button>
-              <el-button size="mini" type="text" icon="el-icon-search" @click="()=>{checkWindowShow = true; currentPatientInfo = {id: scope.row.patId, name: scope.row.name}}">
+              <el-button size="mini" type="text" icon="el-icon-search" @click="op('search',scope.row)" v-hasPermi="['work:dg:edit']">查看</el-button>
+                        <el-button size="mini" type="text" icon="el-icon-search" @click="()=>{checkWindowShow = true; currentPatientInfo = {id: scope.row.patId, name: scope.row.name}}">
                 查看检查项目
               </el-button>
-          <!-- 检测项目信息弹窗 -->
-              <patient-check :check-window-show.sync="checkWindowShow" :patient-info="currentPatientInfo" />
+<!--              检测项目信息弹窗-->
             </template>
           </el-table-column>
         </el-table>
         <pagination v-if="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList"/>
+         <patient-check :check-window-show.sync="checkWindowShow" :patient-info="currentPatientInfo" />
       </el-col>
     </el-row>
   </div>
@@ -83,7 +83,7 @@ export default {
         patientName:undefined,
         departmentName:undefined,
       },
-      /**
+            /**
        * 控制检测项目信息弹窗是否显示
        * @type {boolean} - 取值true显示弹窗
        */
@@ -99,6 +99,8 @@ export default {
       }
     };
   },
+  watch: {
+  },
   created() {
     this.getDepartment();
   },
@@ -129,6 +131,7 @@ export default {
         url:'/work/visit/department'
       }).then((response) => {
         this.deptOptions = response.rows;
+        console.log(this.deptOptions)
       });
     },
     handleNodeClick(department){