Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/user/components/PatientSidebar.vue

@@ -179,10 +179,10 @@ export default {
             //   name: '3-3',
             //   label: '体格检查新'
             // },
-            // {
-            //   name: '3-5',
-            //   label: '病程记录新'
-            // },
+             {
+              name: '3-5',
+              label: '病程记录新'
+             },
             {
               name: '1-11',
               label: '首次病程记录'

src/xt_pages/user/courseOfDisease_new.vue

@@ -252,7 +252,7 @@
             :max_befor_systolic_blood_pressure="max_befor_systolic_blood_pressure" :min_befor_systolic_blood_pressure="min_befor_systolic_blood_pressure" :max_befor_diastolic_blood_pressure="max_befor_diastolic_blood_pressure"  :min_befor_diastolic_blood_pressure="min_befor_diastolic_blood_pressure"
             :max_after_systolic_blood_pressure="max_after_systolic_blood_pressure" :min_after_systolic_blood_pressure="min_after_systolic_blood_pressure" :max_after_diastolic_blood_pressure="max_after_diastolic_blood_pressure" :min_after_diastolic_blood_pressure="min_after_diastolic_blood_pressure"
             :max_monitor_systolic_blood_pressure="max_monitor_systolic_blood_pressure" :min_monitor_systolic_blood_pressure="min_monitor_systolic_blood_pressure" :max_monitor_diastolic_blood_pressure="max_monitor_diastolic_blood_pressure" :min_monitor_diastolic_blood_pressure="min_monitor_diastolic_blood_pressure"
-            :lastDryWeight="lastDryWeight"></text_content>
+            :lastDryWeight="lastDryWeight" :patientVascularAccess="patientVascularAccess" :lastBefor="lastBefor"></text_content>
           </div>
         </div>
 
@@ -369,8 +369,9 @@
         min_monitor_systolic_blood_pressure:"",
         max_monitor_diastolic_blood_pressure:"",
         min_monitor_diastolic_blood_pressure:"",
-        lastDryWeight:{}
-
+        lastDryWeight:{},
+        patientVascularAccess:{},
+        lastBefor:{}
       }
     },
     created() {
@@ -577,51 +578,204 @@
         // this.auto_dialog = true
       },
       autotext_click(){
+
+          //  医嘱
+          if(this.longAdvice!=null && this.longAdvice.length>0){
+            for(let i=0;i<this.longAdvice.length;i++){
+                this.longAdvice[i].advice_type_name = ""
+                if(this.longAdvice[i].advice_type == 1){
+                  this.longAdvice[i].advice_type_name = "长期医嘱"
+                }
+                if(this.longAdvice[i].stop_state == 1){
+                  this.longAdvice[i].stop_state_name = "停用"
+                }
+                if(this.longAdvice[i].stop_state == 2){
+                  this.longAdvice[i].stop_state_name = "未停用"
+                }
+            }
+        }
+
+        if(this.inpectionList!=null&& this.inpectionList.length>0){
+           for(let i=0;i<this.inpectionList.length;i++){
+            this.inpectionList[i].group_no = ""
+             this.inpectionList[i].group_no = this.inpectionList[i].project_id.toString()+"_"+this.inpectionList[i].inspect_date.toString()
+           }
+        }
+
+
+        if(this.inpectionList!=null && this.inpectionList.length>0){
+          let dataInfo = {}
+          this.inpectionList.forEach((item, index) => {
+          let { group_no } = item
+          if (!dataInfo[group_no]) {
+            dataInfo[group_no] = {
+              group_no:group_no,
+              project_id:item.project_id,
+              name:item.project_name,
+              date:this.getTime(item.inspect_date),
+              child:[],
+              left: [],
+              right:[]
+            }
+          }
+        })
+        let arr = Object.values(dataInfo)
+        console.log("arr----------------------",arr)
+
+        if(arr!=null && arr.length>0){
+          for(let i=0;i<arr.length;i++){
+            for(let j=0;j<this.inpectionList.length;j++){
+              if(arr[i].group_no == this.inpectionList[j].group_no){
+                  arr[i].child.push(this.inpectionList[j])
+              }
+            }
+          }
+        }
+          
+        for(let i=0;i<arr.length;i++){
+          for(let j=0;j<arr[i].child.length;j++){
+             if(j%2 ==0){
+               arr[i].left.push(arr[i].child[j])
+             }
+             if(j%2 == 1){
+              arr[i].right.push(arr[i].child[j])
+             }
+          }
+        }
+
+        this.Inspect = []
+        this.Inspect = arr
+        console.log("newarr----------------",arr)
+       }
+        
+        this.$nextTick(()=>{
+          const iframeDoc = document.getElementsByClassName('edui-editor-iframeholder')[0].getElementsByTagName('iframe')[0].contentDocument.getElementsByTagName('tbody')[0].children[9].children[1]
         
-        // this.$nextTick(()=>{
-        //   const iframeDoc = document.getElementsByClassName('edui-editor-iframeholder')[0].getElementsByTagName('iframe')[0].contentDocument.getElementsByTagName('tbody')[0].children[9].children[1]
-        //   var newListArr =[]
-        //   for(let j in this.tab){
-        //     const obj={
-        //       id:this.tab[j].id,
-        //       newlist:'newList'+j
-        //     }
-        //     newListArr.push(obj) 
-        //   }
-        //   for(let i in this.tab){
-        //     for(let j in newListArr){
-        //       if(this.tab[i].id==newListArr[j].id){
-        //         let newList = document.createElement('p');
-        //         newList.style.cssText='display: flex;text-align: center;border-bottom: 1px solid black;';
-        //         let newListItem1 = document.createElement('span');
-        //         newListItem1.style.cssText= 'width: 30%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
-        //         let newListItem2 = document.createElement('span');
-        //         newListItem2.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
-        //         let newListItem3 = document.createElement('span');
-        //         newListItem3.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
-        //         let newListItem4 = document.createElement('span');
-        //         newListItem4.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
-        //         let newListItem5 = document.createElement('span');
-        //         newListItem5.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
-        //         let newListItem6 = document.createElement('span');
-        //         newListItem6.style.cssText= 'width: 10%;display: inline-block;padding: 5px 0;'
-        //         newListItem1.textContent = this.tab[i].name;
-        //         newListItem2.textContent = this.tab[i].type;
-        //         newListItem3.textContent = this.tab[i].start;
-        //         newListItem4.textContent = this.tab[i].dosage;
-        //         newListItem5.textContent = this.tab[i].pinlv;
-        //         newListItem6.textContent = this.tab[i].status;
-        //         newList.appendChild(newListItem1);
-        //         newList.appendChild(newListItem2);
-        //         newList.appendChild(newListItem3);
-        //         newList.appendChild(newListItem4);
-        //         newList.appendChild(newListItem5);
-        //         newList.appendChild(newListItem6);
-        //         iframeDoc.appendChild(newList)
-        //       }
-        //     }
-        //   }
-        // })
+          const jiancDoc = document.getElementById('editer').getElementsByTagName('tbody')[0].children[8].children[1]
+
+            if(this.Inspect.length<1){
+              let newList = document.createElement('p');
+              newList.style.cssText = 'padding: 5px;'
+              newList.textContent = '无';
+              jiancDoc.appendChild(newList)
+            }else{
+              let newList = document.createElement('p');
+                  newList.style.cssText='display: flex;text-align: center;border-bottom: 1px solid black;';
+                  let newListItem1 = document.createElement('span');
+                  newListItem1.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
+                  let newListItem2 = document.createElement('span');
+                  newListItem2.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
+                  let newListItem3 = document.createElement('span');
+                  newListItem3.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
+                  let newListItem4 = document.createElement('span');
+                  newListItem4.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
+                  let newListItem5 = document.createElement('span');
+                  newListItem5.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
+                  let newListItem6 = document.createElement('span');
+                  newListItem6.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;'
+                  newListItem1.textContent = '检验项目';
+                  newListItem2.textContent = '检验时间';
+                  newListItem3.textContent = '检验内容';
+                  newListItem4.textContent = '结果';
+                  newListItem5.textContent = '检验内容';
+                  newListItem6.textContent = '结果';
+                  newList.appendChild(newListItem1);
+                  newList.appendChild(newListItem2);
+                  newList.appendChild(newListItem3);
+                  newList.appendChild(newListItem4);
+                  newList.appendChild(newListItem5);
+                  newList.appendChild(newListItem6);
+                  jiancDoc.appendChild(newList)
+              for(let i in this.Inspect){
+                let newList1 = document.createElement('p');
+                const child1 = document.createElement('p')
+                const child2 = document.createElement('p')
+                const child3 = document.createElement('p')
+                newList1.appendChild(child1);
+                newList1.appendChild(child2);
+                newList1.appendChild(child3);
+                newList1.style.cssText='display: flex;text-align: center;border-bottom: 1px solid black;';
+                child1.style.cssText= 'width: 40%;display: inline-block;border-right: 1px solid black;display: flex;'
+                child2.style.cssText= 'width: 40%;display: inline-block;border-right: 1px solid black;display: flex;flex-wrap: wrap;'
+                child3.style.cssText= 'width: 40%;display: inline-block;display: flex;flex-wrap: wrap;'
+
+                let newListItem1 = document.createElement('span');
+                newListItem1.style.cssText= 'flex:1;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
+                let newListItem2 = document.createElement('span');
+                newListItem2.style.cssText= 'flex:1;display: inline-block;padding: 5px 0;'
+                newListItem1.textContent = this.Inspect[i].name;
+                newListItem2.textContent = this.Inspect[i].date;
+                child1.appendChild(newListItem1);
+                child1.appendChild(newListItem2);
+                for(let j in this.Inspect[i].left){
+                  let newListItem3 = document.createElement('span');
+                  newListItem3.style.cssText= 'border-bottom: 1px solid black;width:50%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
+                  let newListItem4 = document.createElement('span');
+                  newListItem4.style.cssText= 'border-bottom: 1px solid black;width:50%;display: inline-block;padding: 5px 0;'
+                  newListItem3.textContent = this.Inspect[i].left[j].item_name;
+                  newListItem4.textContent = this.Inspect[i].left[j].inspect_value;
+                  child2.appendChild(newListItem3);
+                  child2.appendChild(newListItem4);
+                }
+                for(let x in this.Inspect[i].right){
+                  let newListItem5 = document.createElement('span');
+                  newListItem5.style.cssText= 'width: 50%;display: inline-block;padding: 5px 0;border-right: 1px solid black;border-bottom: 1px solid black;'
+                  let newListItem6 = document.createElement('span');
+                  newListItem6.style.cssText= 'width: 50%;display: inline-block;padding: 5px 0;border-bottom: 1px solid black;'
+                  newListItem5.textContent = this.Inspect[i].right[x].item_name;
+                  newListItem6.textContent = this.Inspect[i].right[x].inspect_value;
+                  child3.appendChild(newListItem5);
+                  child3.appendChild(newListItem6);
+                }
+                jiancDoc.appendChild(newList1)
+              }
+            }
+
+          
+          var newListArr =[]
+          for(let j in this.longAdvice){
+            const obj={
+              id:this.longAdvice[j].id,
+              newlist:'newList'+j
+            }
+            newListArr.push(obj) 
+          }
+          for(let i in this.longAdvice){
+            for(let j in newListArr){
+              if(this.longAdvice[i].id==newListArr[j].id){
+                let newList = document.createElement('p');
+                newList.style.cssText='display: flex;text-align: center;border-bottom: 1px solid black;';
+                let newListItem1 = document.createElement('span');
+                newListItem1.style.cssText= 'width: 30%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
+                let newListItem2 = document.createElement('span');
+                newListItem2.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
+                let newListItem3 = document.createElement('span');
+                newListItem3.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
+                let newListItem4 = document.createElement('span');
+                newListItem4.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
+                let newListItem5 = document.createElement('span');
+                newListItem5.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
+                let newListItem6 = document.createElement('span');
+                newListItem6.style.cssText= 'width: 10%;display: inline-block;padding: 5px 0;'
+                newListItem1.textContent = this.longAdvice[i].advice_name;
+                newListItem2.textContent = this.longAdvice[i].advice_type_name;
+                newListItem3.textContent = this.getTime(this.longAdvice[i].start_time)
+                newListItem4.textContent = this.longAdvice[i].single_dose +this.longAdvice[i].single_dose_unit ;
+                newListItem5.textContent = this.longAdvice[i].execution_frequency;
+                newListItem6.textContent = this.longAdvice[i].stop_state_name;
+                newList.appendChild(newListItem1);
+                newList.appendChild(newListItem2);
+                newList.appendChild(newListItem3);
+                newList.appendChild(newListItem4);
+                newList.appendChild(newListItem5);
+                newList.appendChild(newListItem6);
+                iframeDoc.appendChild(newList)
+              }
+            }
+          }
+        })
+
+
          this.AuToShow = true
 
       //  this.getAutoPatientContent()
@@ -882,8 +1036,13 @@
 
          this.min_monitor_diastolic_blood_pressure = response.data.data.min_monitor_diastolic_blood_pressure
 
+         
          this.lastDryWeight = response.data.data.lastDryWeight 
 
+         this.patientVascularAccess = response.data.data.patientVascularAccess
+
+         this.lastBefor = response.data.data.lastBefor
+
          this.auto_dialog  =  true
 
             

src/xt_pages/user/text_content.vue

@@ -91,6 +91,12 @@ export default{
     },
     lastDryWeight:{
       type:Object
+    },
+    patientVascularAccess:{
+      type:Object
+    },
+    lastBefor:{
+      type:Object
     }
     
    },
@@ -104,7 +110,7 @@ export default{
       // ],
       Inspect:[{id:1,name:'血常规',date:'2024-12-09',left:[{c_id:1,c_name:'血红蛋白',c_value:110},{c_id:2,c_name:'血红蛋白2',c_value:110}],
             right:[{c_id:1,c_name:'白细胞1',c_value:110},{c_id:2,c_name:'白细胞3',c_value:110}]},
-            {id:2,name:'血常规',date:'2024-12-09',left:[{c_id:1,c_name:'血红蛋白',c_value:110},{c_id:2,c_name:'血红蛋白2',c_value:110}],
+            {id:2,name:'血常规',date:'2024-12-19',left:[{c_id:1,c_name:'血红蛋白',c_value:110},{c_id:2,c_name:'血红蛋白2',c_value:110}],
             right:[{c_id:1,c_name:'白细胞1',c_value:110},{c_id:2,c_name:'白细胞3',c_value:110}]}
       ],
        text:'',
@@ -768,11 +774,80 @@ export default{
         //干体重
         if(this.dryweightList!=null && this.dryweightList.length>0){
            for(let i=0;i<this.dryweightList.length;i++){
-            dry_weight_str =  this.getTimeOne(this.dryweightList[i].ctime) + this.dryweightList[i].adjusted_value
+            dry_weight_str =  this.getTimeOne(this.dryweightList[i].ctime)+" " +this.dryweightList[i].adjusted_value.slice(4,6)+ this.dryweightList[i].adjusted_value.slice(0,3)+"kg" + "调整到" +" "+ this.dryweightList[i].dry_weight+"kg"+","
            }
         } 
 
-     
+        //血管通路
+        var vascularAccess_str = ""
+        var created_time = ""
+      
+        if(this.patientVascularAccess!=undefined){
+          vascularAccess_str  = this.patientVascularAccess.blood_access_part_id + this.patientVascularAccess.blood_access_part_opera_id
+          created_time  = this.getTime(this.patientVascularAccess.first_start_time)
+        }
+
+        //并发症
+        var complication = ""
+        if(this.lastBefor!=undefined){
+            complication = this.lastBefor.complication
+        }
+        
+        if(this.inpectionList!=null&& this.inpectionList.length>0){
+           for(let i=0;i<this.inpectionList.length;i++){
+            this.inpectionList[i].group_no = ""
+             this.inpectionList[i].group_no = this.inpectionList[i].project_id.toString()+"_"+this.inpectionList[i].inspect_date.toString()
+           }
+        }
+        console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",this.inpectionList)
+
+        if(this.inpectionList!=null && this.inpectionList.length>0){
+          let dataInfo = {}
+          this.inpectionList.forEach((item, index) => {
+          let { group_no } = item
+          if (!dataInfo[group_no]) {
+            dataInfo[group_no] = {
+              group_no:group_no,
+              project_id:item.project_id,
+              name:item.project_name,
+              date:this.getTime(item.inspect_date),
+              child:[],
+              left: [],
+              right:[]
+            }
+          }
+        })
+        let arr = Object.values(dataInfo)
+        console.log("arr----------------------",arr)
+
+        if(arr!=null && arr.length>0){
+          for(let i=0;i<arr.length;i++){
+            for(let j=0;j<this.inpectionList.length;j++){
+              if(arr[i].group_no == this.inpectionList[j].group_no){
+                  arr[i].child.push(this.inpectionList[j])
+              }
+            }
+          }
+        }
+          
+        for(let i=0;i<arr.length;i++){
+          for(let j=0;j<arr[i].child.length;j++){
+             if(j%2 ==0){
+               arr[i].left.push(arr[i].child[j])
+             }
+             if(j%2 == 1){
+              arr[i].right.push(arr[i].child[j])
+             }
+          }
+        }
+
+        this.Inspect = []
+        this.Inspect = arr
+        console.log("newarr----------------",arr)
+       }
+       
+
+
        const contents = `<table border="1" class="table" style="border-collapse: collapse;width: 100%;">
               <tr>
                 <th colspan="2" style="padding: 5px;">透析阶段小结(${this.start_date}~${this.end_date})</th>
@@ -824,7 +899,7 @@ export default{
                     <span style='font-weight: bold;'>当前干体重：</span>&nbsp;<span class="">${this.lastDryWeight.dry_weight}kg;</span>
                   </p>
                   <p>
-                    <span style='font-weight: bold;'>调整记录：</span>&nbsp;<span class="">无</span>
+                    <span style='font-weight: bold;'>调整记录：</span>&nbsp;<span class="">${dry_weight_str}</span>
                   </p>
                 </td>
               </tr>
@@ -832,7 +907,7 @@ export default{
                 <td style="align-items: center;padding: 5px;">血管通路</td>
                 <td style='padding: 5px;'>
                   <p>
-                    <span style='font-weight: bold;'>使用的血管通路：</span>&nbsp;<span class="">${ this.ceshi } &nbsp;&nbsp;建立时间：${ this.ceshi }</span>
+                    <span style='font-weight: bold;'>使用的血管通路：</span>&nbsp;<span class="">${vascularAccess_str } &nbsp;&nbsp;建立时间：${ created_time }</span>
                   </p>   
                 </td>
               </tr>
@@ -843,18 +918,18 @@ export default{
                     <span style='font-weight: bold;'>合并症：</span>&nbsp;<span class="">无</span>
                   </p>
                   <p>
-                    <span style='font-weight: bold;'>透析并发症：</span>&nbsp;<span class="">无</span>
+                    <span style='font-weight: bold;'>透析并发症：</span>&nbsp;<span class="">${complication}</span>
                   </p>
                 </td>
               </tr>
               <tr>
-                <td style="align-items: center;padding: 5px;">检验结果</td>
+                <td style="align-items: center;padding: 5px;">检查结果</td>
                 <td style='padding: 5px;'>
                   <span class="">无</span>
                 </td>
               </tr>
               <tr>
-                <td style="align-items: center;padding: 5px;">检查结果</td>
+                <td style="align-items: center;padding: 5px;">检验结果</td>
                 <td>
                   
                 </td>
@@ -952,8 +1027,8 @@ export default{
             newListItem3.style.cssText= 'border-bottom: 1px solid black;width:50%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
             let newListItem4 = document.createElement('span');
             newListItem4.style.cssText= 'border-bottom: 1px solid black;width:50%;display: inline-block;padding: 5px 0;'
-            newListItem3.textContent = this.Inspect[i].left[j].c_name;
-            newListItem4.textContent = this.Inspect[i].left[j].c_value;
+            newListItem3.textContent = this.Inspect[i].left[j].item_name;
+            newListItem4.textContent = this.Inspect[i].left[j].inspect_value;
             child2.appendChild(newListItem3);
             child2.appendChild(newListItem4);
           }
@@ -962,8 +1037,8 @@ export default{
             newListItem5.style.cssText= 'width: 50%;display: inline-block;padding: 5px 0;border-right: 1px solid black;border-bottom: 1px solid black;'
             let newListItem6 = document.createElement('span');
             newListItem6.style.cssText= 'width: 50%;display: inline-block;padding: 5px 0;border-bottom: 1px solid black;'
-            newListItem5.textContent = this.Inspect[i].right[x].c_name;
-            newListItem6.textContent = this.Inspect[i].right[x].c_value;
+            newListItem5.textContent = this.Inspect[i].right[x].item_name;
+            newListItem6.textContent = this.Inspect[i].right[x].inspect_value;
             child3.appendChild(newListItem5);
             child3.appendChild(newListItem6);
           }
@@ -1012,6 +1087,8 @@ export default{
         }
       }
       this.$emit('new_content',this.content)
+
+      
     })
   },
   methods: {
@@ -1019,7 +1096,7 @@ export default{
       return uParseTime(time, '{y}-{m}-{d}')
      },
      getTimeOne (time) {
-      return uParseTime(time, '年-月-日')
+      return uParseTime(time, '{y}-{m}-{d}')
      },
     
      getAnticoagulantName(val){

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
  // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))