see999 3 gadus atpakaļ
vecāks
revīzija
ca6413d346

+ 1 - 1
src/xt_pages/outpatientCharges/newStatementPrintTwo.vue Parādīt failu

84
         if(this.org_id == 10138){
84
         if(this.org_id == 10138){
85
           setTimeout(() => {
85
           setTimeout(() => {
86
             const style =
86
             const style =
87
-            '@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%;}}}';
87
+            '@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%;}}}';
88
             printJS({
88
             printJS({
89
                 printable: "prescription-print",
89
                 printable: "prescription-print",
90
                 type: "html",
90
                 type: "html",

+ 1 - 1
src/xt_pages/outpatientCharges/newTreatTemplate/printTwo.vue Parādīt failu

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

+ 6 - 5
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Parādīt failu

744
               obj['prescribing_number_unit'] = drug_month_prescriptions.advices[a].prescribing_number_unit
744
               obj['prescribing_number_unit'] = drug_month_prescriptions.advices[a].prescribing_number_unit
745
               obj['medical_insurance_number'] = drug_month_prescriptions.advices[a].drug.medical_insurance_number
745
               obj['medical_insurance_number'] = drug_month_prescriptions.advices[a].drug.medical_insurance_number
746
               obj['id'] = drug_month_prescriptions.advices[a].drug_id
746
               obj['id'] = drug_month_prescriptions.advices[a].drug_id
747
-              obj['single_dose_unit'] = drug_month_prescriptions.advices[a].single_dose_unit
747
+              // obj['single_dose_unit'] = drug_month_prescriptions.advices[a].single_dose_unit
748
+              obj['single_dose_unit'] = drug_month_prescriptions.advices[a].drug.dose_unit
748
 
749
 
749
 
750
 
750
               // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
751
               // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
2613
                   remark: '',
2614
                   remark: '',
2614
                   day: "1",
2615
                   day: "1",
2615
                   prescribing_number: temp3[b].prescribing_number,
2616
                   prescribing_number: temp3[b].prescribing_number,
2616
-                  single_dose_unit: temp3[b].drug.min_unit,
2617
-                  prescribing_number_unit: temp3[b].drug.max_unit,
2617
+                  single_dose_unit: temp3[b].drug.dose_unit,
2618
+                  prescribing_number_unit: temp3[b].drug.prescribing_number_unit,
2618
                   medical_insurance_number: temp3[b].drug.medical_insurance_number
2619
                   medical_insurance_number: temp3[b].drug.medical_insurance_number
2619
                 }
2620
                 }
2620
 
2621
 
2640
                   remark: '',
2641
                   remark: '',
2641
                   day: temp[b].drug_day ? temp[b].drug_day : 1,
2642
                   day: temp[b].drug_day ? temp[b].drug_day : 1,
2642
                   prescribing_number: temp[b].prescribing_number,
2643
                   prescribing_number: temp[b].prescribing_number,
2643
-                  single_dose_unit: temp[b].min_unit,
2644
-                  prescribing_number_unit: temp[b].max_unit,
2644
+                  single_dose_unit: temp[b].dose_unit,
2645
+                  prescribing_number_unit: temp[b].prescribing_number_unit,
2645
                   medical_insurance_number: temp[b].medical_insurance_number,
2646
                   medical_insurance_number: temp[b].medical_insurance_number,
2646
                   drug: temp[b]
2647
                   drug: temp[b]
2647
                 }
2648
                 }

+ 20 - 18
src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue Parādīt failu

430
         
430
         
431
       },
431
       },
432
       getPrescribingNumberUnit(scope){
432
       getPrescribingNumberUnit(scope){
433
-        if(scope.row.drug.min_unit == scope.row.single_dose_unit){
434
-          if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
435
-            scope.row.prescribing_number = scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day
436
-          }else{
437
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency)) * scope.row.day / scope.row.drug.min_number) 
438
-          }
439
-        }else{
440
-          if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
441
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose) 
442
-          }else{
443
-            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)
444
-          }
445
-        }
446
-        if(scope.row.prescribing_number == 0){
447
-          scope.row.prescribing_number = 1
448
-        }
433
+
434
+        // console.log('scope',scope)
435
+        // if(scope.row.drug.min_unit == scope.row.single_dose_unit){
436
+        //   if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
437
+        //     scope.row.prescribing_number = scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day
438
+        //   }else{
439
+        //     scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency)) * scope.row.day / scope.row.drug.min_number) 
440
+        //   }
441
+        // }else{
442
+        //   if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
443
+        //     scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose) 
444
+        //   }else{
445
+        //     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)
446
+        //   }
447
+        // }
448
+        // if(scope.row.prescribing_number == 0){
449
+        //   scope.row.prescribing_number = 1
450
+        // }
449
         if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
451
         if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
450
-          scope.row.retail_price = scope.row.drug.min_number / scope.row.retail_price
452
+          scope.row.retail_price = scope.row.drug.min_price
451
           if(scope.row.prescribing_number > scope.row.drug.total){
453
           if(scope.row.prescribing_number > scope.row.drug.total){
452
             this.$message.error(scope.row.drug_name + '库存不足')
454
             this.$message.error(scope.row.drug_name + '库存不足')
453
           }
455
           }
455
           if((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total){
457
           if((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total){
456
             this.$message.error(scope.row.drug_name + '库存不足')
458
             this.$message.error(scope.row.drug_name + '库存不足')
457
           }
459
           }
458
-          scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
460
+          scope.row.retail_price = scope.row.drug.retail_price
459
         }
461
         }
460
       },
462
       },
461
       changePrescribingNumber(scope){
463
       changePrescribingNumber(scope){