更改检查窗口的逻辑

admin-ui/src/views/work/patient/check/checkProjectDetailReport.vue

@@ -5,9 +5,6 @@ export default {
   name: "checkDetailReport",
   components: { CheckReportItem },
   props: {
-    /**
-     * @type {import('index').Obr}
-     */
     obr: {
       type: Object,
       required: true,
@@ -47,19 +44,39 @@ export default {
       // },
       reportItemLabelList: [
         { key: "reportNo", label: "报告单号" },
-        { key: "medTechProCode", label: "医技号" },
+        // { key: "medTechProCode", label: "医技号" },
         { key: "medTechProName", label: "医技项目名称" },
         { key: "reportClass", label: "报告单类别名称" },
-        { key: "report_complete_time", label: "报告完成时间" },
+        { key: "reportCompleteTime", label: "报告完成时间" },
         { key: "signs", label: "危机标志" },
         { key: "sampleReceivedDate", label: "样本收到日期" },
         { key: "checkpoint", label: "检查部位或样本" },
         { key: "executeDepartmentName", label: "执行科室名称" },
-        { key: "applyDoctorName", label: "申请医生" },
-        { key: "testingDoctorName", label: "检验医生信息名称" },
+        // { key: "applyDoctorName", label: "申请医生" },
+        // { key: "testingDoctorName", label: "检验医生信息名称" },
         { key: "reviewDoctorName", label: "审核医生" },
         { key: "reportDate", label: "报告单日期" },
       ],
+      /*
+      {
+    "id": 27,
+    "orcId": 27,
+    "medTechProCode": null,
+    "medTechProName": "丙型肝炎抗体测定(Anti-HCV),人免疫缺陷病毒抗体测定(Anti-HIV),梅毒螺旋体特异抗体测定",
+    "reportClass": "3",
+    "reportCompleteTime": "2024-07-23 11:43:50",
+    "signs": "0",
+    "sampleReceivedDate": "2024-07-22 09:50:34",
+    "checkpoint": "血清",
+    "executeDepartmentCode": "313",
+    "executeDepartmentName": "检验科",
+    "isFlag": "0",
+    "reviewDoctorCode": "1356",
+    "reviewDoctorName": "梁静",
+    "reportDate": "2024-07-23 11:43:50",
+    "reportNo": "3455018"
+}
+       */
     };
   },
   created() {
@@ -89,5 +106,6 @@ export default {
   justify-content: space-evenly;
 
   flex-wrap: wrap;
+  overflow: scroll;
 }
 </style>

admin-ui/src/views/work/patient/check/checkReportItem.vue

@@ -40,10 +40,11 @@ export default {
     :style="`width: ${itemWidth};`"
   >
     <div class="check-report-item-label">
-      {{ reportLabel }}
+      <p>{{ reportLabel }}</p>
+
     </div>
     <div class="check-report-item-content">
-      {{ reportContent }}
+      <p>{{ reportContent }}</p>
     </div>
   </div>
 </template>
@@ -61,6 +62,8 @@ export default {
   margin-right: -1px;
   margin-bottom: -1px;
   box-sizing: border-box;
+
+  align-content: center;
 }
 
 .check-report-item-label {
@@ -70,7 +73,6 @@ export default {
   font-size: 14px;
   padding-left: 2%;
 
-  overflow-x: hidden;
 }
 
 .check-report-item-content {

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

@@ -3,12 +3,12 @@ import CheckDetailReport from "@/views/work/patient/check/checkProjectDetailRepo
 
 import {
   OBR_INIT_VALUE,
-  PATIENT_INIT_VALUE,
+
 } from "@/views/work/patient/check/checkInitValues";
-import { getPageObxList } from "@/views/work/patient/check/checkAPI";
+
+import service from "@/utils/request";
 
 export default {
-  methods: { getPageObxList },
   components: { CheckDetailReport },
   name: "PatientCheck",
   props: {
@@ -28,22 +28,16 @@ export default {
   },
   data() {
     return {
-      /**
-       * 控制对话框是否显示，true是显示对话框
-       * @type {boolean}
-       */
-      dialogVisible: true,
-      reportTabDisabled: false,
+
+      testData: null,
 
       /**
        * 当前检查项目相关信息
-       * @property {import('index').Patient} patient - 当前要查看的患者
        * @property {number} obxTotal - 患者检查项目总数
        * @property {import('./index').ObxList} pageObxList - 当前要查看的患者的所有检查项目，注意是分页后的某一的结果
        * @property {import('./index').Obr} obr - 当前需要查看的详细检测报告
        */
       currentCheckInfo: {
-        patient: PATIENT_INIT_VALUE,
         obxTotal: 0,
         pageObxList: [],
         obxQueryParams: {
@@ -54,23 +48,33 @@ export default {
       },
     };
   },
-  created() {
+  watch: {
+    checkWindowShow: {
+      handler: function (newVal) {
+        // console.log(`checkWindowShow的值被设为${newVal}`)
+        if(newVal) {
 
-      if (this.$props.checkWindowShow) {
-        /**
-         * 请求结果
-         * @type {{rows: import('index').ObxList, total: number, pages: number}}
-         */
-        const { rows, total, pages } = getPageObxList(
-          this.patientInfo.id,
-          this.currentCheckInfo.obxQueryParams,
-        );
+          service.get(`work/result/list`)
+          .then(res => {
+            this.currentCheckInfo.pageObxList = res.rows
+          })
+        }
 
-        this.currentCheckInfo.pageObxList = rows;
-        this.currentCheckInfo.obxTotal = total;
       }
-
+    }
   },
+  methods: {
+    showDetailReport (obrId) {
+
+      service.get(`work/request/patid/${this.patientInfo.id}`)
+      .then(res => {
+
+
+        this.currentCheckInfo.obr = res.rows.find(item => item.id === obrId)
+        console.log(this.currentCheckInfo.obr)
+      })
+    }
+  }
 };
 </script>
 
@@ -133,7 +137,7 @@ export default {
                   <el-button
                     type="text"
                     icon="el-icon-search"
-                    @click="console.log(`查看${scope.row.obrId}`)"
+                    @click="showDetailReport(scope.row.obrId)"
                   >
                     查看详细检验报告
                   </el-button>
@@ -146,12 +150,6 @@ export default {
               :page.sync="currentCheckInfo.obxQueryParams.pageNum"
               :limit.sync="currentCheckInfo.obxQueryParams.pageSize"
               @pagination="
-                () => {
-                  this.currentCheckInfo.pageObxList = getPageObxList(
-                    patientInfo.id,
-                    currentCheckInfo.obxQueryParams,
-                  );
-                }
               "
             />
           </div>
@@ -159,7 +157,6 @@ export default {
         <el-tab-pane
           label="详细检测报告"
           name="2"
-          :disabled="reportTabDisabled"
            style="height: 400px"
         >
           <check-detail-report :obr="currentCheckInfo.obr" />