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/batch_print/batch_print_order_sixty.vue

@@ -736,8 +736,8 @@
                         >
                           {{
                             record.prescription &&
-                            record.prescription.displace_liqui_value
-                              ? record.prescription.displace_liqui_value
+                            record.prescription.replacement_total
+                              ? record.prescription.replacement_total
                               : "/"
                           }}
                         </div>

src/xt_pages/dialysis/template/DialysisPrintOrderSixty.vue

@@ -703,8 +703,8 @@
                         style="width: 70px; text-align: center"
                       >
                         {{
-                          prescription.displace_liqui_value
-                            ? prescription.displace_liqui_value
+                          prescription.replacement_total
+                            ? prescription.replacement_total
                             : "/"
                         }}
                       </div>
@@ -2505,7 +2505,7 @@ export default {
       ) {
         this.$message.error("置换方式未填");
       } else if (
-        this.prescription.displace_liqui_value == 0 &&
+        this.prescription.replacement_total == 0 &&
         this.prescription.mode_id == 2
       ) {
         this.$message.error("置换量未填");

src/xt_pages/dialysis/template/DialysisPrintOrdereightytwo.vue

@@ -6,7 +6,7 @@
         id="dialysis-print-box-1-1"
         class="dialysis-print-order print-template-two print_page_main_content"
       >
-      
+
         <div style="display:inline-block;width:100%;text-align:center;">
           <div
             class="order-title"
@@ -68,8 +68,8 @@
                   }}
                 </span> -->
 
-                
-              
+
+
                 <span v-if="prescription.dialysis_dialyszers !=''">
                   {{
                     prescription.dialysis_dialyszers
@@ -109,7 +109,7 @@
         </div>
 
         <div class="row">
-          
+
         </div>
         <div class="row">
           抗凝药物&nbsp;&nbsp;
@@ -213,7 +213,7 @@
             <div class="inline_block under_line" style="width:80px;text-align: center;margin-right:30px;">
               {{ receiverTreatmentAccess.way ? receiverTreatmentAccess.way : "/" }}
             </div>
-           
+
           </div>
         </div>
         <div class="row">
@@ -267,8 +267,8 @@
               <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.change_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.change_nurse)}}</span>
               <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.change_nurse)" alt="" srcset="" v-else>
             </div>
-          </div> 
-          
+          </div>
+
           上机护士
           <div class="inline_block under_line" style="width:100px;text-align: center;">
             <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.start_nurse)}}</span>
@@ -362,7 +362,7 @@
                 <td>&nbsp;{{monitor.systolic_blood_pressure?monitor.systolic_blood_pressure:''}} <span v-if="monitor.systolic_blood_pressure||monitor.diastolic_blood_pressure">/</span>
                   {{monitor.diastolic_blood_pressure?monitor.diastolic_blood_pressure:''}}
                 </td>
-               
+
                 <td>&nbsp;{{monitor.pulse_frequency?monitor.pulse_frequency:''}}</td>
                 <td>&nbsp;{{monitor.blood_flow_volume?monitor.blood_flow_volume:''}}</td>
                 <td>&nbsp;{{monitor.venous_pressure?monitor.venous_pressure:''}}
@@ -478,7 +478,7 @@
                         <span class="under_line" style="width:100px;display:inline-block">
                           {{  getintravenous(afterdialysis.intravenous_tube) }}
                         </span>
-                        
+
                         <!-- <label-box :isChecked="afterdialysis.intravenous_tube == 1 ? true : false" showValue="无"></label-box>&nbsp;
                         <label-box :isChecked="afterdialysis.intravenous_tube == 2 ? true : false" showValue="+"></label-box>&nbsp;
                         <label-box :isChecked="afterdialysis.intravenous_tube == 3 ? true : false" showValue="+ +"></label-box>&nbsp;
@@ -489,7 +489,7 @@
                         <span class="under_line" style="width:100px;display:inline-block">
                           {{ getarterial(afterdialysis.arterial_tube) }}
                         </span>
-                        
+
                         <!-- <label-box :isChecked="afterdialysis.arterial_tube == 1 ? true : false" showValue="无"></label-box>&nbsp;
                         <label-box :isChecked="afterdialysis.arterial_tube == 2 ? true : false" showValue="+"></label-box>&nbsp;
                         <label-box :isChecked="afterdialysis.arterial_tube == 3 ? true : false" showValue="+ +"></label-box>&nbsp;
@@ -1402,7 +1402,7 @@ export default {
           if (prescription.replacement_way === 4) {
             prescription.replacement_way = '混合置换'
           }
-     
+
           this.prescription = prescription
           var receiverTreatmentAccess =
             response.data.data.receiverTreatmentAccess
@@ -1776,7 +1776,7 @@ export default {
             return options[i].shouji_unit
           }
         }
-       
+
       }else{
         return ''
       }
@@ -1844,7 +1844,7 @@ export default {
     this.arterial_tube =  this.$store.getters.arterial_tube
     this.intravenous_tube = this.$store.getters.intravenous_tube
     console.log('intravenous_tube',this.intravenous_tube);
-    
+
 
     this.way_arr = getDataConfig('hemodialysis', 'way')
     this.consciousness_arr = getDataConfig('hemodialysis', 'consciousness')

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -3215,8 +3215,8 @@ export default {
                 var err_msg = ""
                 for(let i =0; i < this.prescriptions.length; i++){
                   for(let b= 0; b < this.prescriptions[i].advices.length;b++){
-                    console.log(this.prescriptions[i].advices[b])
-                    if(this.prescriptions[i].advices[b].prescribing_number_unit !=this.prescriptions[i].advices[b].drug.min_unit){
+
+                    if(this.prescriptions[i].advices[b].prescribing_number_unit !=this.prescriptions[i].advices[b].drug.min_unit && this.prescriptions[i].advices[b].delivery_way.indexOf("口服") != -1 ){
                       isLoading = false
                       if(err_msg.length == 0){
 

src/xt_pages/user/components/PatientSidebar.vue

@@ -202,10 +202,10 @@ export default {
               name: '1-3',
               label: '肾科检验'
             },
-            {
-              name: '4-2',
-              label: '肾科检验新'
-            },
+            // {
+            //   name: '4-2',
+            //   label: '肾科检验新'
+            // },
             // {
             //   name: '4-12',
             //   label: '新版肾科检验'