seo

src/components/customerOrg/customerOrgEdit.vue

@@ -93,7 +93,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="4">
             <el-form-item label="联系电话" prop="telephone">
               <el-input class="enterToTab" v-model="form.telephone" placeholder="请输入联系电话" />
             </el-form-item>
@@ -108,6 +108,11 @@
               <el-input class="enterToTab" v-model="form.postalCode" placeholder="请输入邮政编码" />
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item label="常用单位" prop="isRecommend">              
+              <el-checkbox v-model="form.isRecommend" true-label="Y" false-label="N" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -258,7 +263,8 @@ export default {
         salesPerson: "",
         salesPersonPhone: "",
         medicalTypeId:'',
-        personnelTypeId:''
+        personnelTypeId:'',
+        isRecommend:'N',
       }, //初始化  单位 记录 目前新增与更新是一致
       formInit: {},
       rules: {

src/components/doctorCheck/QueueCheckList.vue

@@ -48,9 +48,9 @@
         <el-input placeholder="候诊人员" v-model="patientName" size="small" style="width: 125px;" clearable />
       </div>
       -->
-      <div style="display: flex">
+      <div style="display: flex" @contextmenu.prevent="onContextmenu">
         <el-table :data="waitDetail" style="width: 100%" border highlight-current-row @row-click="rowClickWait"
-          :row-style="{ height: '28px' }" :height="Math.floor((tableHeight - 72) / 3)">
+          :row-style="{ height: '28px' }" :height="Math.floor((tableHeight - 72) / 3)" @row-contextmenu="rClick">
           <el-table-column prop="queueRegisterNumber" label="号" min-width="30" align="center" />
           <el-table-column prop="patientName" label="姓名" min-width="80" align="center" />
           <el-table-column prop="isVip" label="Vip" min-width="40" align="center">
@@ -63,7 +63,7 @@
         </el-table>
         <div style="margin-top: 20px">
           <div>
-            <el-button type="primary" class="commonbutton" @click="btnCall(waitRow.queueRegisterId, '1')"
+            <el-button type="primary" class="commonbutton" @click="btnCall(waitRow, '1')"
               style="width: 40px; min-width: 40px; height: 26px">呼叫</el-button>
           </div>
           <div style="margin: 10px 0">
@@ -83,8 +83,8 @@
         </div>
       </div>
       <div style="margin-top: 6px">已呼人员：</div>
-      <div style="display: flex">
-        <el-table :data="alreadyCalledDetail" style="width: 100%" border highlight-current-row
+      <div style="display: flex" @contextmenu.prevent="onContextmenu">
+        <el-table :data="alreadyCalledDetail" style="width: 100%" border highlight-current-row @row-contextmenu="rClick"
           @row-click="rowClickAlready" :row-style="{ height: '28px' }" :height="Math.floor((tableHeight - 72) / 3)">
           <el-table-column prop="queueRegisterNumber" label="号" min-width="30" align="center" />
           <el-table-column prop="patientName" label="姓名" min-width="80" align="center" />
@@ -104,9 +104,9 @@
         </div>
       </div>
       <div style="margin-top: 6px">过号人员：</div>
-      <div style="display: flex">
+      <div style="display: flex" @contextmenu.prevent="onContextmenu">
         <el-table :data="overNumberDetail" style="width: 100%" border highlight-current-row @row-click="rowClickOver"
-          :row-style="{ height: '28px' }" :height="Math.floor((tableHeight - 72) / 3)">
+          :row-style="{ height: '28px' }" :height="Math.floor((tableHeight - 72) / 3)" @row-contextmenu="rClick">
           <el-table-column prop="queueRegisterNumber" label="号" min-width="30" align="center" />
           <el-table-column prop="patientName" label="姓名" min-width="80" align="center" />
           <el-table-column prop="isVip" label="Vip" min-width="40" align="center">
@@ -323,14 +323,17 @@ export default {
             });
           break;
         case "1": // 呼叫
+          // 未选中时，自动选第1个
           if (!row.queueRegisterId) {
             if (this.waitDetail.length > 0) row = this.waitDetail[0];
           }
+
           if (!row.queueRegisterId)
             this.$message.warning({
               showClose: true,
               message: "未可操作的数据，或未选择候诊人员",
             });
+
           if (this.alreadyCalledDetail.length > 0) prePatientRegisterId = this.alreadyCalledDetail[0].patientRegisterId
 
           break;
@@ -373,6 +376,11 @@ export default {
           completeFlag,
         }).then((res) => {
           if (res.code > -1) {
+            if(completeFlag == '1'){
+              this.waitRow = {}
+            }
+
+            // 刷新排队列表
             this.getQueueRegisterList(
               this.LocalConfig.doctorCheck.queueRoom,
               this.LocalConfig.doctorCheck.queueItemTypeIds
@@ -478,8 +486,17 @@ export default {
             .then((res) => {
               if (res.code > -1) {
                 this.waitDetail = res.data.waitDetail;
+                this.waitDetail.forEach(e => {
+                  e.state = 'wait'
+                });
                 this.alreadyCalledDetail = res.data.alreadyCalledDetail;
+                this.alreadyCalledDetail.forEach(e => {
+                  e.state = 'alreadyCall'
+                });
                 this.overNumberDetail = res.data.overNumberDetail;
+                this.overNumberDetail.forEach(e => {
+                  e.state = 'over'
+                });
 
                 resolve(res);
               } else {
@@ -540,44 +557,85 @@ export default {
 
     // 选择候诊人员
     rowClickWait(row) {
-
-      this.clickTime1 = new Date().getTime()
-
-      setTimeout(() => {
-        if (this.clickTime1 > this.clickTime2) {
       this.waitRow = row;
       this.queueParams = {
         patientRegisterId: row.patientRegisterId,
       };
-        }
-      }, 400);
-
-
-
     },
 
     // 选择过号人员
     rowClickAlready(row) {
-      this.clickTime1 = new Date().getTime()
-      setTimeout(() => {
-        if (this.clickTime1 > this.clickTime2) {
       this.alreadyRow = row;
       this.queueParams = {
         patientRegisterId: row.patientRegisterId,
       };
-        }
-      }, 400);
     },
 
     // 选择过号人员
     rowClickOver(row) {
-      this.clickTime1 = new Date().getTime()
-      setTimeout(() => {
-        if (this.clickTime1 > this.clickTime2) {
       this.overRow = row;
+    },
+
+    // 右击选择人员
+    rClick(row, column, event) {
+      this.queueParams = {
+        patientRegisterId: row.patientRegisterId,
+        state: row.state,
+        queueRegisterId: row.queueRegisterId
+      };
+    },
+
+    // 右击
+    onContextmenu(event) {
+      if (!this.queueParams.patientRegisterId) return false
+
+      //菜单项
+      let items = [];
+
+      if (this.queueParams.state == 'wait') {
+        items.push({
+          label: "呼叫",
+          onClick: () => {
+            this.btnCall(this.queueParams, '1')
+          },
+        })
+
+        items.push({
+          label: "取消排队",
+          onClick: () => {
+            postapi('/api/app/QueueRegister/DeleteByPatientRegisterId', {
+              patientRegisterId: this.queueParams.patientRegisterId
+            }).then(res => {
+              if (res.code > -1) {
+                this.$message.success({ showClose: true, message: '操作成功！' })
+                this.getQueueRegisterList(this.LocalConfig.doctorCheck.queueRoom, this.LocalConfig.doctorCheck.queueItemTypeIds)
               }
-      }, 400);
+            })
           },
+        })
+      }
+
+
+      items.push({
+        label: "排队",
+        onClick: () => {
+          this.fnQueue()
+        },
+      })
+
+      this.$contextmenu({
+        items,
+        event,
+        x: event.clientX,
+        y: event.clientY,
+        customClass: "custom-class",
+        zIndex: 3,
+        minWidth: 80,
+      });
+
+      return false;
+    },
+
   },
 
   //监听事件

src/components/occDisease/CheckDetails.vue

@@ -82,7 +82,7 @@ export default {
           }
         })
         .catch((err) => {
-          this.$message({ type: "error", message: `操作失败，原因：${err}` });
+          this.$message({ type: "error", message: `操作失败，原因(/api/app/OccupationalDisease/GetDetailResults)：${err}` });
         });
     },
 

src/components/patientRegister/PatientRegisterItem.vue

@@ -116,7 +116,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="标准价格" prop="standardPrice" min-width="70" align="center" />
+          <el-table-column label="标准价" prop="standardPrice" min-width="60" align="center" />
           <el-table-column label="折扣" prop="discount" min-width="60">
             <template slot-scope="scope">
               <el-input type="number" v-model="scope.row.discount" size="small" @input="changeDiscount(scope.$index)" :disabled="scope.row.isCharge == 'Y' ? true:false"/>
@@ -159,10 +159,10 @@
               <el-checkbox :value="scope.row.isLock == 'Y'" true-label="Y" false-label="N" />
             </template>
           </el-table-column>
-          <el-table-column prop="creatorName" label="登记人" min-width="70" align="center"></el-table-column>
-          <el-table-column prop="creationTime" label="登记日期" win-width="90" align="center">
+          <el-table-column prop="creatorName" label="登记人" min-width="60" align="center"></el-table-column>
+          <el-table-column prop="creationTime" label="登记日期" width="130" align="center">
             <template slot-scope="scope">
-              <div>{{ scope.row.creationTime ? moment(scope.row.creationTime).format('yyyy-MM-DD') : '' }}</div>
+              <div>{{ scope.row.creationTime ? moment(scope.row.creationTime).format('yyyy-MM-DD HH:mm') : '' }}</div>
             </template>
           </el-table-column>
         </el-table>

src/components/patientRegister/patientRegisterAsbItem.vue

@@ -45,9 +45,9 @@
         </template>
       </el-table-column>
       <el-table-column prop="creatorName" label="登记人" min-width="70" align="center" />
-      <el-table-column prop="creationTime" label="登记日期" min-width="90" align="center">
+      <el-table-column prop="creationTime" label="登记日期" min-width="130" align="center">
         <template slot-scope="scope">
-          <div>{{ moment(scope.row.creationTime).format("yyyy-MM-DD") }}</div>
+          <div>{{ moment(scope.row.creationTime).format("yyyy-MM-DD HH:mm") }}</div>
         </template>
       </el-table-column>
     </el-table>

src/components/queue/Queue.vue

@@ -9,63 +9,69 @@
         <el-table-column label="候诊" min-width="40" prop="waitCount" align="center" />
       </el-table>
     </div>
-    <div style="width: 360px;margin: 0 5px;">
+    <div style="width: 485px;margin: 0 5px;">
+      <div style="display: flex;">
+        <div style="width: 360px;">
           <div>未分诊组合项目：</div>
-      <el-table :data="notTriageAsbitemList" border style="width: 100%" row-key="id" height="270" highlight-current-row
-        size="small" @row-click="rowClick" ref="notTriageAsbitemList">
+          <el-table :data="notTriageAsbitemList" border style="width: 100%" row-key="id" height="270"
+            highlight-current-row size="small" @row-click="rowClick" ref="notTriageAsbitemList">
             <el-table-column label="科室" min-width="130" prop="itemTypeName" align="center" />
             <el-table-column label="组合项目" min-width="150" prop="asbitemName" align="center" />
           </el-table>
+        </div>
+        <div style="width: 120px;margin-left: 5px;">
+          <div>房间：</div>
+          <el-table :data="roomsForAsbitem" border style="width: 100%" row-key="id" height="270" highlight-current-row
+            size="small" @row-click="rowClickRoom" ref="roomsForAsbitem">
+            <el-table-column label="房间" min-width="80" prop="roomName" align="center" />
+          </el-table>
+        </div>
+      </div>
+
+      <div style="display: flex; margin-top: 5px;">
+        <div>已分诊科室：</div>
+        <div style="margin-left: 40px;">当前人员：{{ queueRegister.patientName }}</div>
+        <div style="margin-left: 10px;">排队房间：{{ queueRegister.roomName }}</div>
+        <div style="margin-left: 10px;">候诊人数：{{ queueRegister.queueCount }}</div>
+      </div>
+      <div style="display: flex;">
 
-      <div style="margin-top: 5px;">已分诊科室：</div>
-      <el-table :data="yesTriageAsbitemList" border style="width: 100%" row-key="id" height="270" highlight-current-row
-        size="small" ref="yesTriageAsbitemList">
-        <el-table-column label="科室" min-width="130" prop="asbitemName">
+        <el-table :data="yesTriageAsbitemList" border row-key="id" height="270" highlight-current-row size="small"
+          ref="yesTriageAsbitemList">
+          <el-table-column label="房间" prop="roomName" min-width="80" align="center" />
+          <el-table-column label="项目" min-width="150" prop="asbitemName">
             <template slot-scope="scope">
               <div>
                 {{ scope.row.asbitemName }}
               </div>
             </template>
           </el-table-column>
-        <el-table-column label="房间" prop="roomName" min-width="60" align="center" />
-        
-        <el-table-column label="状态" prop="completeFlag" min-width="60" align="center">
+          <el-table-column label="状态" prop="completeFlag" min-width="40" align="center">
             <template slot-scope="scope">
               <div>{{ dddw(dict.queueFlag, 'id', scope.row.completeFlag, 'displayName') }}</div>
             </template>
           </el-table-column>
-        <el-table-column label="排号人" prop="triageName" min-width="80" align="center"/>
+          <el-table-column label="排号人" prop="triageName" min-width="60" align="center" />
         </el-table>
-    </div>
         <div style="width: 120px;">
-      <div>房间：</div>
-      <el-table :data="roomsForAsbitem" border style="width: 100%" row-key="id" height="270" highlight-current-row
-        size="small" @row-click="rowClickRoom" ref="roomsForAsbitem">
-        <el-table-column label="房间" min-width="80" prop="roomName" align="center" />
-      </el-table>
+
           <div style="margin: 25px 0 10px 10px;">
             <el-button class="commonbutton" @click="btnQueue">人工分诊排队</el-button>
           </div>
           <div v-if="false" style="margin-left: 10px;">
             <el-button class="commonbutton" @click="btnQueueAuto">AI智能分诊</el-button>
           </div>
-      <div style="margin: 10px 0 5px 0;">当前人员：</div>
-      <div style="height: 20px;margin-left: 20px;">
-        {{ queueRegister.patientName }}
-      </div>
-      <div style="margin: 10px 0 5px 0;">当前排队房间：</div>
-      <div style="height: 20px;margin-left: 20px;">
-        {{ queueRegister.roomName }}
-      </div>
-      <div style="margin: 5px 0 5px 0;">当前候诊人数：</div>
-      <div style="height: 25px;margin-left: 20px;">
-        {{ queueRegister.queueCount }}
+          <div style="margin-left: 10px;margin-bottom: 10px;">
+            <el-button class="commonbutton" @click="btnCancelQueue">取消排队</el-button>
           </div>
           <div style="margin-left: 10px;">
             <el-button class="commonbutton" @click="dialogWin.queue = false">关闭</el-button>
           </div>
         </div>
       </div>
+    </div>
+
+  </div>
 </template>
 <script>
 import { mapState } from "vuex";
@@ -254,6 +260,23 @@ export default {
       })
     },
 
+    // 取消排队
+    btnCancelQueue(){
+      if (!this.refParams.patientRegisterId) {
+        this.$message.warning({ showClose: true, message: '未获取到人员信息' })
+        return
+      }
+
+      postapi('/api/app/QueueRegister/DeleteByPatientRegisterId', {
+        patientRegisterId: this.refParams.patientRegisterId
+      }).then(res => {
+        if (res.code > -1) {
+          this.$message.success({ showClose: true, message: '操作成功！' })
+          return this.dictInit()
+        }
+      })
+    }
+
   },
 
   //监听事件()

src/components/report/BtnReport.vue

@@ -25,6 +25,9 @@
             <div class="listBtn">
                 <el-button type="primary" class="commonbutton" @click="btnUpReport">上传Web</el-button>
             </div>
+            <div class="listBtn">
+                <el-button type="primary" class="commonbutton" @click="btnCheckHistory">历次结果</el-button>
+            </div>
             <div class="listBtn">
                 <download-excel :fields="jsonFields" :fetch="btnExport" type="xls" :name="xlsName">
                     <el-button type="" class="commonbutton" style="width:100%">人员信息导出</el-button>
@@ -67,6 +70,30 @@
                     </div>
                 </div>
             </el-dialog>
+
+            <el-dialog title="历次结果" :visible.sync="dialogVisibleCheckHistory" :close-on-click-modal="false"
+                width="900px">
+                <div>
+                    <el-tabs v-model="tabChoosed">
+                        <!---->
+                        <el-tab-pane label="明细结果" name="2">
+                            <CheckDetails :patientRegisterId="dataTransOpts.tableS.patient_register.id" :refParams="{ place: 'doctor' }" />
+                        </el-tab-pane>                        
+                        <el-tab-pane label="本次图文报告" name="4">
+                            <ImageTextReport :refParams="{ place: 'doctor' }" />
+                        </el-tab-pane>
+                        <!-- <el-tab-pane label="项目对比" name="4">
+                        <SumItemsType :patientId="doctorCheck.prBase.patientId" />
+                    </el-tab-pane> -->
+                        <el-tab-pane label="横向对比" name="5">
+                            <SumItems :patientId="dataTransOpts.tableS.patient_register.id" :refParams="{ place: 'doctor' }" />
+                        </el-tab-pane>
+                        <el-tab-pane label="历次综述" name="6">
+                            <SumHistory :patientId="dataTransOpts.tableS.patient_register.id" :refParams="{ place: 'doctor' }" />
+                        </el-tab-pane>
+                    </el-tabs>
+                </div>
+            </el-dialog>
         </div>
     </div>
 </template>
@@ -77,14 +104,29 @@ import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { arrayExistObj, deepCopy, parseID, dddw } from "../../utlis/proFunc";
 import ElProgressOCX from "../report/ElProgressOCX.vue";
 //import PatientRegisterList from "../doctorCheck/PatientRegisterList.vue";
+import CheckDetails from "../../components/sumDoctorCheck/CheckDetails.vue";
+import SumItemsType from "../../components/sumDoctorCheck/SumItemsType.vue";
+import SumItems from "../../components/sumDoctorCheck/SumItems.vue";
+import SumHistory from "../../components/sumDoctorCheck/SumHistory.vue";
+import OccDisease from "../../components/occDisease/OccDisease.vue"
+import ImageTextReport from "../../components/occDisease/ImageTextReport.vue";
+
 export default {
     components: {
         //PatientRegisterList,
-        ElProgressOCX
+        ElProgressOCX,
+        CheckDetails,
+        SumItemsType,
+        SumItems,
+        SumHistory,
+        OccDisease,
+        ImageTextReport
     },
     data() {
         return {
             dialogGetReport: false,
+            dialogVisibleCheckHistory: false,
+            tabChoosed:'2',
             receiveReport: {
                 patientRegisterIds: [
                 ],
@@ -212,9 +254,12 @@ export default {
             this.elProgress.display = false;
         },
 
-        // 人员信息列表导出
-        btnExport() {
-
+        // 历次结果
+        btnCheckHistory() {
+            if (!this.dataTransOpts.tableS.patient_register.id) return;
+            this.dialogVisibleCheckHistory = true;
+            this.dataTransOpts.refresh.sumDoctor.M++    //刷新历次明细
+            this.dataTransOpts.plus.OccDisease++    //刷新图文报告
         },
 
         exportZip() {

src/components/report/PatientRegisterListNobtn.vue

@@ -110,27 +110,26 @@ export default {
       dragCol: [
         { label: "勾选", type: "selection", minWidth: 40, align: "center" },
         { label: "序号", prop: "sn", minWidth: 40, align: "center" },
-        { label: "体检进度", prop: "completeFlag", minWidth: 90, align: "center" },
-        { label: "体检日期", prop: "medicalStartDate", minWidth: 100, align: "center" },
         { label: "打印", prop: "isReportPrint", minWidth: 60, align: "center" },
         { label: "领取", prop: "isReceiveReport", minWidth: 60, align: "center" },
-        { label: "预约备单", prop: "isUploadAppoint", minWidth: 90, align: "center" },
-        { label: "上传", prop: "isUpload", minWidth: 60, align: "center" },
-        { label: "条码号", prop: "patientRegisterNo", minWidth: 150, align: "center" },
+        { label: "体检进度", prop: "completeFlag", minWidth: 90, align: "center" },        
+        { label: "体检日期", prop: "medicalStartDate", minWidth: 100, align: "center" },        
+        { label: "单位名称", prop: "customerOrgName", minWidth: 180, align: "left", showTooltip: true },
+        { label: "部门名称", prop: "departmentName", minWidth: 150, align: "left", showTooltip: true },
         { label: "姓名", prop: "patientName", minWidth: 60, align: "center" },
         { label: "性别", prop: "sexName", minWidth: 60, align: "center" },
         { label: "年龄", prop: "age", minWidth: 60, align: "center" },
+        { label: "民族", prop: "nationName", minWidth: 70, align: "center" },
+        { label: "身份证号", prop: "idNo", minWidth: 160, align: "center" },
+        { label: "条码号", prop: "patientRegisterNo", minWidth: 110, align: "center" },
+        { label: "档案号", prop: "patientNo", minWidth: 80, align: "center" },
+        { label: "次数", prop: "medicalTimes", minWidth: 60, align: "center" },
+        { label: "备注", prop: "remark", minWidth: 150, align: "left" },
         { label: "分组/套餐", prop: "packGroup", minWidth: 150, align: "center" },
-        { label: "体检次数", prop: "medicalTimes", minWidth: 90, align: "center" },
-        { label: "单位名称", prop: "customerOrgName", minWidth: 180, align: "left", showTooltip: true },
-        { label: "部门名称", prop: "departmentName", minWidth: 180, align: "left", showTooltip: true },
         { label: "手机", prop: "mobileTelephone", minWidth: 130, align: "center" },
         { label: "电话", prop: "telephone", minWidth: 130, align: "center" },
-        { label: "档案号", prop: "patientNo", minWidth: 80, align: "center" },
-        { label: "身份证号", prop: "idNo", minWidth: 160, align: "center" },
         { label: "出生日期", prop: "birthDate", minWidth: 90, align: "center" },
         { label: "婚姻", prop: "maritalStatusName", minWidth: 70, align: "center" },        
-        { label: "民族", prop: "nationName", minWidth: 70, align: "center" },
         { label: "地址", prop: "address", minWidth: 400, align: "left", showTooltip: true },
         { label: "体检卡号", prop: "medicalCardNo", minWidth: 90, align: "center" },
         { label: "工卡号", prop: "jobCardNo", minWidth: 90, align: "center" },
@@ -150,6 +149,8 @@ export default {
         { label: "领取人", prop: "reportReceiveName", minWidth: 70, align: "center" },
         { label: "领取时间", prop: "reportReceiveDate", minWidth: 140, align: "center" },
         { label: "锁住", prop: "isLock", minWidth: 60, align: "center" },
+        { label: "预约备单", prop: "isUploadAppoint", minWidth: 90, align: "center" },
+        { label: "上传", prop: "isUpload", minWidth: 60, align: "center" },
       ],
 
     };

src/components/sumDoctorCheck/CheckDetails.vue

@@ -10,7 +10,8 @@
             cellspacing="0" bordercolor="#909399" style="border-collapse:collapse;">
             <tr height="24">
               <td width="200" class="tdCellClass">{{ item2.asbitemNames }}</td>
-              <td width="604" class="tdCellClass" colspan="7">{{ '检查日期：' + item2.checkDate.substring(0, 10) + ' 检查医生：' + item2.checkDoctorName
+              <td width="604" class="tdCellClass" colspan="7">{{ '检查日期：' + item2.checkDate.substring(0, 10) + ' 检查医生：' +
+                item2.checkDoctorName
                 }}</td>
             </tr>
 
@@ -26,9 +27,12 @@
             </tr>
             <tr height="24" v-for="(item3, index3) in item2.items" :key="index + '-' + index2 + '-' + index3">
               <td class="tdCellClass">{{ item3.itemName }}</td>
-              <td :style="`color: ${getColorStr(item3.reportFontColor)};`" class="tdCellClass">{{ item3.itemResult }}</td>
-              <td :style="`color: ${getColorStr(item3.previousReportFontColor)};`" class="tdCellClass">{{ item3.previousItemResult }}</td>
-              <td :style="`color: ${getColorStr(item3.previousTwoReportFontColor)};`" class="tdCellClass">{{ item3.previousTwoItemResult }}</td>
+              <td :style="`color: ${getColorStr(item3.reportFontColor)};`" class="tdCellClass">{{ item3.itemResult }}
+              </td>
+              <td :style="`color: ${getColorStr(item3.previousReportFontColor)};`" class="tdCellClass">{{
+                item3.previousItemResult }}</td>
+              <td :style="`color: ${getColorStr(item3.previousTwoReportFontColor)};`" class="tdCellClass">{{
+                item3.previousTwoItemResult }}</td>
               <td align="center" class="tdCellClass">{{ item3.referenceRangeValue }}</td>
               <td align="center" class="tdCellClass">{{ item3.criticalRangeValue }}</td>
               <td align="center" class="tdCellClass">{{ item3.unit }}</td>
@@ -166,6 +170,7 @@ export default {
           console.log("获取结果明细 CheckDetails", res.data);
           if (res.code != -1) {
             this.tableData = res.data;
+            if (res.data && Array.isArray(res.data) && res.data.length > 0) {
               this.tableData.forEach(e => {
                 e.asbitems.forEach(e1 => {
                   this.RegisterCheckList.push(e1)
@@ -173,9 +178,10 @@ export default {
               });
               this.details = deepCopy(this.RegisterCheckList[0])
             }
+          }
         })
         .catch((err) => {
-          this.$message({ type: "error", message: `操作失败，原因：${err}` });
+          this.$message({ type: "error", message: `获取结果明细 CheckDetails 操作失败，原因：${err}` });
         });
     },
 

src/components/sumDoctorCheck/SumHistory.vue

@@ -86,7 +86,7 @@ export default {
           }
         })
         .catch((err) => {
-          this.$message({ type: "error", message: `操作失败，原因：${err}` });
+          this.$message({ type: "error", message: `获取历次综述 SumHistory 操作失败，原因：${err}` });
         });
     },
 

src/components/sumDoctorCheck/SumItems.vue

@@ -125,7 +125,7 @@ export default {
           }
         })
         .catch((err) => {
-          this.$message({ type: "error", message: `操作失败，原因：${err}` });
+          this.$message({ type: "error", message: `获取横向对比 SumItems 操作失败，原因：${err}` });
         });
 
     },
@@ -153,7 +153,7 @@ export default {
           }
         })
         .catch((err) => {
-          this.$message({ type: "error", message: `操作失败，原因：${err}` });
+          this.$message({ type: "error", message: `获取横向对比 SumItems 操作失败，原因：${err}` });
         });
     },
 

src/views/user-list/UserList.vue

@@ -92,6 +92,7 @@
                     min-width="50"
                     align="center"
                   ></el-table-column>
+                  <el-table-column prop="id" label="编号" min-width="200"></el-table-column>
                   <el-table-column prop="userName" label="账号" min-width="100">
                   </el-table-column>
                   <el-table-column prop="email" label="邮箱" min-width="150">