Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/bloodPresssWatch.vue

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

src/xt_pages/dialysis/dialysisPrintOrder.vue

           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_id !=0
             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{
-            this.org_template_info = response.data.data.org_template_info;
-            this.org_template_info.template_id= 82
-          }
+          // }else{
+          //   this.org_template_info = response.data.data.org_template_info;
+          //   this.org_template_info.template_id= 82
+          // }
 
 
           console.log('kkkkkkk222222',this.org_template_info);

src/xt_pages/dialysis/template/DialysisPrintOrderSeventyeight.vue

         if(this.dialysisOrder !=undefined && this.dialysisOrder.end_time != 0){
           if(this.monitors.length >0){
             for(let i in this.monitors){
-              console.log('1111111111',this.dialysisOrder.end_time,this.monitors[i].operate_time);
-              if(this.monitors[i].blood_flow_volume ==0 && this.dialysisOrder.end_time >= this.monitors[i].operate_time){
-                const obj55 = '监测第'+((i*1)+1)+'行血流量'
-                checkDate.push(obj55)
-              } if((this.monitors[i].venous_pressure ==0 ||
-                  this.monitors[i].transmembrane_pressure ==0 ) && this.dialysisOrder.end_time >= this.monitors[i].operate_time
+              if(this.dialysisOrder.end_time >= this.monitors[i].operate_time && 
+                this.monitors[i].dispose.indexOf('停') <=-1 && this.monitors[i].ultrafiltration_rate!=0
               ){
-                const obj56 = '监测第'+((i*1)+1)+'行静脉压/跨膜压'
-                checkDate.push(obj56)
-              } if(this.monitors[i].ultrafiltration_rate ==0 && this.dialysisOrder.end_time >= this.monitors[i].operate_time){
-                const obj57 = '监测第'+((i*1)+1)+'行超滤率'
-                checkDate.push(obj57)
-              } if(this.monitors[i].ultrafiltration_volume == 0 && i !=0 && 
-                  this.dialysisOrder.end_time >= this.monitors[i].operate_time
-              ){
-                const obj53 = '监测第'+((i*1)+1)+'行超滤量'
-                checkDate.push(obj53)
-              } if(this.monitors[i].replacement_rate ==0 && this.prescription.mode =='HDF'&& 
-                  this.dialysisOrder.end_time >= this.monitors[i].operate_time
-              ){
-                const obj58 = '监测第'+((i*1)+1)+'行置换率'
-                checkDate.push(obj58)
-              } if(this.monitors[i].displacement_quantity == 0 && this.prescription.mode =='HDF'&& i !=0
-                  && this.dialysisOrder.end_time >= this.monitors[i].operate_time
-              ){
-                const obj54 = '监测第'+((i*1)+1)+'行置换量'
-                checkDate.push(obj54)
-              } if(this.monitors[i].sodium_concentration ==0 && 
-                  this.dialysisOrder.end_time >= this.monitors[i].operate_time
-              ){
-                // this.monitors[i].temperature == 0
-                const obj59 = '监测第'+((i*1)+1)+'行钠浓度/温度'
-                checkDate.push(obj59)
-              } if(this.monitors[i].pulse_frequency ==0  && 
-                  this.monitors[i].operate_time <= this.dialysisOrder.end_time
-              ){
-                const obj60 = '监测第'+((i*1)+1)+'行脉搏'
-                checkDate.push(obj60)
-              } if(this.monitors[i].breathing_rate ==0 && 
-                this.dialysisOrder.end_time >= this.monitors[i].operate_time
-              ){
-                const obj61 = '监测第'+((i*1)+1)+'行呼吸'
-                checkDate.push(obj61)
-              } if((this.monitors[i].systolic_blood_pressure ==0 ||
-                    this.monitors.diastolic_blood_pressure==0) && 
-                    this.dialysisOrder.end_time >= this.monitors[i].operate_time
-              ){
-                const obj62 = '监测第'+((i*1)+1)+'行血压'
-                checkDate.push(obj62)
+                  console.log('1111111111',this.dialysisOrder.end_time,this.monitors[i].operate_time);
+                if(this.monitors[i].blood_flow_volume ==0 ){
+                  const obj55 = '监测第'+((i*1)+1)+'行血流量'
+                  checkDate.push(obj55)
+                } if((this.monitors[i].venous_pressure ==0 ||
+                    this.monitors[i].transmembrane_pressure ==0 ) ){
+                  const obj56 = '监测第'+((i*1)+1)+'行静脉压/跨膜压'
+                  checkDate.push(obj56)
+                } if(this.monitors[i].ultrafiltration_rate ==0 ){
+                  const obj57 = '监测第'+((i*1)+1)+'行超滤率'
+                  checkDate.push(obj57)
+                } if(this.monitors[i].ultrafiltration_volume == 0 && i !=0 ){
+                  const obj53 = '监测第'+((i*1)+1)+'行超滤量'
+                  checkDate.push(obj53)
+                } if(this.monitors[i].replacement_rate ==0 && this.prescription.mode =='HDF'){
+                  const obj58 = '监测第'+((i*1)+1)+'行置换率'
+                  checkDate.push(obj58)
+                } if(this.monitors[i].displacement_quantity == 0 && this.prescription.mode =='HDF'&& i !=0){
+                  const obj54 = '监测第'+((i*1)+1)+'行置换量'
+                  checkDate.push(obj54)
+                } if(this.monitors[i].sodium_concentration ==0 ){
+                  // this.monitors[i].temperature == 0
+                  const obj59 = '监测第'+((i*1)+1)+'行钠浓度/温度'
+                  checkDate.push(obj59)
+                } if(this.monitors[i].pulse_frequency ==0  ){
+                  const obj60 = '监测第'+((i*1)+1)+'行脉搏'
+                  checkDate.push(obj60)
+                } if(this.monitors[i].breathing_rate ==0 ){
+                  const obj61 = '监测第'+((i*1)+1)+'行呼吸'
+                  checkDate.push(obj61)
+                } if((this.monitors[i].systolic_blood_pressure ==0 ||
+                      this.monitors.diastolic_blood_pressure==0) ){
+                  const obj62 = '监测第'+((i*1)+1)+'行血压'
+                  checkDate.push(obj62)
+                }
               }
+              
 
             }
           }

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

         </div>
 
 
-        <div class="mainCell" v-if="this.org_id == 10191">
+        <div class="mainCell" v-if="this.org_id == 10191 || this.org_id == 10653">
           <el-radio-group v-model="sch_type" @change="changeScheduleType">
             <el-radio :label="1">上午</el-radio>
             <el-radio :label="2">下午</el-radio>

src/xt_pages/outpatientCharges/summary.vue

             }}
           </template>
         </el-table-column>
+        <el-table-column align="center" width="80" prop="name" label="折扣金额">
+          <template slot-scope="scope">{{
+              scope.row.discount_price.toFixed(2)
+            }}
+          </template>
+        </el-table-column>
+
+        <el-table-column align="center" width="80" prop="name" label="优惠金额">
+          <template slot-scope="scope">{{
+              scope.row.preferential_price.toFixed(2)
+            }}
+          </template>
+        </el-table-column>
+
         <el-table-column align="center" width="70" prop="name" label="科室">
           <template slot-scope="scope">{{
               scope.row.department_name
     >
       <listPrint ref="checklists" :paramsObj='paramsObj' :key="jgFileTimer"></listPrint>
     </el-dialog>
-    
+
     <el-dialog
       class="centerDialog"
       width="900px"
     getTimes(time) {
       return uParseTime(time, '{y}-{m}-{d}')
     },
-    
+
     toDetail(row) {
       this.$router.push(
         '/outpatientCharges/summaryDetail?patient_id=' +
 
     }
   },
-  
+
 }
 </script>
 <style lang="scss">