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

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -800,7 +800,8 @@
                           class="under_line"
                           style="width: 100px; text-align: center"
                         >
-                          {{
+                         <span v-if="org_id!=10677">
+                         {{
                             record.prescription &&
                             record.prescription.dialyzer_perfusion_apparatus
                               ? record.prescription.dialyzer_perfusion_apparatus
@@ -812,6 +813,7 @@
                               ? record.prescription.dialysis_dialyszers
                               : "/"
                           }}
+                          </span>
                           {{record.dialysis_order.dialysis_dialyszers}}
                         </div>
                       </div>
@@ -821,12 +823,14 @@
                           class="under_line"
                           style="width: 70px; text-align: center"
                         >
+                         <span v-if="org_id!=10677">
                           {{
                             record.prescription &&
                             record.prescription.dialysis_irrigation
                               ? record.prescription.dialysis_irrigation
                               : "/"
                           }}
+                          </span>
                           {{record.dialysis_order.dialysis_irrigation}}
                         </div>
                       </div>
@@ -850,7 +854,7 @@
                     </div>
 
                     <div
-                    
+
                       class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
@@ -881,7 +885,7 @@
                           <span>{{
                             record.lastafterweight.weight_after
                           }}</span>
-                       
+
                         </div>
                         kg
                       </div>
@@ -918,7 +922,7 @@
                               : "/"
                           }}
                         </div>
-                         <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id==10460">ml</span> 
+                         <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id==10460">ml</span>
                          <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469  && org_id!=10471 && org_id!=10460">L</span>
                       </div>
 
@@ -1186,7 +1190,7 @@
                           >mg</span
                         >
                       </div>
-                      
+
                       <div class="inline_block" style="margin-left: 20px">
                         透析机号：
                         <div
@@ -1211,7 +1215,7 @@
                         >
                           {{
                              record.assessment_before_dislysis.machine_type ?
-                              record.assessment_before_dislysis.machine_type : '' 
+                              record.assessment_before_dislysis.machine_type : ''
                           }}
                         </div>
                       </div>
@@ -1243,7 +1247,7 @@
                         </div>
                         h
                       </div>
-                      
+
                       <span>&nbsp;&nbsp;&nbsp;</span>
                     </div>
 
@@ -1313,7 +1317,7 @@
                           <td
                             width="50"
                             v-if="
-                              org_id == 10121 || org_id == 9675 
+                              org_id == 10121 || org_id == 9675
                             "
                           >
                             SpO₂<br />(%)
@@ -1458,14 +1462,14 @@
                             }}
                           </td>
 
-                      
+
                           <td
                             v-if="
                               org_id != 9538 &&
                               org_id != 10121 &&
-                              org_id != 9675 && 
+                              org_id != 9675 &&
                               org_id!=10490
-                             
+
                             "
                           >
                             {{
@@ -1477,7 +1481,7 @@
 
                           <td
                             v-if="
-                              org_id == 10121 || org_id == 9675 
+                              org_id == 10121 || org_id == 9675
                             "
                           >
                             {{
@@ -1489,7 +1493,7 @@
 
                           <td
                             v-if="
-                              org_id == 10469 
+                              org_id == 10469
                             "
                           >
                             {{
@@ -1661,7 +1665,7 @@
                         <td v-if="org_id == 9919||org_id == 9538 || org_id == 9671"></td>
                         <td v-if="org_id == 9538"></td>
                         <td v-if="org_id == 10490 || org_id == 0"></td>
-                         
+
                           <td style="line-height: 16px; padding: 0px">
                             <div
                               style="
@@ -1832,7 +1836,7 @@
                                 style="height: 40px"
                               />
                             </td>
-                            
+
                             <td height="35px" v-if="org_id == 10375">
                               <span
                                 v-if="
@@ -2010,7 +2014,7 @@
                 </div>
               </div>
             </div>
-            
+
             <div class="row">
               <div class="inline_block">
                 入科方式：
@@ -2286,7 +2290,7 @@
                         style="flex: 1"
                         v-if="org_id != 10223 || org_id!=10375"
                       >
-  
+
                         <span v-if="org_id!=10460 && org_id!=10551">
                           透析中入量  (L)：
                         </span>
@@ -2547,10 +2551,10 @@
                         </div>
                       </div>
 
-                  
+
                     </div>
 
-                   
+
                   </td>
                 </tr>
                 <tr>
@@ -3436,7 +3440,7 @@ export default {
     //   }
     // },
     getAge: function(val) {
-     
+
      if (val.id_card_no) {
        var thisLen = val.id_card_no.length
 

src/xt_pages/dialysis/details/NavIgation.vue

@@ -125,6 +125,7 @@
        :prescription="prescription"
        :dryWeightList="dryWeightList"
        :docList="docList"
+       :first_monitor="first_monitor"
     ></assessment-before-dislysis-dialog>
 
     <treatment-summary-dialog
@@ -195,6 +196,7 @@
       :predialysis_evaluation="predialysis_evaluation"
       :dialysis_order="dialysis_order"
       :schedual="temp_schedual"
+      :last_monitor="last_monitor"
     ></assessment-after-dislysis>
   </div>
 </template>
@@ -595,6 +597,18 @@ export default {
       default: () => {
         return { id: 0 };
       }
+    },
+    first_monitor:{
+      type: Object,
+      default: () => {
+        return { id: 0 };
+      }
+    },
+    last_monitor:{
+      type: Object,
+      default: () => {
+        return { id: 0 };
+      }
     }
   },
   methods: {

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

@@ -771,6 +771,12 @@ export default {
     schedual: {
         type: Object
     },
+    last_monitor:{
+      type: Object,
+      default: () => {
+        return { id: 0 };
+      }
+    }
   },
   data() {
     return {
@@ -1423,6 +1429,26 @@ export default {
 
     // 数据开始
     show(predialysis,last_after) {
+      console.log("头号好地方阿道夫地方阿道夫阿道夫",this.last_monitor)
+
+      if(this.$store.getters.xt_user.template_info.org_id == 10679){
+        if(this.form.systolic_blood_pressure == 0){
+           this.form.systolic_blood_pressure = this.last_monitor.systolic_blood_pressure
+        }
+
+        if(this.form.diastolic_blood_pressure == 0){
+          this.form.diastolic_blood_pressure = this.last_monitor.diastolic_blood_pressure
+        }
+
+        if(this.form.breathing_rate == 0){
+          this.form.breathing_rate = this.last_monitor.breathing_rate
+        }
+
+        if(this.form.pulse_frequency == 0){
+          this.form.pulse_frequency = this.last_monitor.pulse_frequency
+        }
+
+      }
       this.isVisibility = true
       this.predialysis = predialysis
       this.form.observation_content = predialysis.observation_content
@@ -1584,7 +1610,7 @@ export default {
   },
   created() {
     // console.log("this.form", this.form.consciousness);
-
+   
     this.org_id = this.$store.getters.xt_user.template_info.org_id
     this.cruorOptions = getDataConfig('hemodialysis', 'cruor')
     this.pip_coagulationOptions = getDataConfig('hemodialysis','pip_coagulation')

src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue

@@ -1061,7 +1061,13 @@
         default:()=>{
           return [];
         }
-       }
+       },
+       first_monitor:{
+        type: Object,
+        default: () => {
+          return { id: 0 };
+        }
+      },
 
     },
     methods: {
@@ -1130,6 +1136,8 @@
            this.record_date = record_date
         }
 
+        console.log("第一条监测数据23333333333333333",this.first_monitor)
+
         if(this.lastPredialysisEvaluation != null) {
         // if(this.lastPredialysisEvaluation.remark == "" && this.$store.getters.xt_user.org.id == 10307){
         //     console.log("2o2o3232o23o2o3o23")
@@ -1900,6 +1908,9 @@
 
       console.log("hhh32h323h23h23h23h23h23h",getDataConfig("befor_symptoms", "befor_symptoms"))
 
+
+     
+
       // this.weight_adjust.weight = this.dry_weight.dry_weight
 
       // if(this.predialysis_evaluation.id == 0){

src/xt_pages/dialysis/details/dialog/computer_dialog.vue

@@ -448,9 +448,9 @@ export default {
         nuclein_date: moment(new Date()).add("year", 0).format("YYYY-MM-DD"),
         catheter_operation:"",
         blood_flow_volume:"" ,
+        schedual_type:0,
       },
       blood_access_option: [],
-      schedual_type: 0,
       schedules_type: [
         { id: 1, name: "上午" },
         { id: 2, name: "下午" },
@@ -544,7 +544,7 @@ export default {
     this.form.blood_access_id = this.dialysis_order.blood_access_id;
     this.form.blood_drawing = this.dialysis_order.blood_drawing
     this.blood_access_option_name = this.changeBloodAccessOpion(this.dialysis_order.blood_access_id)
-    // this.form.schedual_type = this.dialysis_order.schedule_type
+    this.form.schedual_type = this.dialysis_order.schedual_type
     // this.schedual_type = this.dialysis_order.schedule_type
     // console.log("班次",this.form.schedual_type)
     this.punctureNeedleOptions = getDataConfig(
@@ -602,7 +602,7 @@ export default {
       this.form.blood_access_id = this.dialysis_order.blood_access_id;
       this.form.blood_drawing = this.dialysis_order.blood_drawing
       var blood_access_option_name = this.changeBloodAccessOpionOne(this.dialysis_order.blood_access_id)
-      // this.form.schedual_type = this.dialysis_order.schedule_type
+      this.form.schedual_type = this.dialysis_order.schedual_type
       // console.log("8823832323223",this.form.schedual_type)
       this.blood_access_option_name = blood_access_option_name
       this.form.catheter_operation = this.dialysis_order.catheter_operation
@@ -748,7 +748,7 @@ export default {
     },
     GetSchedualNumber: function () {
       let ParamsQuery = {};
-      ParamsQuery["schedual_type"] = this.schedual_type;
+      ParamsQuery["schedual_type"] = this.form.schedual_type;
       ParamsQuery["record_date"] = this.$route.query.date;
       console.log("列表33333333333333333333", ParamsQuery);
       // console.log("路由",this.$route.query.date)
@@ -858,15 +858,15 @@ export default {
         let now = new Date();
         let hour = now.getHours();
         if (hour >= 6 && hour < 12) {
-          this.schedual_type = 1;
+          this.form.schedual_type = 1;
         } else if (hour >= 12 && hour < 18) {
-          this.schedual_type = 2;
+          this.form.schedual_type = 2;
         } else if (hour >= 18) {
-          this.schedual_type = 3;
+          this.form.schedual_type = 3;
         }
       } else {
         this.form.schedual_type = this.dialysis_order.schedual_type;
-        this.schedual_type = this.dialysis_order.schedual_type;
+        // this.schedual_type = this.dialysis_order.schedual_type;
       }
 
       if (this.dialysis_order.id > 0) {
@@ -914,7 +914,7 @@ export default {
             this.form.lood_drawing,
             this.form.puncture_nurse_id,
             this.form.start_time,
-            this.schedual_type,
+            this.form.schedual_type,
             mode,
             this.form.washpipe_nurse,
             this.form.change_nurse,
@@ -962,7 +962,7 @@ export default {
     },
     editOrder() {
       let ParamsQuery = {};
-      ParamsQuery["schedual_type"] = this.schedual_type;
+      ParamsQuery["schedual_type"] = this.form.schedual_type;
       ParamsQuery["id"] = this.dialysis_order.id;
       ParamsQuery["nurse"] = this.form.nurse_id;
       ParamsQuery["bed"] = this.form.bed_id;

src/xt_pages/dialysis/details/index.vue

@@ -1061,6 +1061,8 @@
           :dryWeightList="dryWeightList"
           :docList="docList"
           :lastTreat="lastTreat"
+          :first_monitor="first_monitor"
+          :last_monitor="last_monitor"
         >
         </nav-igation>
 
@@ -1541,9 +1543,11 @@ export default {
       start_time:moment().startOf('months').format('YYYY-MM-DD'),
       end_time:moment().endOf('months').format('YYYY-MM-DD'),
       orderList:[],
-      lastTreat:{id:0}
+      lastTreat:{id:0},
       // start_time2:'',
       // end_time2:'',
+      first_monitor:{},
+      last_monitor:{},
     }
   },
   created() {
@@ -2130,7 +2134,12 @@ export default {
           this.stockType = stockType
 
           this.lastTreat = resp.data.lastAcceptTreatment
-          console.log("上次透后平出-----------",this.lastTreat)
+          console.log("上次透后平出22222222222222222222-----------",resp.data.firstMonitor)
+
+          this.first_monitor = resp.data.firstMonitor
+
+          console.log("上次透后体重-----------",resp.data.firstMonitor)
+          this.last_monitor = resp.data.lastMonitor
 
           this.dryWeightList = resp.data.dryWeightList
           this.docList = resp.data.docList

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1202,8 +1202,8 @@
                             : "/"
                         }}
                       </div>
-                      <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10460">ml</span>
-                      <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460">L</span>
+                      <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10460 || org_id==10644">ml</span>
+                      <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460 && org_id!=10644">L</span>
                     </div>
 
 

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button type="primary" @click="checkData">一键核对</el-button>
-    
+
     <div id="dialysis-print-box-1"  ref="pdfContent">
       <div
         id="dialysis-print-box-1-1"
@@ -379,7 +379,7 @@
                     </div>
                     <div
                       class="inline_block"
-                      style="flex: 1" 
+                      style="flex: 1"
                     >
                       透析机型：
                       <div
@@ -795,7 +795,7 @@
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
-                        {{
+                       <span v-if="org_id!=10677">  {{
                           prescription.dialyzer_perfusion_apparatus
                             ? prescription.dialyzer_perfusion_apparatus
                             : ""
@@ -806,6 +806,7 @@
                             ? prescription.dialysis_dialyszers
                             : ""
                         }}
+                        </span>
 
                         {{dialysisOrder.dialysis_dialyszers  }}
                       </div>
@@ -829,12 +830,15 @@
                         class="under_line"
                         style="width: 70px; text-align: center"
                       >
+                       <span v-if="org_id!=10677">
                         {{
                           prescription.dialysis_irrigation
                             ? prescription.dialysis_irrigation
                             : "/"
                         }}
+                         </span>
                          {{dialysisOrder.dialysis_irrigation  }}
+
                       </div>
                     </div>
 
@@ -1021,7 +1025,7 @@
                         }}
                       </div>
 
-                  
+
 
                     <span>
                       <span v-if="prescription.anticoagulant == 4">iu</span>
@@ -1051,7 +1055,7 @@
                             : "/"
                         }}
                       </div>
-                     
+
                       <span>
                         <span v-if="prescription.anticoagulant == 2">mg/h</span>
                           <span v-if="prescription.anticoagulant == 3">iu/h</span>
@@ -1117,7 +1121,7 @@
                             : "/"
                         }}
                       </div>
-                     
+
                     <span>
                        <span v-if="prescription.anticoagulant == 2">mg</span>
                        <span v-if="prescription.anticoagulant == 3">iu</span>
@@ -1174,11 +1178,11 @@
                         }}
                       </div>
                     </div>
-                  
+
                   </div>
 
                   <div class="row" style="padding: 2px 0; line-height: 23px">
-                   
+
                   </div>
 
                 </td>
@@ -1237,15 +1241,15 @@
                               : "mmHg"
                           }})
                         </td>
-                        
+
                         <td width="60" v-if="org_id == 9836">体温(°C)</td>
                         <td width="60" v-if="org_id == 9919">血温(°C)</td>
                         <td width="60" v-if="org_id == 9671">血温(°C)</td>
                         <td width="60" v-if="org_id!=9836&&org_id!=9919&&org_id!=9671">透析液温度(°C)</td>
                         <td width="50" v-if="org_id != 10121">
-                          <span v-if="org_id != 0 && 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 == 0 || org_id == 10490"> 置换液的速度<br />(ml/h)</span> 
+                          <span v-if="org_id != 0 && 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 == 0 || org_id == 10490"> 置换液的速度<br />(ml/h)</span>
                         </td>
                         <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</td>
                         <td width="50" v-if="org_id == 10375 || org_id == 0">置换率<br />(ml/h)</td>
@@ -1256,8 +1260,8 @@
                         </td> -->
                         <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">滤前压(mmHg)</td>
                         <td width="50" v-if="org_id == 9538">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 == 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>
                         <td width="50" v-if="org_id == 10490 || org_id == 0">碳酸氢钠<br />(ml)</td>
                         <td width="200">病情变化及处理</td>
@@ -1346,7 +1350,7 @@
                           <span v-if="org_id==0||org_id==10490"> {{ monitor.replacement_speed ? monitor.replacement_speed : "/" }}</span>
                         </td>
 
-                      
+
                         <td v-if="org_id == 10375 || org_id == 0"><br />
                           {{ monitor.replacement_rate? monitor.replacement_rate: "/"}}
                         </td>
@@ -1417,7 +1421,7 @@
                                 "
                                 >【开始透析】
                                 </template>
-                              
+
                               {{ monitor.end }} {{ monitor.symptom }} &nbsp;{{
                                 monitor.dispose
                               }}
@@ -1509,7 +1513,7 @@
                         <td style="font-size: 16px" width="10%">医生签名</td>
                         <td style="font-size: 16px" width="10%">时间</td>
                         <td style="font-size: 16px" width="10%">执行人签名</td>
-                       
+
                       </tr>
                       <tr
                         v-for="(advice, advice_index) in doctor_advices"
@@ -1527,7 +1531,7 @@
                           class="advice-name"
                           style="padding-left: 7px"
                         >
-                      
+
                           <span v-if="advice.parent_id > 0"></span>
                           <span>{{ advice.advice_name }}</span>
                           <span v-if="advice && advice.advice_desc"
@@ -1555,7 +1559,7 @@
                             >({{ advice.remark }})</span
                           >
                         </td>
-                      
+
                         <td height="32px">
                           <span
                             v-if="setAdminUserES(advice.advice_doctor) == ''"
@@ -1569,7 +1573,7 @@
                             v-else
                           />
                         </td>
-                       
+
                         <td height="32px">
                           <span v-if="advice.execution_time">{{
                             getTime(advice.execution_time, "{h}:{i}")
@@ -1624,7 +1628,7 @@
               <span v-if="prescription.mode_id!=13">血液净化治疗记录单</span>
               <span v-if="prescription.mode_id==13">连续性肾脏替代治疗（CRRT）记录单</span>
              </span>
-            
+
             </div>
           </div>
           <div class="row">
@@ -1810,7 +1814,7 @@
                     医嘱内容
                   </td>
                 </tr>
-              
+
                 <tr style="line-height: 35px; padding: 8px 5px">
                   <td style="font-size: 15px" width="10%">时间</td>
                   <td style="font-size: 15px" colspan="2" width="45%">
@@ -1819,9 +1823,9 @@
                   <td style="font-size: 15px" width="10%">医生签名</td>
                   <td style="font-size: 15px" width="10%">时间</td>
                   <td style="font-size: 15px" width="10%">执行人签名</td>
-                 
+
                 </tr>
-               
+
                 <tr
                   v-for="(advice, advice_index) in doctor_advices"
                   :key="advice_index"
@@ -1830,7 +1834,7 @@
                     <span v-if="advice.start_time">
                       {{ getTime(advice.start_time, "{h}:{i}") }}
                     </span>
-                  
+
                   </td>
                   <td
                     height="32px"
@@ -1865,7 +1869,7 @@
                       >({{ advice.remark }})</span
                     >
                   </td>
-                
+
                   <td height="32px">
                     <span
                       v-if="setAdminUserES(advice.advice_doctor) == ''"
@@ -1879,7 +1883,7 @@
                       v-else
                     />
                   </td>
-                  
+
                   <td height="32px">
                     <span v-if="advice.execution_time">{{
                       getTime(advice.execution_time, "{h}:{i}")
@@ -2597,7 +2601,7 @@
                           核对护士
                         </td>
                       </tr>
-                     
+
 
                       <tr
                         v-for="(advice, advice_index) in doctor_advices"
@@ -2607,7 +2611,7 @@
                           <span v-if="advice.start_time">
                             {{ getTime(advice.start_time, "{h}:{i}") }}
                           </span>
-                          
+
                         </td>
                         <td
                           height="32px"
@@ -2642,7 +2646,7 @@
                             >({{ advice.remark }})</span
                           >
                         </td>
-                    
+
                         <td height="32px">
                           <span
                             v-if="setAdminUserES(advice.advice_doctor) == ''"
@@ -2656,7 +2660,7 @@
                             v-else
                           />
                         </td>
-                      
+
                         <td height="32px">
                           <span
                             v-if="setAdminUserES(advice.execution_staff) == ''"
@@ -2688,15 +2692,15 @@
                           />
                         </td>
                       </tr>
-                     
+
                     </tbody>
      </table>
 
 
-    
-     
 
-     
+
+
+
     </div>
   </div>
 </template>
@@ -3474,7 +3478,7 @@ export default {
         for (let index = 0; index < this.doctor_advices.length; index++) {
           this.doctor_advices[index]["isShow"] = 2;
         }
-   
+
         // if (this.doctor_advices.length > 0) {
         //   var group = this.newAdviceGroupObject()
         //   var initGroupBlock = function(group, advice) {
@@ -3555,7 +3559,7 @@ export default {
         // }
 
 
-        
+
 
         console.log("RESWOOWOWWOOW",response.data.data.doctorAdevieInfo)
         if(this.org_id ==10515 || this.org_id == 0){
@@ -3575,15 +3579,15 @@ export default {
         });
         this.projects = projects;
 
-      
+
         console.log("this.projects", this.projects);
 
         // var objProject = {advice_name:"",start_time:"",single_dose:"",single_dose_unit:"",}
-      
+
         if(this.projects!=null && this.projects.length >0){
            for(let i=0;i<this.projects.length;i++){
              if(this.projects[i].type== 2){
-            
+
               this.projects[i].project_team_name = ""
               this.projects[i].project_team_id = 0
               console.log("this.projects[i].project.team",this.projects[i].project.team)
@@ -3594,10 +3598,10 @@ export default {
                 this.projects[i].single_dose = this.projects[i].single_dose
                 this.projects[i].single_dose_unit = this.projects[i].unit
                 this.projects[i].execution_time = this.projects[i].execution_time
-                this.projects[i].execution_staff= this.projects[i].execution_staff 
+                this.projects[i].execution_staff= this.projects[i].execution_staff
                 this.projects[i].advice_name =  this.projects[i].team.project_team
-              
-               
+
+
                 this.doctor_advices.push(this.projects[i])
                 // this.doctor_advices_2.push(this.project[i])
               }else{
@@ -3607,18 +3611,18 @@ export default {
                 this.projects[i].single_dose = this.projects[i].single_dose
                 this.projects[i].single_dose_unit = this.projects[i].unit
                 this.projects[i].execution_time = this.projects[i].execution_time
-                this.projects[i].execution_staff= this.projects[i].execution_staff 
+                this.projects[i].execution_staff= this.projects[i].execution_staff
                 this.doctor_advices.push(this.projects[i])
                 // this.doctor_advices_2.push(this.projects[i])
               }
-             
+
              }
-             
+
            }
         }
-         
+
         }
-      
+
         console.log("时间我我我哦我我",this.doctor_advices)
         if (this.doctor_advices.length <= 6) {
           var nl = 3;
@@ -3655,7 +3659,7 @@ export default {
         }
         // console.log(this.advice_groups);
 
-       
+
       } else {
         this.loading = false;
         this.$message.error("请求数据失败");
@@ -3691,7 +3695,7 @@ export default {
     //   }
     // },
     getAge: function(val) {
-     
+
       if (val.id_card_no) {
         var thisLen = val.id_card_no.length
 
@@ -3801,7 +3805,7 @@ export default {
       "vascular_access_desc"
     );
     this.org_id = this.$store.getters.xt_user.org.id;
-   
+
     // this.bloodAccessParOpera = getDataConfig('hemodialysis', 'vascular_access_desc')
 
     var bloodAccessParOpera = getDataConfig(

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1654,8 +1654,7 @@ export default {
       form['p_type'] = this.current_med_type
       form['diagnosis'] = this.form.diagnosis.join(',')
       form['sick_type'] = this.form.sick_type
-      form['fapiao_code'] = this.form.fapiao_code
-      form['fapiao_number'] = this.form.fapiao_number
+
 
       form['ids'] = this.temp_ids
       if (this.activeName == 'first') {

src/xt_pages/outpatientCharges/summary.vue

@@ -4063,7 +4063,7 @@ export default {
     },
 
     invoicePrint(obj) {
-      if(this.$store.getters.xt_user.org_id == 10480){
+      if(this.$store.getters.xt_user.org_id == 10480 || this.$store.getters.xt_user.org_id == 0){
         this.fapiao_number  = obj.fa_piao_number
         this.dialogfapiaoVisible = true
         this.targeOrderId = obj.id

src/xt_pages/stock/query/goodNewQuery.vue

@@ -68,7 +68,7 @@
                   {{scope.row.specification_name}}/{{scope.row.packing_unit}}
                 </template>
             </el-table-column>
-            <el-table-column label="生产厂商" align="center">
+            <el-table-column label="生产厂商" align="center" v-if="org_id!=10679">
               <template slot-scope="scope">
                   {{getManufacturName(scope.row.manufacturer)}}
               </template>

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -90,7 +90,7 @@
                   {{scope.row.specification_name}}/{{scope.row.packing_unit}}
                 </template>
             </el-table-column>
-            <el-table-column label="生产厂商" align="center">
+            <el-table-column label="生产厂商" align="center" v-if="org_id!=10679">
               <template slot-scope="scope">
                  {{getManufacturName(scope.row.manufacturer)}}
               </template>