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

src/xt_pages/DepositManagement/print/printindex.vue

                   <div style="min-width: 224px; border-bottom: 1px solid #000">
                     <span>{{name}}</span>
                   </div>
-                </div>
-                <div style="display: flex">
-                  <div>收款方式：</div>
-                  <div
-                    style="min-width: 224px; border-bottom: 1px solid #000"
-                  ><span>现金</span>
-                  </div>
+                </div>            
+              </div>
+              <div style="display: flex;padding: 0 30px">
+                <div>收款方式：</div>
+                <div
+                  style="min-width: 224px; border-bottom: 1px solid #000"
+                ><span>现金</span>
                 </div>
               </div>
               <div style="display: flex; padding: 0 30px">

src/xt_pages/dialysis/batch_print/batch_print_order_forty.vue

                                  
                                 <label-box :isChecked="record.assessment_before_dislysis.puncture_needle && record.assessment_before_dislysis.puncture_needle.indexOf('钝针') > -1 ? true : false" showValue="钝针"></label-box>
                                 &nbsp;
+                                <label-box :isChecked="record.assessment_before_dislysis.puncture_needle && record.assessment_before_dislysis.puncture_needle.indexOf('留置针16G') > -1 ? true : false" showValue="留置针16G"></label-box>
                             </div>
                             </td>
                             <td></td>

src/xt_pages/dialysis/dialysisPrintOrder.vue

         >
         </div>
       </template>
-
+      <template v-if="org_template_info.template_id == 82">
+        <div>
+          <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+        </div>
+      </template>
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
           <DialysisPrintOrdereightyone v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 81">
           </DialysisPrintOrdereightyone>
+          <DialysisPrintOrdereightytwo  v-bind:childResponse="childResponse"
+          v-if="org_template_info.template_id == 82">
+          </DialysisPrintOrdereightytwo>
         </div>
       </el-container>
     </div>
 import DialysisPrintOrderSeventynine from './template/DialysisPrintOrderSeventynine'
 import DialysisPrintOrdereighty from './template/DialysisPrintOrdereighty'
 import DialysisPrintOrdereightyone from './template/DialysisPrintOrdereightyone'
+import DialysisPrintOrdereightytwo from './template/DialysisPrintOrdereightytwo'
 import DialysisPrintOrderZero from './template/DialysisPrintOrderZero'
 export default {
   name: "dialysisPrintOrder",
     DialysisPrintOrderSeventynine,
     DialysisPrintOrdereighty,
     DialysisPrintOrdereightyone,
+    DialysisPrintOrdereightytwo,
     DialysisPrintOrderZero,
     LabelBox,
     BreadCrumb,
           style: style2,
           scanStyles: false,
         });
+      } else if (this.org_template_info.template_id == 82) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style3,
+          scanStyles: false,
+        });
       }
-      // else if (this.org_id == 10206 || this.org_id ==0 || org_id==9671) {
-      //   printJS({
-      //     printable: "dialysis-print-box-1",
-      //     type: "html",
-      //     style: style2,
-      //     scanStyles: false,
-      //   });
-      // }
        else if (this.org_template_info.template_id == 199 ) {
         printJS({
           printable: "dialysis-print-box-1",
           this.patient_id = response.data.data.patientInfo.DialysisSchedule.patient_id
           this.patient_name = response.data.data.patientInfo.name
 
-          if(this.org_id !=10206){
+          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= 80
+            this.org_template_info.template_id= 82
           }
 
 

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

                        
                       <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('钝针') > -1 ? true : false" showValue="钝针"></label-box>
                       &nbsp;
+                      <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('留置针16G') > -1 ? true : false" showValue="留置针16G"></label-box>
                     </div>
                   </td>
 

src/xt_pages/dialysis/template/DialysisPrintOrderSeventyeight.vue

                           text-align: center; white-space: normal;
                         "
                       >
-                        {{
-                          afterdialysis.weight_loss ? afterdialysis.weight_loss : "/"
-                        }}
+                      <span v-if="predialysis.weight_before && afterdialysis.weight_after &&
+                          parseFloat( predialysis.weight_before - predialysis.additional_weight ).toFixed(1) - 
+                          parseFloat( afterdialysis.weight_after - afterdialysis.additional_weight).toFixed(1)==0
+                      ">
+                          0
+                      </span>
+                      <span v-else>
+                        {{ afterdialysis.weight_loss ? afterdialysis.weight_loss : "/"}}
+                      </span>
+
+                        
                       </div>kg
                     </div>
                     <div class="inline_block" style="flex:1;">
           const obj20 = "透后体重"
           checkDate.push(obj20)
         }
-        if (this.afterdialysis.weight_loss == 0) {
+        if (this.afterdialysis.weight_loss == '' && 
+            this.predialysis.weight_before =='' && 
+            this.afterdialysis.weight_after == ''
+        ) {
           const obj21 = "体重减少"
           checkDate.push(obj21)
         }
             }
           })
         }
-        if(this.monitors.length >0){
-
-          for(let i in this.monitors){
-            if(this.monitors[i].blood_flow_volume ==0 && this.dialysisOrder.end_time > this.monitors[i].operate_time){
-              const obj55 = '监测第'+((i*1)+1)+'行血流量'
-              monearr.push(obj55)
-            } if((this.monitors[i].venous_pressure ==0 ||
-                this.monitors[i].transmembrane_pressure ==0 ) && this.dialysisOrder.end_time > this.monitors[i].operate_time
-            ){
-              const obj56 = '监测第'+((i*1)+1)+'行静脉压/跨膜压'
-              monearr.push(obj56)
-            } if(this.monitors[i].ultrafiltration_rate ==0 && this.dialysisOrder.end_time > this.monitors[i].operate_time){
-              const obj57 = '监测第'+((i*1)+1)+'行超滤率'
-              monearr.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)+'行超滤量'
-              monearr.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)+'行置换率'
-              monearr.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)+'行置换量'
-              monearr.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)+'行钠浓度/温度'
-              monearr.push(obj59)
-            } if(this.monitors[i].pulse_frequency ==0  && 
-                this.dialysisOrder.end_time > this.monitors[i].operate_time
-            ){
-              const obj60 = '监测第'+((i*1)+1)+'行脉搏'
-              monearr.push(obj60)
-            } if(this.monitors[i].breathing_rate ==0 && 
-              this.dialysisOrder.end_time > this.monitors[i].operate_time
-            ){
-              const obj61 = '监测第'+((i*1)+1)+'行呼吸'
-              monearr.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)+'行血压'
-              monearr.push(obj62)
-            }
+        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
+              ){
+                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)
+              }
 
+            }
           }
         }
-        if(monearr.length>0){
-        checkDate =checkDate.concat(monearr)
-          console.log('1111',checkDate.concat(monearr));
-        }
+        
+        // if(monearr.length>0){
+        // checkDate =checkDate.concat(monearr)
+        //   console.log('1111',checkDate.concat(monearr));
+        // }
         console.log('monearr监测',checkDate,monearr);
 
         this.getcheckData(checkDate)