新分支

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -934,7 +934,7 @@
                               : "/"
                            }}
                           </span>
-                        
+
 
                           <span v-if="org_id!=10206&&org_id!=10510">
                             {{
@@ -1565,7 +1565,7 @@
                         </div>
                       </div>
 
-                    
+
                       <div  class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                        <div class="inline_block">
                         上机时间：
@@ -1712,7 +1712,9 @@
                               org_id != 9675 &&
                               org_id!=10490  &&
                               org_id!=10600 &&
-                              org_id!=10644
+                              org_id!=10644 &&
+                              org_id!=0&&
+                              org_id!=10567
                             "
                           >
                             电导度<br />(ms/cm)
@@ -1728,7 +1730,7 @@
                           <td
                             width="50"
                             v-if="
-                              org_id ==  10469
+                              org_id ==  10469 || org_id == 0 || org_id ==10567
                             "
                           >
                             钠浓度<br />(mmol/L)
@@ -1747,7 +1749,7 @@
                             <span v-if="org_id!=10471"> (ml)</span>
                             <span v-if="org_id==10471">L</span>
                           </td>
-                          <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0">超滤率<br />(ml/h)</td>
+                          <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0 || org_id == 10567">超滤率<br />(ml/h)</td>
                           <td width="50" v-if="org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
                           <td
                             v-if="
@@ -1757,8 +1759,8 @@
                             "
                             width="50"
                           >
-                          <span v-if="org_id!=0&&org_id!=10683">置换量</span> 
-                          <span v-if="org_id ==0||org_id==10683">置换液速度</span> 
+                          <span v-if="org_id!=0&&org_id!=10683">置换量</span>
+                          <span v-if="org_id ==0||org_id==10683">置换液速度</span>
                             <br />
                             <span v-if="org_id!=10598 && org_id!=10567">
                               <span v-if="org_id!=0&&org_id!=10683">(ml)</span>
@@ -1778,7 +1780,8 @@
                               org_id ==10629 ||
                               org_id == 10510 ||
                               org_id == 0 ||
-                              org_id == 10598
+                              org_id == 10598 ||
+                              org_id == 10567
 
                             "
                           >
@@ -1833,7 +1836,7 @@
                                 : ""
                             }}
                           </td>
-                          
+
                           <td>
                             {{
                               monitor_record.pulse_frequency
@@ -1856,7 +1859,7 @@
                                 : ""
                             }}
                           </td>
-                         
+
                           <td v-if="org_id == 10478 || org_id ==10510">
                             {{
                               monitor_record.arterial_pressure
@@ -1882,7 +1885,7 @@
                             </span>
 
                           </td>
-                        
+
                           <td>
                             {{
                               monitor_record.transmembrane_pressure
@@ -1913,8 +1916,11 @@
                               org_id != 9675 &&
                               org_id!=10490 &&
                               org_id!=10600 &&
-                              org_id!=10644 
-                             
+                              org_id!=10644 &&
+                              org_id!=0 &&
+                              org_id!=10567
+
+
                             "
                           >
                             {{
@@ -1938,7 +1944,7 @@
 
                           <td
                             v-if="
-                              org_id == 10469
+                              org_id == 10469 || org_id ==0 || org_id == 10567
                             "
                           >
                             {{
@@ -1971,7 +1977,7 @@
                             {{ monitor_record.replacement_rate?monitor_record.replacement_rate:"0" }}
                           </td>
                           <td width="50" v-if="org_id == 10489 || org_id ==0"><br />
-                                   
+
                                    {{
                                      monitor_record.ultrafiltration_rate
                                        ? monitor_record.ultrafiltration_rate
@@ -1993,11 +1999,11 @@
                                 : ""
                             }}
                             </span>
-                            
+
                           </td>
 
-                          <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0"><br />
-                                   
+                          <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0 || org_id == 10567"><br />
+
                                     {{
                                       monitor_record.ultrafiltration_rate
                                         ? monitor_record.ultrafiltration_rate
@@ -2019,13 +2025,13 @@
                                 ? monitor_record.replacement_total
                                 : ""
                             }}
-                            </span> 
+                            </span>
                             <span v-if="org_id==0||org_id==10683">{{
                               monitor_record.replacement_speed
                                 ? monitor_record.replacement_speed
                                 : ""
                             }}
-                            </span> 
+                            </span>
                           </td>
                           <td v-if="org_id == 3877  || org_id == 10449">
                             {{
@@ -2045,7 +2051,8 @@
                               org_id ==10629 ||
                               org_id ==10510 ||
                               org_id== 0 ||
-                              org_id ==10598
+                              org_id ==10598 ||
+                              org_id == 10567
                             "
                           >
                             {{ monitor_record.ktv }}
@@ -2137,6 +2144,7 @@
                         <td></td>
                         <td></td>
                         <td></td>
+                        <td v-if="org_id == 0"></td>
                         <td  v-if="org_id == 0 || org_id == 10375"> </td>
                         <td v-if="org_id == 9671 || org_id == 9919"></td>
                         <td
@@ -3096,7 +3104,7 @@
                           //    : "/"
                           //     }}
                             </span> -->
-                        
+
 
                         </div>
                         kg
@@ -3419,7 +3427,7 @@
 
 
                     </div>
-                    
+
                   <div
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
@@ -3445,7 +3453,7 @@
                     </div>
                   </div>
 
-                   
+
                   </td>
                 </tr>
                 <tr>
@@ -3789,7 +3797,7 @@
                           class="under_line"
                           style="width: 80px; text-align: center"
                         >
-                          
+
                         </div>
                       </div>
                       <div class="inline_block" style="flex: 1">
@@ -3917,7 +3925,7 @@ export default {
     };
   },
   created() {
-   
+
     var bloodAccessParOpera = getDataConfig(
       "hemodialysis",
       "vascular_access_desc"
@@ -3952,7 +3960,7 @@ export default {
     // }
     console.log(this.bloodAccessParOpera, "this.bloodAccessParOpera");
 
-   
+
 
     this.blood_access_part = getDataConfig("hemodialysis", "vascular_access");
 
@@ -4217,7 +4225,7 @@ export default {
 
 
           if(this.records!=null && this.records.length>0){
-           
+
             for(let i=0;i<this.records.length;i++){
               this.records[i].new_his_advices = []
                 for(let j=0;j<this.records[i].his_advices.length;j++){
@@ -4558,7 +4566,7 @@ export default {
            name = this.bloodAccessParOpera[i].name
         }
       }
-      
+
       return name
       // if (id in this.bloodAccessParOpera) {
 

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -1921,7 +1921,7 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          if(this.org_id ==0 ||this.org_id ==10206){
+          if(this.org_id ==10206){
             this.template_id = 80
             // this.template_id = 81
             console.log("templage-i233232323232322323233232323223",this.template_id)
@@ -1929,7 +1929,7 @@ export default {
             var template = response.data.data.template;
             this.template_id = template.template_id;
           }
-          
+
         }
       });
     },

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -2669,7 +2669,7 @@ export default {
           this.patient_id = response.data.data.patientInfo.DialysisSchedule.patient_id
           this.patient_name = response.data.data.patientInfo.name
 
-          if(this.org_id !=10206&&this.org_id !=0){
+          if(this.org_id !=10206){
             this.org_template_info.template_id= response.data.data.org_template_info.template_id
             this.org_template_info = response.data.data.org_template_info;
           }else{

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -517,7 +517,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 1"
                       >
@@ -528,7 +528,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                        
+
                         "
                         v-if="prescription.mode_id == 2"
                       >
@@ -539,7 +539,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 3"
                       >
@@ -550,7 +550,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 4"
                       >
@@ -561,7 +561,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 5"
                       >
@@ -572,7 +572,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 6"
                       >
@@ -583,7 +583,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 7"
                       >
@@ -594,7 +594,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 8"
                       >
@@ -605,7 +605,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 9"
                       >
@@ -616,7 +616,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 10"
                       >
@@ -627,7 +627,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 11"
                       >
@@ -638,7 +638,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 12"
                       >
@@ -649,7 +649,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 13"
                       >
@@ -660,7 +660,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 14"
                       >
@@ -671,7 +671,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 15"
                       >
@@ -682,7 +682,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 16"
                       >
@@ -693,7 +693,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 17"
                       >
@@ -704,7 +704,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 18"
                       >
@@ -715,7 +715,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 19"
                       >
@@ -726,7 +726,7 @@
                         style="
                           width: 150px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 22"
                       >
@@ -737,7 +737,7 @@
                         style="
                           width: 150px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 23"
                       >
@@ -748,7 +748,7 @@
                         style="
                           width: 150px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 24"
                       >
@@ -758,7 +758,7 @@
                         class="under_line"
                         style="width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 25"
                       >
@@ -769,7 +769,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 29"
                       >
@@ -780,7 +780,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 30"
                       >
@@ -791,7 +791,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 31"
                       >
@@ -802,7 +802,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 32"
                       >
@@ -813,7 +813,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 33"
                       >
@@ -824,7 +824,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 34"
                       >
@@ -835,7 +835,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 35"
                       >
@@ -846,7 +846,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 36"
                       >
@@ -857,7 +857,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 37"
                       >
@@ -868,7 +868,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 38"
                       >
@@ -879,7 +879,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 39"
                       >
@@ -891,7 +891,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 40"
                       >
@@ -903,7 +903,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 41"
                       >
@@ -915,7 +915,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 42"
                       >
@@ -927,7 +927,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 43"
                       >
@@ -1445,8 +1445,8 @@
                       <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
                       <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
-                       <span v-if="org_id!=10644">mg</span> 
-                       <span v-if="org_id==10644">iu</span> 
+                       <span v-if="org_id!=10644">mg</span>
+                       <span v-if="org_id==10644">iu</span>
                       </span>
                       <span v-if="prescription.anticoagulant == 17">U</span>
                     </span>
@@ -1464,8 +1464,8 @@
                      <span v-if="prescription.anticoagulant == 11">iu</span>
                      <span v-if="prescription.anticoagulant == 13">iu</span>
                      <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
-                      <span v-if="org_id!=10644">mg</span> 
-                      <span v-if="org_id==10644">iu</span> 
+                      <span v-if="org_id!=10644">mg</span>
+                      <span v-if="org_id==10644">iu</span>
                      </span>
                      <span v-if="prescription.anticoagulant == 17">U</span>
 
@@ -1510,8 +1510,8 @@
                         <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
                           <span v-if="prescription.anticoagulant == 1">mg/h</span>
                           <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
-                            <span v-if="org_id!=10644">mg/h</span> 
-                            <span v-if="org_id==10644">iu/h</span> 
+                            <span v-if="org_id!=10644">mg/h</span>
+                            <span v-if="org_id==10644">iu/h</span>
                           </span>
                           <span v-if="prescription.anticoagulant == 17">U/h</span>
                       </span>
@@ -1528,8 +1528,8 @@
                           <span v-if="prescription.anticoagulant == 11">iu/h</span>
                           <span v-if="prescription.anticoagulant == 13">iu/h</span>
                           <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
-                            <span v-if="org_id!=10644">mg/h</span> 
-                            <span v-if="org_id==10644">iu/h</span> 
+                            <span v-if="org_id!=10644">mg/h</span>
+                            <span v-if="org_id==10644">iu/h</span>
                           </span>
                           <span v-if="prescription.anticoagulant == 17">U/h</span>
                       </span>
@@ -1601,8 +1601,8 @@
                       <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
                       <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
-                        <span v-if="org_id!=10644">mg</span> 
-                        <span v-if="org_id==10644">iu</span> 
+                        <span v-if="org_id!=10644">mg</span>
+                        <span v-if="org_id==10644">iu</span>
                       </span>
                       <span v-if="prescription.anticoagulant == 17">U</span>
                      </span>
@@ -1619,8 +1619,8 @@
                       <span v-if="prescription.anticoagulant == 11">iu</span>
                       <span v-if="prescription.anticoagulant == 13">iu</span>
                       <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
-                        <span v-if="org_id!=10644">mg</span> 
-                        <span v-if="org_id==10644">iu</span> 
+                        <span v-if="org_id!=10644">mg</span>
+                        <span v-if="org_id==10644">iu</span>
                       </span>
                       <span v-if="prescription.anticoagulant == 17">U</span>
                     </span>
@@ -1839,8 +1839,8 @@
                         <td width="60" v-if="org_id == 9671">血温(°C)</td>
                         <td width="60" v-if="org_id!=9836&&org_id!=9919&&org_id!=9671 && org_id!=10644">透析液温度(°C)</td>
                         <td width="50" v-if="org_id != 10121 &&  org_id!=10600 && org_id!=10644">
-                          <span v-if="org_id !=10469 && org_id!=10490 "> 电导度<br />(ms/cm)</span>
-                          <span v-if="org_id ==10469"> 钠浓度<br />(mmol/L)</span>
+                          <span v-if="org_id !=10469 && org_id!=10490 && org_id!=10567 && org_id!=0 "> 电导度<br />(ms/cm)</span>
+                          <span v-if="org_id ==10469 || org_id == 0"> 钠浓度<br />(mmol/L)</span>
                           <span v-if="org_id == 10490"> 置换液的速度<br />(ml/h)</span>
                         </td>
                         <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</td>
@@ -1851,7 +1851,7 @@
                          <span v-if="org_id == 10471">L</span>
                          <span v-if="org_id != 10471"> (ml)</span>
                         </td>
-                        <td width="50" v-if="org_id == 10600 || org_id ==10598 || org_id ==10683">超滤率<br/>(ml/h)</td>
+                        <td width="50" v-if="org_id == 10600 || org_id ==10598 || org_id ==10683 || org_id ==10567 || org_id == 0">超滤率<br/>(ml/h)</td>
                         <td width="50" v-if="org_id ==3877 || org_id == 10449 ">累计超滤量<br />(ml)</td>
                         <td v-if="(prescription.mode_id == 2 ||prescription.mode_id == 5 ||prescription.mode_id == 12) &&org_id!=10478 && org_id!=0 && org_id!=10206" width="50">
                           <span v-if="org_id == 10683">置换液速度</span>
@@ -1864,7 +1864,7 @@
                           <span v-if="org_id==10598 || org_id == 10567">(L)</span>
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 10449">滤前压(mmHg)</td>
-                        <td width="50" v-if="org_id == 9538 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id == 10580 || org_id == 10598">KT/V</td>
+                        <td width="50" v-if="org_id == 9538 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id == 10580 || org_id == 10598 || org_id == 10567 || org_id == 0">KT/V</td>
                         <td width="50" v-if="org_id == 9919">在线尿素监测</td>
                         <td width="50" v-if="org_id == 9671">在线尿素监测</td>
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id== 9671">血容量<br />(L)</td>
@@ -1962,8 +1962,8 @@
 
 
                         <td v-if="org_id != 9538 &&org_id != 10121 &&org_id!=10600 && org_id!=10644">
-                          <span v-if="org_id!=0&&org_id!=10469 && org_id!=10490"> {{ monitor.conductivity ? monitor.conductivity : "" }}</span>
-                          <span v-if="org_id==10469"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</span>
+                          <span v-if="org_id!=0&&org_id!=10469 && org_id!=10490 && org_id!=10567"> {{ monitor.conductivity ? monitor.conductivity : "" }}</span>
+                          <span v-if="org_id==10469 || org_id == 10567 || org_id == 0"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</span>
                           <span v-if="org_id==10490"> {{ monitor.replacement_speed ? monitor.replacement_speed : "" }}</span>
                         </td>
 
@@ -1983,7 +1983,7 @@
                               <span v-if="org_id !=10617">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
                            </span>
                         </td>
-                        <td width="50" v-if="org_id == 10600 || org_id == 10598 || org_id==10644 || org_id == 10683 "><br/>
+                        <td width="50" v-if="org_id == 10600 || org_id == 10598 || org_id==10644 || org_id == 10683 || org_id ==10567 || org_id == 0"><br/>
                            <span v-if="org_id!=10644 && org_id!=0">{{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: ""}}</span>
                            <span v-if="org_id==10644 ">
                               <span v-if="monindex == 0">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
@@ -2018,7 +2018,7 @@
                           </span>
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 10449">{{ monitor.filter_pressure?monitor.filter_pressure:""}}</td>
-                        <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id ==10580 || org_id ==10598">
+                        <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id ==10580 || org_id ==10598 || org_id == 10567 || org_id == 0">
                           {{ monitor.ktv?monitor.ktv:"" }}
                         </td>
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id == 9671">
@@ -2059,7 +2059,7 @@
                         <td v-if="org_id == 0||org_id == 9829">
                           {{monitor.blood_oxygen_saturation? monitor.blood_oxygen_saturation: ""}}
                         </td>
-                       
+
                         <td style="line-height: 16px; padding: 0px">
                           <div
                             style="
@@ -2255,7 +2255,7 @@
                           </span>
 
                         </td>
-                     
+
                         <td height="32px">
                           <span v-if="advice!=null && advice.execution_staff>0">
                             <span
@@ -2290,7 +2290,7 @@
                               getTime(advice.execution_time, "{h}:{i}")
                              }}</span>
                           </span>
-                         
+
                         </td>
                         <td height="32px">
                           <span v-if="org_id!=10489">
@@ -2310,7 +2310,7 @@
                               />
                             </span>
                           </span>
-                         
+
                         </td>
                         <td height="32px" v-if="org_id == 10223 || org_id == 9538  ||
                             org_id ==10375 || org_id ==10571 || org_id ==10600">
@@ -2387,7 +2387,7 @@
                         />
                       </td>
                         <td height="32px">
-                          
+
                           <span v-if="advice.execution_time">{{
                             getTime(advice.execution_time, "{h}:{i}")
                           }}</span>
@@ -5409,11 +5409,11 @@ export default {
         }
 
         this.jilurow = this.monitors.length + 1;
-        
+
         if(this.advices!=null && this.advices.length>0){
           this.advice_jilurow = this.advices.length + 1;
         }
-       
+
 
         var childMap = {};
         for (const index in this.advices) {
@@ -5525,7 +5525,7 @@ export default {
             }
          }
 
-      
+
 
          let projects = [];
         response.data.data.projects.map((item) => {
@@ -5551,7 +5551,7 @@ export default {
                 this.projects[i].project_team_id = 0
 
                 if(this.projects[i].team!= "undefined" && this.projects[i].team.id >0){
-                 
+
                   this.projects[i].project_team = this.projects[i].team.project_team
                   this.projects[i].project_team_id = this.projects[i].team.id
                   this.projects[i].start_time = this.projects[i].start_time
@@ -5562,7 +5562,7 @@ export default {
                   this.projects[i].advice_name =  this.projects[i].team.project_team
                   this.projects[i].advice_doctor = this.projects[i].doctor
 
-             
+
                   newHisArr.push(this.projects[i])
                   // this.doctor_advices_2.push(this.project[i])
                 }else{
@@ -5580,14 +5580,14 @@ export default {
                   // this.doctor_advices_2.push(this.projects[i])
                 }
 
-                
+
 
               }
 
             }
             }
 
-          
+
 
             for(let i=0;i<newHisArr.length;i++){
               newHisArr[i].advice_name_str = ""
@@ -5603,7 +5603,7 @@ export default {
 
         }
 
-       
+
 
         //针对内蒙古阿拉善
         if(this.org_id ==10206){
@@ -5706,7 +5706,7 @@ export default {
         this.totollength = this.doctor_advices.length + this.monitors.length;
         console.log("this.totollength",this.totollength)
 
-        
+
         if (this.totollength > 18) {
           var temp_advice_length = this.doctor_advices.length
           var doctor_advices_1 = [];

src/xt_pages/user/components/PatientDetail.vue

@@ -286,7 +286,7 @@
                 <el-input v-model="form.homeAddress" disabled style="width: 350px;"></el-input>
               </el-form-item>
             </el-col>
-            
+
              <el-col :span="8" :style="isEdit ? 'width:280px' : ''">
                 <el-form-item
                   label="打印日期:"
@@ -639,7 +639,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-           
+
 
             <div v-show="!generic_info_fold">
               <el-col :span="8">
@@ -1209,12 +1209,12 @@
                   <td colspan="8">
                     <div
                       class="td_proj_content td_align_left"
-                     
+
                     >  {{ patientPrint.remark }}</div>
                   </td>
                 </tr>
 
-              
+
 
                 <tr>
                   <td>
@@ -1235,7 +1235,7 @@
                   <td colspan="7">
                     <div
                       class="td_proj_content td_align_left"
-                     
+
                     >
                      {{ patientPrint.treatment_plan }}
                    </div>
@@ -1251,8 +1251,8 @@
                 {{getTime(patientPrint.created_time)}}</span>
                 <span v-else>{{ printDate }}</span> -->
 
-                <span v-if="patientPrint.print_date>0">{{getTime(patientPrint.print_date)}}</span> 
-                <span v-if="patientPrint.print_date<=0">{{getTime(patientPrint.created_time)}}</span> 
+                <span v-if="patientPrint.print_date>0">{{getTime(patientPrint.print_date)}}</span>
+                <span v-if="patientPrint.print_date<=0">{{getTime(patientPrint.created_time)}}</span>
 
               </div>
               <div class="proj">
@@ -1356,10 +1356,10 @@
                     血管通路
                   </td>
                   <td colspan="3" style="padding: 3px 0px;font-size: 17px;">
-                    
+                     {{ patientVascularAccessOne.blood_access_part_id }} {{ patientVascularAccessOne.blood_access_part_opera_id }}
                   </td>
                 </tr>
-                
+
                 <tr>
                   <td style="padding: 3px 0px;font-size: 17px; font-weight: 500;">
                     主诉
@@ -1404,7 +1404,7 @@
                   </td>
                   <td colspan="3">
                     <div class="td_proj_content td_align_left">
-                     
+
                     </div>
                   </td>
                 </tr>
@@ -1444,7 +1444,7 @@
                   <td colspan="9">
                     <div
                       class="td_proj_content td_align_left"
-                      
+
                     ></div>
                   </td>
                 </tr>
@@ -1469,7 +1469,7 @@
                       v-html="patientPrint.treatment_plan"
                     ></div>
                   </td>
-                </tr>  
+                </tr>
               </tbody>
             </table>
             <div class="print_footnote_panel">
@@ -1483,8 +1483,8 @@
               </div>
               <div class="proj" style="text-align: right;">
                 <span class="proj_title">日期：</span>
-                <span v-if="patientPrint.print_date>0">{{getTime(patientPrint.print_date)}}</span> 
-                <span v-if="patientPrint.print_date<=0">{{getTime(patientPrint.created_time)}}</span> 
+                <span v-if="patientPrint.print_date>0">{{getTime(patientPrint.print_date)}}</span>
+                <span v-if="patientPrint.print_date<=0">{{getTime(patientPrint.created_time)}}</span>
               </div>
             </div>
           </div>
@@ -1729,6 +1729,7 @@ export default {
       ],
       operators:[],
       liuAddresslist:[],
+      patientVascularAccessOne:{},
     };
   },
   computed: {
@@ -1823,6 +1824,7 @@ export default {
           if (response.data.state === 1) {
             this.$emit("tran-patient-info", response.data.data.patient);
             var patietInfo = response.data.data.patient;
+            this.patientVascularAccessOne = response.data.data.patientVascularAccessOne
             console.log("触发了吗无222222", patietInfo);
             this.form.avatar = patietInfo.avatar;
             this.form.name = patietInfo.name;
@@ -2109,8 +2111,8 @@ export default {
               /\n/g,
               "<br/>"
             );
-            
-            
+
+
 
             this.patientPrint.sch_remark = patietInfo.sch_remark.replace(
               /\n/g,