优化检验检查中辅助信息的填充。

src/components/zhu-yuan-yi-sheng/emr/EmrSidebar.vue

@@ -195,6 +195,7 @@ const handleNodeClick = async (val, node, parent, event) => {
   if (val.children) {
     return
   }
+
   if (val.labels) {
     // 根据 这个编码来限制是不是唯一一个
     if (val.labels.includes('唯一') && templateType !== 2) {
@@ -208,6 +209,7 @@ const handleNodeClick = async (val, node, parent, event) => {
       }
     }
   }
+
   if (val.jump) {
     temp.code = val.code
     temp.value = val.value

src/components/zhu-yuan-yi-sheng/emr/auxiliary-tools/EmrAuxiliaryTools.vue

@@ -59,6 +59,7 @@
                    :times="patInfo.admissTimes"
                    @to-fill-in-data="toFillInData"/>
     <emr-test @close="close" v-if="index === 6"
+              :times="patInfo.admissTimes"
               :pat-no="patInfo.inpatientNo"/>
     <emr-herbs v-if="index === 7"
                @close="close"

src/components/zhu-yuan-yi-sheng/emr/auxiliary-tools/EmrTest.vue

@@ -13,6 +13,7 @@
       <br>
     </div>
     <div class="describe">
+
       <el-button v-if="isEmr" type="primary" @click="copyOutcome('病理结果')">
         病理结果
       </el-button>
@@ -89,10 +90,11 @@
         <div style="display: flex">
           <div class="sidebar">
             <vxe-table :height="height"
+                       :max-height="height"
                        :row-config="{isHover : true, isCurrent: true,height: 24}"
                        show-header-overflow
                        show-overflow
-                       :scroll-x="{gt: 0,enabled: false}"
+                       :scroll-x="{enabled: false}"
                        :scroll-y="{gt: 0 ,enabled: true}"
                        class="vxe-padding_zero"
                        @cell-click="sidebarRow"
@@ -159,9 +161,11 @@ import {
   emrCopyFunc
 } from '@/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/emr-init'
 import {copyStrFunc} from "@/utils/public";
+import {getCriticalValueByPatInfo} from "@/api/zhu-yuan-yi-sheng/critical-value";
 
-const {patNo, isEmr} = defineProps({
+const {patNo, isEmr, times} = defineProps({
   patNo: String,
+  times: Number,
   isEmr: {
     type: Boolean,
     default: true
@@ -317,7 +321,7 @@ onMounted(async () => {
   dateRange.value = await currentAndAFewDaysAgo()
   await query()
   // todo 检验接口没有返回危急值。
-  // let res = await getCriticalValueByPatInfo(patInfo.value.inpatientNo, patInfo.value.admissTimes)
+  let res = await getCriticalValueByPatInfo(patNo, times)
 })
 
 </script>

src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/EmrMain.vue

@@ -119,7 +119,7 @@
 
   <div style="display: flex">
     <div class="modLeftRef" v-show="completeModeSwitch">
-      <div ref="modLeftRef" class="refDiv"></div>
+      <div ref="modLeftRef" class="refDiv"/>
     </div>
     <div v-show="!completeModeSwitch"
          style="height: max-content"
@@ -152,8 +152,11 @@
         </div>
         <div style="display: flex;width: 100%">
           <div :style="emrMainWidth()"
-               v-show="showIframe === 1 || showIframe === 3 || showIframe === 5">
+               v-show=" showIframe === 1 ||
+               showIframe === 3 ||
+               showIframe === 5">
             <div style="position: relative">
+
               <emr-popup ref="popupRef"
                          @fill-data="popupFunc.fillData"/>
 

src/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng.ts

@@ -402,7 +402,8 @@ export function yzDataToTree(data: yzType[]): yzType[] {
             parent.children.push(item);
             item.orderGroup = "丨";
         }
-    })
+    });
+
     // 判断 noParent 不为空
     if (noParent.size > 0) {
         // 把 noParent 的 value 全部放到 tree 数组中
@@ -627,16 +628,15 @@ export const clickOnThePatient = async (patNo: string) => {
     queryParam.value.zhuangTai = 0;
     queryParam.value.displayRange = 2;
     clearAssociate();
-    const temp = await getAncillaryInformation(huanZheXinXi.value.inpatientNo, huanZheXinXi.value.admissTimes)
+    const temp = await getAncillaryInformation(huanZheXinXi.value.inpatientNo, huanZheXinXi.value.admissTimes);
     if (temp) {
-        let str = JSON.stringify(temp)
-        jcExtraInformation = JSON.parse(str)
-        jyExtraInformation = JSON.parse(str)
+        let str = JSON.stringify(temp);
+        jcExtraInformation = JSON.parse(str);
+        jyExtraInformation = JSON.parse(str);
     } else {
-        jcExtraInformation = JSON.parse(strDefaultExtraInformation)
-        jyExtraInformation = JSON.parse(strDefaultExtraInformation)
+        jcExtraInformation = JSON.parse(strDefaultExtraInformation);
+        jyExtraInformation = JSON.parse(strDefaultExtraInformation);
     }
-
 }