1

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -84,7 +84,7 @@
         if(this.org_id == 10138){
           setTimeout(() => {
             const style =
-            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 50%;}}}';
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 49%;}}}';
             printJS({
                 printable: "prescription-print",
                 type: "html",

src/xt_pages/outpatientCharges/newTreatTemplate/printTwo.vue

@@ -29,7 +29,7 @@
                       <td width="50">数量</td>
                       <td width="60">单价</td>
                       <td width="70">总额</td>
-                      <td width="100">小计</td>
+                      <td width="130">小计</td>
                   </tr>
                   <div v-for="(item,i) in info.new_detail_list" :key="i" style="width:100%;display: table-row-group;">
                       <tr v-for="(subItem,index) in item.details" :key="index">

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -744,7 +744,8 @@
               obj['prescribing_number_unit'] = drug_month_prescriptions.advices[a].prescribing_number_unit
               obj['medical_insurance_number'] = drug_month_prescriptions.advices[a].drug.medical_insurance_number
               obj['id'] = drug_month_prescriptions.advices[a].drug_id
-              obj['single_dose_unit'] = drug_month_prescriptions.advices[a].single_dose_unit
+              // obj['single_dose_unit'] = drug_month_prescriptions.advices[a].single_dose_unit
+              obj['single_dose_unit'] = drug_month_prescriptions.advices[a].drug.dose_unit
 
 
               // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
@@ -2613,8 +2614,8 @@
                   remark: '',
                   day: "1",
                   prescribing_number: temp3[b].prescribing_number,
-                  single_dose_unit: temp3[b].drug.min_unit,
-                  prescribing_number_unit: temp3[b].drug.max_unit,
+                  single_dose_unit: temp3[b].drug.dose_unit,
+                  prescribing_number_unit: temp3[b].drug.prescribing_number_unit,
                   medical_insurance_number: temp3[b].drug.medical_insurance_number
                 }
 
@@ -2640,8 +2641,8 @@
                   remark: '',
                   day: temp[b].drug_day ? temp[b].drug_day : 1,
                   prescribing_number: temp[b].prescribing_number,
-                  single_dose_unit: temp[b].min_unit,
-                  prescribing_number_unit: temp[b].max_unit,
+                  single_dose_unit: temp[b].dose_unit,
+                  prescribing_number_unit: temp[b].prescribing_number_unit,
                   medical_insurance_number: temp[b].medical_insurance_number,
                   drug: temp[b]
                 }

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -430,24 +430,26 @@
         
       },
       getPrescribingNumberUnit(scope){
-        if(scope.row.drug.min_unit == scope.row.single_dose_unit){
-          if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
-            scope.row.prescribing_number = scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day
-          }else{
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency)) * scope.row.day / scope.row.drug.min_number) 
-          }
-        }else{
-          if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose) 
-          }else{
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose / scope.row.drug.min_number)
-          }
-        }
-        if(scope.row.prescribing_number == 0){
-          scope.row.prescribing_number = 1
-        }
+
+        // console.log('scope',scope)
+        // if(scope.row.drug.min_unit == scope.row.single_dose_unit){
+        //   if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+        //     scope.row.prescribing_number = scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day
+        //   }else{
+        //     scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency)) * scope.row.day / scope.row.drug.min_number) 
+        //   }
+        // }else{
+        //   if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+        //     scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose) 
+        //   }else{
+        //     scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose / scope.row.drug.min_number)
+        //   }
+        // }
+        // if(scope.row.prescribing_number == 0){
+        //   scope.row.prescribing_number = 1
+        // }
         if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
-          scope.row.retail_price = scope.row.drug.min_number / scope.row.retail_price
+          scope.row.retail_price = scope.row.drug.min_price
           if(scope.row.prescribing_number > scope.row.drug.total){
             this.$message.error(scope.row.drug_name + '库存不足')
           }
@@ -455,7 +457,7 @@
           if((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total){
             this.$message.error(scope.row.drug_name + '库存不足')
           }
-          scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
+          scope.row.retail_price = scope.row.drug.retail_price
         }
       },
       changePrescribingNumber(scope){