Merge branch '20230223_pad_vue_new_branch' of http://git.shengws.com/csx/Pad_New into 20230223_pad_vue_new_branch

src/pages/main/PrintIndex.vue

@@ -735,13 +735,13 @@ export default {
         if (response.data.state == 1) {
             this.childResponse = response;
 
-          if(this.org_id != 10727&&this.org_id !=0){
+          // if(this.org_id != 10727){//&&this.org_id !=0
             this.org_template_info = response.data.data.org_template_info;
-          }else{
-            this.org_template_info.template_id = 82
-          }
+          // }else{
+          //   this.org_template_info.template_id = 82
+          // }
           console.log('responsevvvvvv',response.data.data);
-          
+
         } else {
           this.$message.error("请求数据失败");
           return false;

src/pages/main/template/DialysisPrintOrderSeventyeight.vue

@@ -885,7 +885,7 @@
                               >【开始透析】引血 {{ dialysisOrder.blood_drawing }} ml/min
                               </template>
 
-                            {{ monitor.end }}  &nbsp;
+                              {{ monitor.dispose }}{{ monitor.end }}  &nbsp;
                             &nbsp;
                           </span>
                         </div>
@@ -1487,56 +1487,96 @@ export default {
         if(this.dialysisOrder != undefined && this.dialysisOrder.end_time !=0){
           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)+'行血流量'
-                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.dialysisOrder.end_time >= this.monitors[i].operate_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)
+                }
               }
 
+              // 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.dialysisOrder.end_time >= this.monitors[i].operate_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)
+              // }
+
             }
           }
         }

src/pages/main/template/DialysisPrintOrderSixtyeight.vue

@@ -848,8 +848,7 @@
                                       <span>{{
                                         it.execution_frequency
                                       }}</span>
-                                      <!-- {{ it.remark }} -->
-                                     <span v-if="it.remark!=''">{{ it.remark }}</span>
+                                     <span v-if="it.remark!=''">({{ it.remark }})</span>
                               </div> 
                             </div>
                           </div>
@@ -1966,15 +1965,19 @@ export default {
             let newArr = Object.values(dataInfo)
 
             if(newArr!=null && newArr.length >0){
-            for(let i=0;i<newArr.length;i++){
-              for(let j=0;j<this.doctor_advices.length;j++){
-                if(newArr[i].groupPrescriptionId == this.doctor_advices[j].groupPrescriptionId){
-                    newArr[i].prescriptionChild.push(this.doctor_advices[j])
+              for(let i=0;i<newArr.length;i++){
+                for(let j=0;j<this.doctor_advices.length;j++){
+                  if(newArr[i].groupPrescriptionId == this.doctor_advices[j].groupPrescriptionId){
+                      newArr[i].prescriptionChild.push(this.doctor_advices[j])
+                  }
                 }
               }
             }
+            for(let i in newArr){
+              if(newArr[i].parent_id == undefined){
+                newArr.splice(i,1)
+              }
             }
-            
             this.doctor_advices = []
             this.doctor_advices = newArr
             console.log("newArr",this.doctor_advices)

src/pages/main/template/DialysisPrintOrdereighty.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="dialysis-print-box-1">
     <el-button type="primary" @click="checkData">一键核对</el-button>
-    <div id="dialysis-print-box-1-1" class="dialysis-print-order print-template-two print_page_main_content" 
+    <div id="dialysis-print-box-1-1" class="dialysis-print-order print-template-two print_page_main_content"
       style="margin-left: 10px;font-family: SimSun;"
     >
       <div style="display:inline-block;width:100%;text-align:center;">
@@ -122,10 +122,10 @@
                     透析机型号:
                     <div class="under_line" style="width: 60%; text-align: center">
                       <span v-if="dialysisOrder && dialysisOrder.bed_id !=0">
-                        {{ getnumberlist(dialysisOrder.bed_id) }} 
+                        {{ getnumberlist(dialysisOrder.bed_id) }}
                       </span>
                       <span v-else>
-                        {{ getnumberlist(patientInfo.DialysisSchedule.bed_id) }} 
+                        {{ getnumberlist(patientInfo.DialysisSchedule.bed_id) }}
                       </span>
                     </div>
                   </div>
@@ -226,7 +226,7 @@
                       {{ predialysis.blood_access_part_opera_name }}
                     </div>
                   </div>
-                  
+
                   <div class="inline_block" style="flex: 1">
                     导管:
                     <div class="under_line"
@@ -235,7 +235,7 @@
                       {{ predialysis.catheter ? predialysis.catheter : "/" }}
                     </div>
                   </div>
-                  
+
                 </div>
                 <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                   <div class="inline_block" style="flex: 1">
@@ -343,7 +343,7 @@
                           : "/"
                       }}
                     </div>
-                    kg
+                    L
                   </div>
                 </div>
                 <div class="row" style="padding: 2px 0; line-height: 23px;display: flex;" >
@@ -366,7 +366,7 @@
                       style="width: 50px; text-align: center"
                     >
                       {{ prescription.kalium ? prescription.kalium : "/" }}
-                      
+
                     </div>
                     mmol/L
                   </div>
@@ -382,7 +382,7 @@
                     <div class="under_line"
                       style="width: 35px; text-align: center"
                     >
-                      <span> {{ prescription.calcium ? prescription.calcium : "/" }}</span>                     
+                      <span> {{ prescription.calcium ? prescription.calcium : "/" }}</span>
                     </div>
                     mmol/L
                   </div>
@@ -396,10 +396,10 @@
                         prescription.bicarbonate ? prescription.bicarbonate : "/"
                       }}
                       </span>
-                      
+
                     </div>
                     mmol/L
-                  </div> 
+                  </div>
                 </div>
                 <div class="row" style="padding: 2px 0; line-height: 23px;display: flex;" >
                   <div class="inline_block" style="flex: 1;">
@@ -427,7 +427,7 @@
                     <span v-if="prescription.anticoagulant!=''">
                       {{ getshouji(prescription.anticoagulant) }}
                     </span>
-                    
+
                   </div>
                   <div class="inline_block" style="flex: 1;">
                     追加:
@@ -443,7 +443,7 @@
                     <span v-if="prescription.anticoagulant!=''">
                       {{ getweichi(prescription.anticoagulant) }}
                     </span>
-                    
+
                   </div>
                   <div class="inline_block" style="flex: 1;"
                     v-if="prescription.anticoagulant == 5"
@@ -492,7 +492,7 @@
                     <span v-if="prescription.anticoagulant!=''">
                       {{ getzongliang(prescription.anticoagulant) }}
                     </span>
-                    
+
                   </div>
                 </div>
                 <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
@@ -689,12 +689,12 @@
                         <span v-if="advice.parent_id == 0">{{advice.execution_frequency}}</span>
                         <span v-if="advice.parent_id == 0 && advice.remark.length > 0" >({{advice.remark}})</span>
                       </td>
-                      
+
                       <td height="35px">
                         <span v-if="setAdminUserES(advice.advice_doctor) == ''">{{getAdminUser(advice.advice_doctor)}}</span>
                         <img style="height:30px;" :src="setAdminUserES(advice.advice_doctor)" alt="" srcset="" v-else>
                       </td>
-                
+
                       <td height="35px">
                         <span v-if="setAdminUserES(advice.execution_staff) == ''">{{getAdminUser(advice.execution_staff)}}</span>
                         <img style="height:30px;" :src="setAdminUserES(advice.execution_staff)" alt="" srcset="" v-else>
@@ -785,7 +785,7 @@
                   </div>
                   次/分
                 </div>
-                   
+
               </div>
 
               <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
@@ -900,7 +900,7 @@
                   <span>
                       透析中入量(L):
                     </span>
-                  
+
                   <div
                     class="under_line"
                     style="width: 70px; text-align: center"
@@ -982,7 +982,7 @@
           <tr>
             <td>
               <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
-             
+
                 <div class="inline_block" style="flex: 1">
                   上机护士:
                   <div  class="under_line"
@@ -1021,7 +1021,7 @@
                     />
                   </div>
                 </div>
-            
+
                 <div class="inline_block" style="flex:1;">
                   <span> 核对护士:</span>
                   <div class="under_line" style="width: 80px;text-align: center" v-if="dialysisOrder == null">
@@ -1054,13 +1054,13 @@
                     style="width: 64%; text-align: center"
                   >
                     <span style="height: 30px;display: inline-block;">
-                      
+
                     </span>
                     <span v-if="dialysisOrder!=null">
-                      {{getTime(dialysisOrder.start_time, "{y}-{m}-{d} {h}:{i}") ? 
+                      {{getTime(dialysisOrder.start_time, "{y}-{m}-{d} {h}:{i}") ?
                       getTime(dialysisOrder.start_time, "{y}-{m}-{d} {h}:{i}") :''}}
                     </span>
-                    
+
                   </div>
                 </div>
                 <div class="inline_block" style="flex: 1.1">
@@ -1071,10 +1071,10 @@
                     <span style="height: 30px; display: inline-block">
                     </span>
                     <span v-if="dialysisOrder!=null">
-                      {{ getTime(dialysisOrder.end_time, "{y}-{m}-{d} {h}:{i}") ? 
+                      {{ getTime(dialysisOrder.end_time, "{y}-{m}-{d} {h}:{i}") ?
                       getTime(dialysisOrder.end_time, "{y}-{m}-{d} {h}:{i}") : "0" }}
                     </span>
-                    
+
 
                   </div>
                 </div>
@@ -1095,7 +1095,7 @@ import { getDialysisRecord } from '@/api/dialysis'
 import { getDataConfig } from '@/utils/data'
 import { jsGetAge, uParseTime, uParseTimeOne } from '@/utils/tools'
 import LabelBox from '../printItem/LabelBox'
-import {Toast} from 'vant'
+import {Dialog} from 'vant'
 // import DialysisPrintOrderOne from './template/dialysisPrintOrderOne'
 // import DialysisPrintOrderTwo from './template/dialysisPrintOrderTwo'
 import print from 'print-js'
@@ -1247,7 +1247,7 @@ export default {
       ) {
         const obj4 = "透前血压"
         checkDate.push(obj4)
-      } if (this.prescription.dialysis_duration_hour == 0 && 
+      } if (this.prescription.dialysis_duration_hour == 0 &&
             this.prescription.dialysis_duration_minute ==0
       ) {
         const obj5 = "透析时间"
@@ -1261,7 +1261,7 @@ export default {
       } if (this.predialysis.catheter == '' ) {
         const obj8 = "导管"
         checkDate.push(obj8)
-      } if (this.prescription.dialyzer_perfusion_apparatus == '' && 
+      } if (this.prescription.dialyzer_perfusion_apparatus == '' &&
             this.prescription.dialysis_dialyszers ==''
       ) {
         const obj9 = "透析(滤)器"
@@ -1318,7 +1318,7 @@ export default {
         const obj24 = "首剂"
         checkDate.push(obj24)
       }if (this.prescription.anticoagulant_zongliang == 0 &&
-        this.prescription.anticoagulant !=1 && this.prescription.anticoagulant !='' && prescription.anticoagulant != 5
+        this.prescription.anticoagulant !=1 && this.prescription.anticoagulant !='' && this.prescription.anticoagulant != 5
       ) {
         const obj25 = "总量"
         checkDate.push(obj25)
@@ -1434,7 +1434,7 @@ export default {
             }
           })
       }
- 
+
       this.getcheckData(checkDate)
     },
     getDisplaceLiquiPart: function (val) {
@@ -1573,7 +1573,7 @@ export default {
       // getDialysisRecord(this.queryParams).then(response => {
       var response = this.childResponse
       if (response.data.state == 1) {
-        console.log('1234566',response.data.data);  
+        console.log('1234566',response.data.data);
         this.adminUser = response.data.data.users
         this.users = response.data.data.users
         this.patientInfo = response.data.data.patientInfo
@@ -1741,14 +1741,14 @@ export default {
             if(this.org_id!=10683){
               this.monitors[index].end = '【结束透析】'
             }
-             
+
               tempmonitorflag = false
             }
             if (tempmonitorflag && index == this.monitors.length - 1) {
               if(this.org_id!=10683){
                 this.monitors[index].end = '【结束透析】'
               }
-             
+
             }
           }
         }
@@ -1914,7 +1914,7 @@ export default {
         }
         this.totollength = this.doctor_advices.length + this.monitors.length
         console.log(this.advice_groups)
-       
+
       } else {
         this.loading = false
         this.$message.error('请求数据失败')
@@ -2004,7 +2004,7 @@ export default {
       if(id != 0){
         for(let i in options){
           if(id == options[i].id){
-            console.log('anticoagulantsConfit11111',id); 
+            console.log('anticoagulantsConfit11111',id);
             return options[i].shouji_unit
           }
         }
@@ -2048,12 +2048,15 @@ export default {
     getcheckData(val){
       if(val.length >0){
         let message = `记录单未填数据:\n${val.join("\n")}`;
-        Toast({
-          duration:0,
+        Dialog.confirm({
+          allowHtml:true,
           message:message,
-          closeOnClick:true,
-          closeOnClickOverlay:true,
-        })
+        }).then(() => {
+
+          })
+          .catch(() => {
+
+          });
         return message
       }else{
         this.$toast('核对完成');