From af8fb1bea3e36bbff6d9f0d3bfb810652903d38d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E6=96=8C=E6=9D=B0?= <>
Date: Thu, 31 Oct 2024 13:24:06 +0800
Subject: [PATCH] UI

---
 src/assets/css/global.css                     |  17 +-
 src/components/doctorCheck/CheckItemList.vue  | 841 ++++++++++++------
 src/components/doctorCheck/CheckSumSug.vue    |   2 +-
 src/components/follow/FollowCriticalCheck.vue |   8 +
 src/views/doctorCheck/doctorCheck.vue         |   6 +
 5 files changed, 582 insertions(+), 292 deletions(-)

diff --git a/src/assets/css/global.css b/src/assets/css/global.css
index f942eff..0859c19 100644
--- a/src/assets/css/global.css
+++ b/src/assets/css/global.css
@@ -28,9 +28,10 @@
 /* 表格选中行 颜色 ::v-deep  #F4F8FF*/
 
 .el-table__body tr.current-row>td {
-    background-color: #DCE7FD !important; 
+    background-color: #DCE7FD !important;
 }
 
+
 /* 表格行背景色样式 end */
 
 
@@ -147,6 +148,7 @@
 
 
 /* el-cascader 隐藏前面的radio并点击行选中 */
+
 .example .el-cascader-panel .el-radio {
     width: 100%;
     height: 100%;
@@ -182,5 +184,16 @@ a {
 }
 
 .el-checkbox__label {
-    padding-left: 2px;    
+    padding-left: 2px;
+}
+
+.el-icon-more {
+    color: #0046FB;
+}
+
+.el-popover__title {
+    color: #232748;
+    font-weight: 700;
+    font-size: 16px;
+    font-family: "NotoSansSC-Bold";
 }
\ No newline at end of file
diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue
index 3b71e80..6b2600e 100644
--- a/src/components/doctorCheck/CheckItemList.vue
+++ b/src/components/doctorCheck/CheckItemList.vue
@@ -1,37 +1,132 @@
 <template>
   <div>
-    <el-table :data="doctorCheck.checkItemList" style="width: 100%" :height="tableHeight" border highlight-current-row
-      @row-click="rowClick" size="small">
+    <el-table
+      :data="doctorCheck.checkItemList"
+      style="width: 100%"
+      :height="tableHeight"
+      border
+      highlight-current-row
+      @row-click="rowClick"
+      size="small"
+    >
       <el-table-column prop="itemName" label="项目" width="220" />
       <el-table-column prop="result" label="结果" min-width="200">
         <template slot-scope="scope">
-          <div style="display: flex;">
-            <el-autocomplete style="width: 100%;" type="textarea" v-model="scope.row.result" placeholder="请输入结果值"
-              :disabled="rowResultDisabled(scope.row)" :autosize="{ minRows: 1, maxRows: 10 }" :trigger-on-focus="false"
-              :fetch-suggestions="querySearch" :data-lineModeFlag="scope.row.lineModeFlag"
-              @input="madeTooltips(scope.$index); computeFun(scope.$index)" v-bind:class="scope.row.class">
+          <div style="display: flex">
+            <el-autocomplete
+              style="width: 100%"
+              type="textarea"
+              v-model="scope.row.result"
+              placeholder="请输入结果值"
+              :disabled="rowResultDisabled(scope.row)"
+              :autosize="{ minRows: 1, maxRows: 10 }"
+              :trigger-on-focus="false"
+              :fetch-suggestions="querySearch"
+              :data-lineModeFlag="scope.row.lineModeFlag"
+              @input="
+                madeTooltips(scope.$index);
+                computeFun(scope.$index);
+              "
+              v-bind:class="scope.row.class"
+            >
             </el-autocomplete>
-            <el-button style="min-width:23px;padding: 2px;" icon="el-icon-caret-bottom"
-              @click="btnMoreResult(scope.row, scope.$index)" :disabled="rowResultDisabled(scope.row)"
-              size="small"></el-button>
-            <el-button style="min-width:23px;padding:2px;margin-left: 2px;"
-              @click="btnPacsResult(scope.row, scope.$index)" :disabled="rowResultDisabled(scope.row)"
-              size="small">P</el-button>
+            <el-button
+              style="min-width: 23px; padding: 2px"
+              icon="el-icon-caret-bottom"
+              @click="btnMoreResult(scope.row, scope.$index)"
+              :disabled="rowResultDisabled(scope.row)"
+              size="small"
+            ></el-button>
+            <el-button
+              style="min-width: 23px; padding: 2px; margin-left: 2px"
+              @click="btnPacsResult(scope.row, scope.$index)"
+              :disabled="rowResultDisabled(scope.row)"
+              size="small"
+              >P</el-button
+            >
+            <!-- <el-button style="min-width:23px;padding:2px;margin-left: 2px;"
+              @click="btnPacsResulst(scope.row, scope.$index)" :disabled="rowResultDisabled(scope.row)"
+              size="small">S</el-button> -->
+            <el-popover placement="top-end" width="500" trigger="click" :title="scope.row.itemName">
+              <el-tabs v-model="activeName">
+                <el-tab-pane label="文字结果" name="first">
+                  <el-table :data="gridData">
+                    <el-table-column
+                      width="150"
+                      property="date"
+                      label="日期"
+                    ></el-table-column>
+                    <el-table-column
+                      width="100"
+                      property="name"
+                      label="姓名"
+                    ></el-table-column>
+                    <el-table-column
+                      width="300"
+                      property="address"
+                      label="地址"
+                    ></el-table-column>
+                  </el-table>
+                </el-tab-pane>
+                <el-tab-pane label="折线图" name="second"></el-tab-pane>
+              </el-tabs>
+              <el-button
+                slot="reference"
+                style="min-width: 23px; padding: 5.8px; margin-left: 2px"
+                :disabled="rowResultDisabled(scope.row)"
+                @click="btnPacsRessulst(scope.row, scope.$index)"
+                size="small"
+                >S</el-button
+              >
+            </el-popover>
           </div>
         </template>
       </el-table-column>
       <el-table-column prop="unit" label="单位" width="90" align="center" />
-      <el-table-column prop="referenceRangeValue" label="参考范围" width="120" align="center" />
-      <el-table-column prop="resultStatusId" label="提示" width="40" align="center">
+      <el-table-column
+        prop="referenceRangeValue"
+        label="参考范围"
+        width="120"
+        align="center"
+      />
+      <el-table-column
+        prop="resultStatusId"
+        label="提示"
+        width="40"
+        align="center"
+      >
         <template slot-scope="scope">
-          <div>{{ dddw(resultStatus, 'id', scope.row.resultStatusId, 'dataInputPrompt') }}</div>
+          <div>
+            {{
+              dddw(
+                resultStatus,
+                "id",
+                scope.row.resultStatusId,
+                "dataInputPrompt"
+              )
+            }}
+          </div>
         </template>
       </el-table-column>
-      <el-table-column prop="criticalFlag" label="危急值" width="50" align="center">
+      <el-table-column
+        prop="criticalFlag"
+        label="危急值"
+        width="50"
+        align="center"
+      >
         <template slot-scope="scope">
-          <el-button style="min-width:23px;padding:6px 2px;"
-              @click="btnCritical(scope.row)"
-              size="small">W</el-button>
+          <el-button
+            :style="[
+              { minWidth: '23px' },
+              { padding: '6px 2px' },
+              {
+                backgroundColor: scope.row.isCriticalValue == 'Y' ? 'red' : '',
+              },
+            ]"
+            @click="btnCritical(scope.row)"
+            size="small"
+            >W</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -39,56 +134,136 @@
     <!--弹窗-->
     <div>
       <!-- 结果录入模版 -->
-      <el-dialog title="结果录入模版" :visible.sync="dialogWinMoreResult" width="800px" :close-on-click-modal="false">
-        <div style="margin-top: -10px;">
-          <el-checkbox v-model="isSplitChooseResult" size="small" true-label="Y"
-            false-label="N">选结果模板时自动添加分隔符；</el-checkbox>
+      <el-dialog
+        title="结果录入模版"
+        :visible.sync="dialogWinMoreResult"
+        width="800px"
+        :close-on-click-modal="false"
+      >
+        <div style="margin-top: -10px">
+          <el-checkbox
+            v-model="isSplitChooseResult"
+            size="small"
+            true-label="Y"
+            false-label="N"
+            >选结果模板时自动添加分隔符；</el-checkbox
+          >
           <div
-            style="overflow-y:auto; height:300px;width:100%;display: flex;flex-wrap: wrap;align-content: flex-start;">
-            <div v-for="item in moreResult.data" :key="item.id" style="margin: 5px;cursor:pointer;"
-              @click="clickResult(item)" @dblclick="dblclickResult(item)">
-              <el-tag size="samll"
-                style="padding: 0 3px;height: 24px;line-height: 24px;font-size: 14px; color: #303133;background-color: white;">{{
-                  item.result }}</el-tag>
+            style="
+              overflow-y: auto;
+              height: 300px;
+              width: 100%;
+              display: flex;
+              flex-wrap: wrap;
+              align-content: flex-start;
+            "
+          >
+            <div
+              v-for="item in moreResult.data"
+              :key="item.id"
+              style="margin: 5px; cursor: pointer"
+              @click="clickResult(item)"
+              @dblclick="dblclickResult(item)"
+            >
+              <el-tag
+                size="samll"
+                style="
+                  padding: 0 3px;
+                  height: 24px;
+                  line-height: 24px;
+                  font-size: 14px;
+                  color: #303133;
+                  background-color: white;
+                "
+                >{{ item.result }}</el-tag
+              >
             </div>
           </div>
           <div>特殊符号：</div>
-          <div style="overflow-y:auto; width:100%;display: flex;flex-wrap: wrap;align-content: flex-start;">
-            <div v-for="item in symbols" :key="item.id" style="margin: 1px 2px;cursor:pointer;"
-              @click="insertSymbols(item.displayName)">
+          <div
+            style="
+              overflow-y: auto;
+              width: 100%;
+              display: flex;
+              flex-wrap: wrap;
+              align-content: flex-start;
+            "
+          >
+            <div
+              v-for="item in symbols"
+              :key="item.id"
+              style="margin: 1px 2px; cursor: pointer"
+              @click="insertSymbols(item.displayName)"
+            >
               <el-tag
-                style="padding: 0 3px;height: 24px;line-height: 24px;font-size: 15px;color: #303133;background-color: white;">
+                style="
+                  padding: 0 3px;
+                  height: 24px;
+                  line-height: 24px;
+                  font-size: 15px;
+                  color: #303133;
+                  background-color: white;
+                "
+              >
                 {{ item.displayName }}
               </el-tag>
             </div>
           </div>
-          <div style="display: flex;justify-content: space-between;">
-            <div style="margin-top: 5px;">录入结果：</div>
-            <div style="overflow-y:auto; display: flex;flex-wrap: wrap;">
-              <div v-for="item in splitSymbols" :key="item" style="margin: 1px 2px;cursor:pointer;"
-                @click="insertSymbols(item)">
+          <div style="display: flex; justify-content: space-between">
+            <div style="margin-top: 5px">录入结果：</div>
+            <div style="overflow-y: auto; display: flex; flex-wrap: wrap">
+              <div
+                v-for="item in splitSymbols"
+                :key="item"
+                style="margin: 1px 2px; cursor: pointer"
+                @click="insertSymbols(item)"
+              >
                 <el-tag
-                  style="padding: 0 3px;height: 24px;line-height: 24px;font-size: 15px;color: #303133;background-color: white;">
+                  style="
+                    padding: 0 3px;
+                    height: 24px;
+                    line-height: 24px;
+                    font-size: 15px;
+                    color: #303133;
+                    background-color: white;
+                  "
+                >
                   {{ item }}
                 </el-tag>
               </div>
             </div>
           </div>
-          <el-input id="resultBox" style="width: 100%;" class="commonFont" type="textarea"
-            :autosize="{ minRows: 4, maxRows: 4 }" v-model="moreResult.result" />
+          <el-input
+            id="resultBox"
+            style="width: 100%"
+            class="commonFont"
+            type="textarea"
+            :autosize="{ minRows: 4, maxRows: 4 }"
+            v-model="moreResult.result"
+          />
         </div>
         <span slot="footer" class="dialog-footer">
           <el-button @click="btnClear">清 除</el-button>
-          <el-button type="primary" @click="btnOkResult('defaultResult')">默认结果</el-button>
+          <el-button type="primary" @click="btnOkResult('defaultResult')"
+            >默认结果</el-button
+          >
           <el-button type="primary" @click="btnOkResult('')">确 定</el-button>
           <el-button @click="dialogWinMoreResult = false">关 闭</el-button>
         </span>
       </el-dialog>
 
       <!--Pacs结果录入模版-->
-      <el-dialog :title="'Pacs结果录入模版 -- ' + doctorCheck.asbitemName" v-if="dialogWinPacsTemplate" :visible.sync="dialogWinPacsTemplate" width="800px"
-        :close-on-click-modal="false">
-        <PacsTemplate :refParams="pacsParams" :refFuncOther="handlePacsResult" />
+      <el-dialog
+        :title="'Pacs结果录入模版 -- ' + doctorCheck.asbitemName"
+        v-if="dialogWinPacsTemplate"
+        :visible.sync="dialogWinPacsTemplate"
+        width="800px"
+        :close-on-click-modal="false"
+      >
+        <PacsTemplate
+          :refParams="pacsParams"
+          :refFuncOther="handlePacsResult"
+        />
       </el-dialog>
     </div>
   </div>
@@ -97,19 +272,42 @@
 // 0-无参考范围，1-数字型，2-字符型，3-性激素
 import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { arrayExistObj, dddw, deepCopy } from '../../utlis/proFunc'
+import { arrayExistObj, dddw, deepCopy } from "../../utlis/proFunc";
 import PacsTemplate from "./PacsTemplate.vue";
 
 export default {
   components: {
-    PacsTemplate
+    PacsTemplate,
   },
   props: ["isCheckPicture", "registerCheckId", "doctor_check_check_charge"],
   data() {
     return {
+      activeName: "first",
+      gridData: [
+        {
+          date: "2016-05-02",
+          name: "王小虎",
+          address: "上海市普陀区金沙江路 1518 弄",
+        },
+        {
+          date: "2016-05-04",
+          name: "王小虎",
+          address: "上海市普陀区金沙江路 1518 弄",
+        },
+        {
+          date: "2016-05-01",
+          name: "王小虎",
+          address: "上海市普陀区金沙江路 1518 弄",
+        },
+        {
+          date: "2016-05-03",
+          name: "王小虎",
+          address: "上海市普陀区金沙江路 1518 弄",
+        },
+      ],
       resultStatus: [], //结果状态提示数据
       tipsNormal: {
-        id: '01',
+        id: "01",
         displayName: "正常",
         dataInputPrompt: "正常",
         reportPrompt: "正常",
@@ -121,132 +319,141 @@ export default {
       tipsError: {}, //错误提示
       tipsNegative: {}, //阴性提示
       tipsLowPositive: {}, //弱阳性提示
-      tipsPositive: {}, //阳性提示      
+      tipsPositive: {}, //阳性提示
       tipsLow: {}, //偏低提示
       tipsHigh: {}, //偏高提示
       tipsSuperLow: {}, //超低提示
       tipsSuperHigh: {}, //超高提示
-      tipsSuper: {},  //文字型危急值    
+      tipsSuper: {}, //文字型危急值
 
       restaurants: [], //结果模版
       currentRow: -1, //当前操作的行
 
       dialogWinMoreResult: false,
-      dialogWinPacsTemplate:false,
+      dialogWinPacsTemplate: false,
       moreResult: {
         data: [],
-        result: '',
-        defaultResult: '',
+        result: "",
+        defaultResult: "",
         index: 0, // 明细序列
       }, //结果模版
-      isSplitChooseResult: 'N', // 选结果时，是否自动加上分隔符
-      selection: { // 光标位置
-        start: 0, end: 0
+      isSplitChooseResult: "N", // 选结果时，是否自动加上分隔符
+      selection: {
+        // 光标位置
+        start: 0,
+        end: 0,
       },
       symbols: [], //特殊符号
-      splitSymbols: ['；', '、'],  // 分隔符
-      userId: '',
+      splitSymbols: ["；", "、"], // 分隔符
+      userId: "",
 
       // pacs 结果录入
       pacsParams: {
-        from:'doctor',
-        refresh:-1, // 强制刷新
+        from: "doctor",
+        refresh: -1, // 强制刷新
         row: {},
         index: 0,
-        result: '',
-        summary: ''
+        result: "",
+        summary: "",
       },
-
     };
   },
 
   created() {
-    this.dictInit()
+    this.dictInit();
   },
 
   //挂载完成
   mounted() {
     this.checkItemList(this.dataTransOpts.tableS.register_check.id);
 
-    this.userId = window.sessionStorage.getItem("userId")
+    this.userId = window.sessionStorage.getItem("userId");
   },
 
   computed: {
-    ...mapState(["window", "dataTransOpts", "dict", "dialogWin", "doctorCheck"]),
-
+    ...mapState([
+      "window",
+      "dataTransOpts",
+      "dict",
+      "dialogWin",
+      "doctorCheck",
+    ]),
     tableHeight() {
-      let temp = this.window.pageHeight < 600 ? 600 : this.window.pageHeight
-      return Math.floor((temp - 260 - (this.isCheckPicture ? 110 : 0)) * 3 / 5);
+      let temp = this.window.pageHeight < 600 ? 600 : this.window.pageHeight;
+      return Math.floor(
+        ((temp - 260 - (this.isCheckPicture ? 110 : 0)) * 3) / 5
+      );
     },
-
   },
 
   methods: {
     dddw,
     dictInit() {
       //获取结果状态提示数据
-      getapi('/api/app/result-status').then(res => {
+      getapi("/api/app/result-status").then((res) => {
         if (res.code != -1) {
-          this.resultStatus = res.data
-          this.resultStatus.forEach(e => {
+          this.resultStatus = res.data;
+          this.resultStatus.forEach((e) => {
             switch (e.id) {
-              case '01': // 正常
-                e.tooltips = 'tipsNormal'
-                this.colorTrans(e, e.tooltips)
+              case "01": // 正常
+                e.tooltips = "tipsNormal";
+                this.colorTrans(e, e.tooltips);
                 break;
-              case '02': // 错误
-                e.tooltips = 'tipsError'
-                this.colorTrans(e, e.tooltips)
+              case "02": // 错误
+                e.tooltips = "tipsError";
+                this.colorTrans(e, e.tooltips);
                 break;
-              case '03': // 阴性
-                e.tooltips = 'tipsNegative'
-                this.colorTrans(e, e.tooltips)
+              case "03": // 阴性
+                e.tooltips = "tipsNegative";
+                this.colorTrans(e, e.tooltips);
                 break;
-              case '04': // 阳性
-                e.tooltips = 'tipsPositive'
-                this.colorTrans(e, e.tooltips)
+              case "04": // 阳性
+                e.tooltips = "tipsPositive";
+                this.colorTrans(e, e.tooltips);
                 break;
-              case '05': // 弱阳性
-                e.tooltips = 'tipsLowPositive'
-                this.colorTrans(e, e.tooltips)
+              case "05": // 弱阳性
+                e.tooltips = "tipsLowPositive";
+                this.colorTrans(e, e.tooltips);
                 break;
-              case '06': // 偏低
-                e.tooltips = 'tipsLow'
-                this.colorTrans(e, e.tooltips)
+              case "06": // 偏低
+                e.tooltips = "tipsLow";
+                this.colorTrans(e, e.tooltips);
                 break;
-              case '07': // 偏高
-                e.tooltips = 'tipsHigh'
-                this.colorTrans(e, e.tooltips)
+              case "07": // 偏高
+                e.tooltips = "tipsHigh";
+                this.colorTrans(e, e.tooltips);
                 break;
-              case '08': // 危急值下限
-                e.tooltips = 'tipsSuperLow'
-                this.colorTrans(e, e.tooltips)
+              case "08": // 危急值下限
+                e.tooltips = "tipsSuperLow";
+                this.colorTrans(e, e.tooltips);
                 break;
-              case '09': // 危急值上限
-                e.tooltips = 'tipsSuperHigh'
-                this.colorTrans(e, e.tooltips)
+              case "09": // 危急值上限
+                e.tooltips = "tipsSuperHigh";
+                this.colorTrans(e, e.tooltips);
                 break;
-              case '10': // 危急值
-                e.tooltips = 'tipsSuper'
-                this.colorTrans(e, e.tooltips)
+              case "10": // 危急值
+                e.tooltips = "tipsSuper";
+                this.colorTrans(e, e.tooltips);
                 break;
               default:
-                e.tooltips = 'tipsNormal'
-                this.colorTrans(e, e.tooltips)
+                e.tooltips = "tipsNormal";
+                this.colorTrans(e, e.tooltips);
                 break;
             }
           });
         }
-      })
+      });
 
       //获取结果状态提示数据
-      postapi('/api/app/CommonChar/GetCommonCharList', {}).then(res => {
+      postapi("/api/app/CommonChar/GetCommonCharList", {}).then((res) => {
         if (res.code >= 0) {
-          this.symbols = res.data
+          this.symbols = res.data;
         }
-      })
+      });
+    },
+    btnPacsRessulst(row, index) {
+      console.log("显示", row);
     },
-
     // 颜色转换
     // displayName: "错误",
     // dataInputPrompt: "×",
@@ -256,16 +463,16 @@ export default {
     // dataInputBackgroundColor: 321313,
     // dataInputFontColor: 12991019,
     colorTrans(dataColor, frontColor) {
-      let tempColor = '000000' + Number(dataColor.dataInputBackgroundColor).toString(16)
-      let backgroundColor = '#' + tempColor.substring(tempColor.length - 6)
-      tempColor = '000000' + Number(dataColor.dataInputFontColor).toString(16)
-      let color = '#' + tempColor.substring(tempColor.length - 6)
-      this[frontColor] = Object.assign(
-        {},
-        dataColor,
-        { backgroundColor, color }
-      )
-      console.log(`this.${frontColor}`, this[frontColor])
+      let tempColor =
+        "000000" + Number(dataColor.dataInputBackgroundColor).toString(16);
+      let backgroundColor = "#" + tempColor.substring(tempColor.length - 6);
+      tempColor = "000000" + Number(dataColor.dataInputFontColor).toString(16);
+      let color = "#" + tempColor.substring(tempColor.length - 6);
+      this[frontColor] = Object.assign({}, dataColor, {
+        backgroundColor,
+        color,
+      });
+      console.log(`this.${frontColor}`, this[frontColor]);
     },
 
     // "referenceRangeValue": "15-55",
@@ -273,79 +480,103 @@ export default {
     // "criticalRangeValue": null,
     // "result"
     madeTooltips(index) {
-      // let ts = confirm('提示')      
-      let checkItem = this.doctorCheck.checkItemList[index]
-      let tooltips = 'tipsNormal'
-      checkItem.class = tooltips
-      let referenceRangeTypeFlag = checkItem.referenceRangeTypeFlag || '0' //参考范围类别0-无参考范围，1-数字型，2-字符型，3-性激素
+      // let ts = confirm('提示')
+      let checkItem = this.doctorCheck.checkItemList[index];
+      let tooltips = "tipsNormal";
+      checkItem.class = tooltips;
+      let referenceRangeTypeFlag = checkItem.referenceRangeTypeFlag || "0"; //参考范围类别0-无参考范围，1-数字型，2-字符型，3-性激素
       // console.log('madeTooltips',index,referenceRangeTypeFlag)
       switch (referenceRangeTypeFlag) {
-        case '3':  // 1 是数字型，3 是性激素期
-        case '1':
+        case "3": // 1 是数字型，3 是性激素期
+        case "1":
           // console.log('1、3')
           if (checkItem.result) {
             let tempResult = checkItem.result
-              .replaceAll('<', '').replaceAll('≤', '').replaceAll('≦', '')
-              .replaceAll('>', '').replaceAll('≥', '').replaceAll('≧', '')
-              .replaceAll('=', '').replaceAll(' ', '')
-            console.log('tempResult', isNaN(tempResult), tempResult)
+              .replaceAll("<", "")
+              .replaceAll("≤", "")
+              .replaceAll("≦", "")
+              .replaceAll(">", "")
+              .replaceAll("≥", "")
+              .replaceAll("≧", "")
+              .replaceAll("=", "")
+              .replaceAll(" ", "");
+            console.log("tempResult", isNaN(tempResult), tempResult);
             if (isNaN(tempResult)) break;
-            let result = Number(tempResult)
-
+            let result = Number(tempResult);
 
             if (checkItem.referenceRangeValue) {
-              let criticalRangeValue = checkItem.criticalRangeValue
-              let valueArr = checkItem.referenceRangeValue.replaceAll('--', '-').replaceAll('〜', '-').replaceAll('～', '-').split('-')
-              if (valueArr.length == 1) valueArr.unshift(0)
-
+              let criticalRangeValue = checkItem.criticalRangeValue;
+              let valueArr = checkItem.referenceRangeValue
+                .replaceAll("--", "-")
+                .replaceAll("〜", "-")
+                .replaceAll("～", "-")
+                .split("-");
+              if (valueArr.length == 1) valueArr.unshift(0);
 
               // console.log('valueArr',checkItem.referenceRangeValue,valueArr)
               if (criticalRangeValue) {
-                let criticalArr = criticalRangeValue.replaceAll('--', '-').replaceAll('〜', '-').replaceAll('～', '-').split('-')
-                if (criticalArr.length == 1) criticalArr.unshift(0)
+                let criticalArr = criticalRangeValue
+                  .replaceAll("--", "-")
+                  .replaceAll("〜", "-")
+                  .replaceAll("～", "-")
+                  .split("-");
+                if (criticalArr.length == 1) criticalArr.unshift(0);
 
                 // console.log('criticalArr',checkItem.criticalRangeValue,criticalArr)
 
                 if (result < Number(criticalArr[0])) {
-                  tooltips = 'tipsSuperLow'
+                  tooltips = "tipsSuperLow";
                 } else if (result > Number(criticalArr[1])) {
-                  tooltips = 'tipsSuperHigh'
+                  tooltips = "tipsSuperHigh";
                 } else if (result < Number(valueArr[0])) {
-                  tooltips = 'tipsLow'
+                  tooltips = "tipsLow";
                 } else if (result > Number(valueArr[1])) {
-                  tooltips = 'tipsHigh'
+                  tooltips = "tipsHigh";
                 }
               } else {
                 if (result < Number(valueArr[0])) {
-                  tooltips = 'tipsLow'
+                  tooltips = "tipsLow";
                 } else if (result > Number(valueArr[1])) {
-                  tooltips = 'tipsHigh'
+                  tooltips = "tipsHigh";
                 }
               }
             }
 
             //错误值校验
-            let errArr = []
+            let errArr = [];
             if (checkItem.inputCheck) {
-              errArr = checkItem.inputCheck.replaceAll('--', '-').replaceAll('〜', '-').replaceAll('～', '-').split('-')
-              if (errArr.length == 1) errArr.unshift(-1)
+              errArr = checkItem.inputCheck
+                .replaceAll("--", "-")
+                .replaceAll("〜", "-")
+                .replaceAll("～", "-")
+                .split("-");
+              if (errArr.length == 1) errArr.unshift(-1);
             }
             if (errArr && errArr.length > 1) {
               if (result < Number(errArr[0]) || result > Number(errArr[1])) {
-                tooltips = 'tipsError'
-                console.log('checkItem', checkItem)
+                tooltips = "tipsError";
+                console.log("checkItem", checkItem);
               }
             }
           }
           break;
-        case '2':
+        case "2":
           if (checkItem.result) {
-            if (checkItem.result.indexOf('阴性') > -1 || checkItem.result.indexOf('-') > -1) {
-              tooltips = 'tipsNegative'
-            } else if (checkItem.result.indexOf('弱阳性') > -1 || checkItem.result.indexOf('±') > -1) {
-              tooltips = 'tipsLowPositive'
-            } else if (checkItem.result.indexOf('阳性') > -1 || checkItem.result.indexOf('+') > -1) {
-              tooltips = 'tipsPositive'
+            if (
+              checkItem.result.indexOf("阴性") > -1 ||
+              checkItem.result.indexOf("-") > -1
+            ) {
+              tooltips = "tipsNegative";
+            } else if (
+              checkItem.result.indexOf("弱阳性") > -1 ||
+              checkItem.result.indexOf("±") > -1
+            ) {
+              tooltips = "tipsLowPositive";
+            } else if (
+              checkItem.result.indexOf("阳性") > -1 ||
+              checkItem.result.indexOf("+") > -1
+            ) {
+              tooltips = "tipsPositive";
             }
           }
           break;
@@ -354,9 +585,9 @@ export default {
       }
 
       // 判断后重新赋值
-      checkItem.class = tooltips
+      checkItem.class = tooltips;
       // 保存过检查时，直接取数据库
-      checkItem.resultStatusId = this[tooltips].id   //名称 dataInputPrompt
+      checkItem.resultStatusId = this[tooltips].id; //名称 dataInputPrompt
 
       // console.log('checkItem',checkItem)
       // console.log(`this.${tooltips}`,this[tooltips])
@@ -364,56 +595,67 @@ export default {
 
     // 行结果是否可编辑
     rowResultDisabled(row) {
-      return row.isCalculationItem == 'Y' || this.doctorCheck.RegisterCheckEdit.completeFlag == '1' || this.doctorCheck.RegisterCheckEdit.completeFlag == '2'
+      return (
+        row.isCalculationItem == "Y" ||
+        this.doctorCheck.RegisterCheckEdit.completeFlag == "1" ||
+        this.doctorCheck.RegisterCheckEdit.completeFlag == "2"
+      );
     },
-    btnCritical(row){
-      this.dialogWin.FollowCriticalCheck=true
-      this.doctorCheck.combinationCriticalValue=false
-      this.doctorCheck.singleDetailedProject=row
+    btnCritical(row) {
+      this.dialogWin.FollowCriticalCheck = true;
+      this.doctorCheck.combinationCriticalValue = false;
+      this.doctorCheck.singleDetailedProject = row;
     },
     //项目列为计算函数
     computeFun(index) {
       // 有计算项的，才调用计算函数
-      let haveComputeFun = false
-      let checkItem = this.doctorCheck.checkItemList[index]
-      console.log('checkItem', checkItem)
+      let haveComputeFun = false;
+      let checkItem = this.doctorCheck.checkItemList[index];
+      console.log("checkItem", checkItem);
       let body = {
         registerCheckId: checkItem.registerCheckId,
-        items: []
-      }
+        items: [],
+      };
 
-      this.doctorCheck.checkItemList.forEach(e => {
+      this.doctorCheck.checkItemList.forEach((e) => {
         body.items.push({
           itemId: e.itemId,
-          result: e.result
-        })
-        if (e.isCalculationItem == 'Y') haveComputeFun = true
+          result: e.result,
+        });
+        if (e.isCalculationItem == "Y") haveComputeFun = true;
       });
-      if (!haveComputeFun) return  // 有计算项的，才调用计算函数
-      let lfind = -1
-      postapi('/api/app/diagnosisfunction/getcalculationfunctionresult', body).then(res => {
+      if (!haveComputeFun) return; // 有计算项的，才调用计算函数
+      let lfind = -1;
+      postapi(
+        "/api/app/diagnosisfunction/getcalculationfunctionresult",
+        body
+      ).then((res) => {
         if (res.code != -1) {
           // console.log('res.data',res.data)
-          res.data.items.forEach(e => {
-            lfind = arrayExistObj(this.doctorCheck.checkItemList, "itemId", e.itemId)
+          res.data.items.forEach((e) => {
+            lfind = arrayExistObj(
+              this.doctorCheck.checkItemList,
+              "itemId",
+              e.itemId
+            );
             if (lfind > -1) {
               if (e.result != this.doctorCheck.checkItemList[lfind].result) {
-                this.doctorCheck.checkItemList[lfind].result = e.result
-                console.log('e', lfind, this.doctorCheck.checkItemList[lfind])
-                this.madeTooltips(lfind)
+                this.doctorCheck.checkItemList[lfind].result = e.result;
+                console.log("e", lfind, this.doctorCheck.checkItemList[lfind]);
+                this.madeTooltips(lfind);
               }
             }
           });
         }
-      })
+      });
     },
 
     // 点击结果模版按钮
     btnMoreResult(row, index) {
-      this.moreResult.data = deepCopy(row.itemResultTemplates)
-      this.moreResult.result = row.result
-      this.moreResult.defaultResult = row.defaultResult
-      this.moreResult.index = index
+      this.moreResult.data = deepCopy(row.itemResultTemplates);
+      this.moreResult.result = row.result;
+      this.moreResult.defaultResult = row.defaultResult;
+      this.moreResult.index = index;
       // "itemId": "3a0c517f-cbdb-9fff-e300-1f76b3e47580",
       // "result": "00000",
       // "diagnosisId": "3a0ed8a2-72d9-ee50-78aa-5b1f474f2921",
@@ -422,88 +664,87 @@ export default {
       // "resultStatusId": "01",
       // "simpleCode": "0"
 
-      this.dialogWinMoreResult = true
-
-      this.watchSelection()
+      this.dialogWinMoreResult = true;
 
+      this.watchSelection();
     },
 
     // pacs结果模板
     btnPacsResult(row, index) {
-
-      let result = row.result
-      let summary = ''
+      let result = row.result;
+      let summary = "";
 
       this.doctorCheck.checkSummaryList.forEach((e, i) => {
-        summary += e.summary
+        summary += e.summary;
       });
 
+      this.pacsParams.row = row;
+      this.pacsParams.index = index;
+      this.pacsParams.result = result;
+      this.pacsParams.summary = summary;
+      this.pacsParams.refresh++;
 
-      this.pacsParams.row = row
-      this.pacsParams.index = index
-      this.pacsParams.result = result
-      this.pacsParams.summary = summary
-      this.pacsParams.refresh++
-      
-      
-      this.dialogWinPacsTemplate = true
+      this.dialogWinPacsTemplate = true;
     },
 
     // 双击选择结果模版的结果
     dblclickResult(item) {
-      this.moreResult.result = ''
-      this.clickResult(item)
-      this.btnOkResult('')
+      this.moreResult.result = "";
+      this.clickResult(item);
+      this.btnOkResult("");
     },
 
     // 单击选择结果模版的结果
     clickResult(item) {
-      let result = []
-      if (this.moreResult.result) result = this.moreResult.result.split('；')
+      let result = [];
+      if (this.moreResult.result) result = this.moreResult.result.split("；");
       // 不用分隔符时，不判断包含关系
-      if (this.isSplitChooseResult == 'Y' && result.indexOf(item.result) > -1) return
-      if (this.isSplitChooseResult == 'Y' || result.length == 0) {
-        result.push(item.result)
+      if (this.isSplitChooseResult == "Y" && result.indexOf(item.result) > -1)
+        return;
+      if (this.isSplitChooseResult == "Y" || result.length == 0) {
+        result.push(item.result);
       } else {
-        result[result.length - 1] = result[result.length - 1] + item.result
+        result[result.length - 1] = result[result.length - 1] + item.result;
       }
 
-      let ret = ''
+      let ret = "";
       result.forEach((e, i) => {
-        let splitStr = '；'
-        if (i == 0) splitStr = ''
-        ret += splitStr + e
+        let splitStr = "；";
+        if (i == 0) splitStr = "";
+        ret += splitStr + e;
       });
-      this.moreResult.result = ret
+      this.moreResult.result = ret;
     },
 
     // 清除结果值
     btnClear() {
-      this.moreResult.result = ''
+      this.moreResult.result = "";
     },
 
     btnOkResult(result) {
-      this.doctorCheck.checkItemList[this.moreResult.index].result = result ? this.moreResult[result] : this.moreResult.result
+      this.doctorCheck.checkItemList[this.moreResult.index].result = result
+        ? this.moreResult[result]
+        : this.moreResult.result;
       this.madeTooltips(this.moreResult.index);
-      this.computeFun(this.moreResult.index)
-      this.dialogWinMoreResult = false
+      this.computeFun(this.moreResult.index);
+      this.dialogWinMoreResult = false;
     },
 
     // 处理 pacs 结果录入的情况
     handlePacsResult(row, index, pacsResult) {
       // console.log('row,index,pacsResult', row, index, pacsResult)
-      this.doctorCheck.checkItemList[index].result = pacsResult.result
-      this.doctorCheck.checkSummaryList = [{
-        id: Math.random(),
-        registerCheckId: this.doctorCheck.RegisterCheckEdit.id,
-        summary: pacsResult.summary,
-        summaryFlag: 'N',
-      }]
-      this.dialogWinPacsTemplate = false
+      this.doctorCheck.checkItemList[index].result = pacsResult.result;
+      this.doctorCheck.checkSummaryList = [
+        {
+          id: Math.random(),
+          registerCheckId: this.doctorCheck.RegisterCheckEdit.id,
+          summary: pacsResult.summary,
+          summaryFlag: "N",
+        },
+      ];
+      this.dialogWinPacsTemplate = false;
     },
 
-
-
     //选择项目
     rowClick(row) {
       this.doctorCheck.checkItem = row;
@@ -514,50 +755,63 @@ export default {
     checkItemList(RegisterCheckId) {
       // this.doctorCheck.checkItem = null
       if (!RegisterCheckId) {
-        this.doctorCheck.checkItemList = []
+        this.doctorCheck.checkItemList = [];
         this.doctorCheck.RegisterCheckEdit = {
-          id: '',
-          checkDoctorId: '',
-          checkDate: '',
-          LastModifierId: '',
-          LastModificationTime: '',
-          completeFlag: ''
-        }
-        return
+          id: "",
+          checkDoctorId: "",
+          checkDate: "",
+          LastModifierId: "",
+          LastModificationTime: "",
+          completeFlag: "",
+        };
+        return;
       }
-      console.log(`/api/app/registercheckitem/getlistinregistercheckid?RegisterCheckId=${RegisterCheckId}`);
+      console.log(
+        `/api/app/registercheckitem/getlistinregistercheckid?RegisterCheckId=${RegisterCheckId}`
+      );
 
       getapi(`/api/app/registercheck/getregistercheck?id=${RegisterCheckId}`)
-        .then(res => {
+        .then((res) => {
           if (res.code > -1) {
-            this.doctorCheck.RegisterCheckEdit = res.data
-            if (res.data.isCharge != 'Y' && this.doctor_check_check_charge == 'Y') {
-              this.$message.warning({ showClose: true, message: `该体检人员未缴清费用！` })
+            this.doctorCheck.RegisterCheckEdit = res.data;
+            if (
+              res.data.isCharge != "Y" &&
+              this.doctor_check_check_charge == "Y"
+            ) {
+              this.$message.warning({
+                showClose: true,
+                message: `该体检人员未缴清费用！`,
+              });
             }
-            if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') {
-              this.doctorCheck.RegisterCheckEdit.checkDoctorId = this.userId
-              this.doctorCheck.RegisterCheckEdit.checkDate = new Date()
+            if (this.doctorCheck.RegisterCheckEdit.completeFlag == "0") {
+              this.doctorCheck.RegisterCheckEdit.checkDoctorId = this.userId;
+              this.doctorCheck.RegisterCheckEdit.checkDate = new Date();
             }
-            return getapi(`/api/app/registercheckitem/getlistinregistercheckid?RegisterCheckId=${RegisterCheckId}&PatientRegisterId=${this.dataTransOpts.tableS.patient_register.id}`)
+            return getapi(
+              `/api/app/registercheckitem/getlistinregistercheckid?RegisterCheckId=${RegisterCheckId}&PatientRegisterId=${this.dataTransOpts.tableS.patient_register.id}`
+            );
           }
         })
         .then((res) => {
           // console.log("checkItemList", res.data);
           if (res && res.code > -1) {
-
             res.data.forEach((e, i) => {
               // 虚拟显示危急状态
-              e['criticalFlag'] = 'N'
+              e["criticalFlag"] = "N";
             });
 
             this.doctorCheck.checkItemList = res.data;
             this.doctorCheck.checkItemList.forEach((e, i) => {
-              if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') {
-                this.madeTooltips(i)
+              if (this.doctorCheck.RegisterCheckEdit.completeFlag == "0") {
+                this.madeTooltips(i);
               } else {
-                let lfind = arrayExistObj(this.resultStatus, 'id', e.resultStatusId)
+                let lfind = arrayExistObj(
+                  this.resultStatus,
+                  "id",
+                  e.resultStatusId
+                );
                 if (lfind > -1) {
-                  e.class = this.resultStatus[lfind].tooltips
+                  e.class = this.resultStatus[lfind].tooltips;
                 }
               }
             });
@@ -565,7 +819,10 @@ export default {
           }
         })
         .catch((err) => {
-          this.$message.error({ showClose: true, message: `操作失败，原因：${err}` });
+          this.$message.error({
+            showClose: true,
+            message: `操作失败，原因：${err}`,
+          });
         });
     },
 
@@ -585,14 +842,13 @@ export default {
     createFilter(queryString) {
       return (restaurant) => {
         return (
-          restaurant["value"]
-            .toLowerCase()
-            .indexOf(queryString.toLowerCase()) > -1
+          restaurant["value"].toLowerCase().indexOf(queryString.toLowerCase()) >
+          -1
         );
       };
     },
     handleSelect(item) {
-      console.log('item', item);
+      console.log("item", item);
     },
 
     //回车替代tab键
@@ -606,26 +862,28 @@ export default {
         // 为每个输入框添加键盘事件监听器
         inputs.forEach((input, i) => {
           // console.log('input',input);
-          input.addEventListener('keydown', (event) => {
-
+          input.addEventListener("keydown", (event) => {
             // 如果按下的是回车键
             // console.log('data-lineModeFlag', input, input.getAttribute('data-lineModeFlag'), i);
             // console.log('event.keyCode', event.keyCode)
 
             switch (event.keyCode) {
               case 13:
-                if (event.keyCode === 13 && input.getAttribute('data-lineModeFlag') == '0') {
+                if (
+                  event.keyCode === 13 &&
+                  input.getAttribute("data-lineModeFlag") == "0"
+                ) {
                   event.preventDefault();
                 } else {
                   break;
                 }
-              case 9:  // tab 键
+              case 9: // tab 键
                 event.preventDefault();
               case 40: // ↓ 键
                 for (let j = i + 1; j < inputs.length; j++) {
                   // console.log(inputs[j], inputs[j].getAttribute('type'), inputs[j].getAttribute('placeholder'))
-                  if (inputs[j].getAttribute('placeholder') == "请输入结果值") {
-                    if (inputs[j].getAttribute('disabled') != "disabled") {
+                  if (inputs[j].getAttribute("placeholder") == "请输入结果值") {
+                    if (inputs[j].getAttribute("disabled") != "disabled") {
                       // console.log('inputs[j]', inputs[j])
                       inputs[j].focus();
                       break;
@@ -636,8 +894,8 @@ export default {
               case 38: // ↑ 键
                 for (let j = i - 1; j > -1; j--) {
                   // console.log(inputs[j], inputs[j].getAttribute('type'), inputs[j].getAttribute('placeholder'))
-                  if (inputs[j].getAttribute('placeholder') == "请输入结果值") {
-                    if (inputs[j].getAttribute('disabled') != "disabled") {
+                  if (inputs[j].getAttribute("placeholder") == "请输入结果值") {
+                    if (inputs[j].getAttribute("disabled") != "disabled") {
                       // console.log('inputs[j]', inputs[j])
                       inputs[j].focus();
                       break;
@@ -651,8 +909,8 @@ export default {
           });
 
           // 点击时全选结果
-          input.addEventListener('click', (event) => {
-            input.select()
+          input.addEventListener("click", (event) => {
+            input.select();
           });
         });
       });
@@ -660,38 +918,41 @@ export default {
 
     // 光标位置插入特殊符号
     insertSymbols(symbols) {
-      let result = this.moreResult.result || ''
+      let result = this.moreResult.result || "";
       if (result) {
-        result = result.substring(0, this.selection.start) + symbols + result.substring(this.selection.end)
+        result =
+          result.substring(0, this.selection.start) +
+          symbols +
+          result.substring(this.selection.end);
       } else {
-        result = symbols
+        result = symbols;
       }
-      this.moreResult.result = result
-      this.selection.start++
-      this.selection.end++
+      this.moreResult.result = result;
+      this.selection.start++;
+      this.selection.end++;
     },
     // 获取光标位置的函数
     getCaretPosition() {
-      let input = document.getElementById('resultBox');
+      let input = document.getElementById("resultBox");
       this.selection.start = input.selectionStart;
       this.selection.end = input.selectionEnd;
       // console.log('selection',this.selection)
     },
     watchSelection() {
       this.$nextTick(() => {
-        let that = this
-        let resultBox = document.getElementById('resultBox'); //用数组可以读取多个标签的元素  //.inline-input
+        let that = this;
+        let resultBox = document.getElementById("resultBox"); //用数组可以读取多个标签的元素  //.inline-input
         // 绑定键盘事件到文本框
-        resultBox.addEventListener('click', function (event) {
+        resultBox.addEventListener("click", function (event) {
           // 获取光标位置
-          that.getCaretPosition()
-        })
+          that.getCaretPosition();
+        });
 
-        resultBox.addEventListener('input', function (event) {
+        resultBox.addEventListener("input", function (event) {
           // 获取光标位置
-          that.getCaretPosition()
-        })
-      })
+          that.getCaretPosition();
+        });
+      });
     },
   },
 
@@ -706,18 +967,20 @@ export default {
     //       newVal,
     //       " oldVal：",
     //       oldVal
-    //     );        
+    //     );
     //     this.checkItemList(newVal);
-    //   }  
+    //   }
     // },
 
     //检查项目未切换换时 也可以强制刷新数据
     "dataTransOpts.refresh.register_check_item.M": {
       // immediate: true,
       handler(newVal, oldVal) {
-        console.log(`watch 检查明细 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.register_check.id}`);
+        console.log(
+          `watch 检查明细 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.register_check.id}`
+        );
         this.checkItemList(this.dataTransOpts.tableS.register_check.id);
-      }
+      },
     },
   },
 };
diff --git a/src/components/doctorCheck/CheckSumSug.vue b/src/components/doctorCheck/CheckSumSug.vue
index 7c56a77..184f7fe 100644
--- a/src/components/doctorCheck/CheckSumSug.vue
+++ b/src/components/doctorCheck/CheckSumSug.vue
@@ -53,7 +53,7 @@
             :disabled="doctorBtnDisabled('fnQueue')">排队</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs, '危急值')">
-          <el-button type="primary" class="btnClass" style="min-width: 40px;" @click="btnCritical"
+          <el-button type="primary" class="btnClass" :style="[{minWidth: '40px'},{backgroundColor:(this.doctorCheck.RegisterCheckEdit.isCriticalValue=='Y'?'red':'')}]" @click="btnCritical"
             :disabled="doctorBtnDisabled('btnCritical')">危急值</el-button>
         </div>
       </div>
diff --git a/src/components/follow/FollowCriticalCheck.vue b/src/components/follow/FollowCriticalCheck.vue
index e926b31..d62c647 100644
--- a/src/components/follow/FollowCriticalCheck.vue
+++ b/src/components/follow/FollowCriticalCheck.vue
@@ -683,6 +683,7 @@ export default {
         isCriticalValueAudit:this.tableData.isCriticalValueAudit,
         isReview:this.tableData.isReview
       }).then(res => {
+          this.doctorCheck.RegisterCheckEdit.isCriticalValue=this.tableData.isCriticalValue
           this.dialogWin.FollowCriticalCheck = false
           this.tableData=this.$options.data.tableData
         })
@@ -696,6 +697,13 @@ export default {
         isReview:this.tableData.isReview,
         itemId:this.tableData.itemId
       }).then(res => {
+        for(let i=0;i<this.doctorCheck.checkItemList.length;i++){
+          console.log(this.doctorCheck.checkItemList[i])
+          if(this.doctorCheck.checkItemList[i].itemId==this.tableData.itemId){
+            this.doctorCheck.checkItemList[i].isCriticalValue=this.tableData.isCriticalValue
+            break;
+          }
+        }
           this.dialogWin.FollowCriticalCheck = false
           this.tableData=this.$options.data.tableData
         })
diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue
index 71a990f..2afc168 100644
--- a/src/views/doctorCheck/doctorCheck.vue
+++ b/src/views/doctorCheck/doctorCheck.vue
@@ -518,6 +518,12 @@ export default {
                 suggestion: e.diagnosisSuggestion
               })
             })
+              getapi(`/api/app/registercheck/getregistercheck?id=${this.doctorCheck.RegisterCheckId}`)
+        .then(res => {
+          if(res.code>-1){
+            this.doctorCheck.RegisterCheckEdit=res.data
+          }
+        })
             console.log("操作成功！")
           }
         })