From 0206414b6c111cbb06c68826dd8e753bf49a08cd Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Tue, 27 Aug 2024 16:11:14 +0800
Subject: [PATCH] doctor
---
 src/components/doctorCheck/CheckSumSug.vue | 161 +++++++++++++++------
 src/store/index.js                         |   1 +
 2 files changed, 119 insertions(+), 43 deletions(-)
diff --git a/src/components/doctorCheck/CheckSumSug.vue b/src/components/doctorCheck/CheckSumSug.vue
index 4c1beb6..475cf21 100644
--- a/src/components/doctorCheck/CheckSumSug.vue
+++ b/src/components/doctorCheck/CheckSumSug.vue
@@ -31,7 +31,7 @@
         
       
       
+        :style="`display: flex;position: absolute; top:${window.pageHeight - sumHeight - 42}px;right:${sumWidth + 125}px;z-index: 1;`">
         
           生成小结
@@ -57,43 +57,90 @@
             :disabled="doctorBtnDisabled('btnCritical')">危急值
         
        
-
-      
-      
-        
-          
-            
-              
-                {{ scope.$index + 1 }}
-              
-            
-          
-          
-            
-              
-            
-            
-              
-                
-                
-                
+      
+        
+          
+            
+              
+                
+                
+                
+                
+              
+              
+                
+                  | 项目 | 
+                  单位 | 
+                  参考范围 | 
+                  {{ doctorCheck.preResult.checkDate || '结果' }} | 
+                
+              
+              
+                
+                  | {{ item.itemName }} | 
+                  {{ item.unitName }} | 
+                  {{ item.referenceRangeValue }} | 
+                   | 
+                
+                
+                  | 小结 | 
+                  
+                     
+                      {{ item.summary }}
+                     
+                   | 
+                
+              
+            
+          
 
+        
+        
+          
+            
+              
+                
+                  
+                    
+                      {{ scope.$index + 1 }}
+                    
+                  
+                
+                
+                  
+                    
+                  
+                  
+                    
+                      
+                      
+                      
+                    
+                  
+                
+              
+            
 
+           
+        
+      
+
+
 
      
 
@@ -110,7 +157,7 @@
 import { mapState } from 'vuex';
 import Sortable from "sortablejs";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { getPagePriv, checkPagePriv, deepCopy } from "../../utlis/proFunc";
+import { getPagePriv, checkPagePriv, deepCopy, getColorStr } from "../../utlis/proFunc";
 import Queue from "../../components/queue/Queue.vue";
 
 export default {
@@ -125,6 +172,7 @@ export default {
         routeUrlorPageName: 'doctorCheck', //当前页面归属路由或归属页面权限名称
         privs: [], // 页面权限        
       },
+      activeName:'preResult'
     };
   },
 
@@ -141,7 +189,7 @@ export default {
   },
 
   computed: {
-    ...mapState(['window', 'dataTransOpts', 'dict', 'doctorCheck','dialogWin']),
+    ...mapState(['window', 'dataTransOpts', 'dict', 'doctorCheck', 'dialogWin']),
 
     //小结宽度
     sumWidth() {
@@ -157,7 +205,7 @@ export default {
   },
 
   methods: {
-    checkPagePriv,
+    checkPagePriv, getColorStr,
     //获取小结
     checkSummaryList(RegisterCheckId) {
       this.doctorCheck.checkSummaryList = [];
@@ -194,6 +242,25 @@ export default {
         });
     },
 
+    //获取历次结果
+    getPreResult(RegisterCheckId) {
+      if (!RegisterCheckId) {
+        this.doctorCheck.preResult = {};
+        return;
+      }
+      // console.log(`/api/app/registerchecksuggestion/getregisterchecksuggestionlist?RegisterCheckId=${RegisterCheckId}`)
+      postapi('/api/app/SumSummaryReport/GetLastTimeAsbitemResult', { registerCheckId: RegisterCheckId })
+        .then((res) => {
+          console.log("getPreResult", res.data);
+          if (res.code > -1) {
+            this.doctorCheck.preResult = res.data || {};
+          }
+        })
+        .catch((err) => {
+          this.$message({ type: "error", message: `操作失败,原因:${err}` });
+        });
+    },
+
 
     //拖拽
     rowDrop() {
@@ -263,7 +330,7 @@ export default {
     },
 
     // 危急值
-    btnCritical(){
+    btnCritical() {
       this.dialogWin.FollowCriticalCheck = true
     },
 
@@ -323,8 +390,11 @@ export default {
       immediate: true,
       handler(newVal, oldVal) {
         console.log(`watch 小结 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.register_check.id}`);
-        this.checkSummaryList(this.dataTransOpts.tableS.register_check.id)
-        this.checkSuggestionList(this.dataTransOpts.tableS.register_check.id)
+        if (newVal != oldVal) {
+          this.checkSummaryList(this.dataTransOpts.tableS.register_check.id)
+          this.checkSuggestionList(this.dataTransOpts.tableS.register_check.id)
+          this.getPreResult(this.dataTransOpts.tableS.register_check.id)
+        }
       }
     },
 
@@ -334,6 +404,11 @@ export default {