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

src/xt_pages/hospitalStation/components/callPrescription.vue

@@ -260,7 +260,8 @@
                 single_dose_unit:prescription.doctor_advice[b].single_dose_unit,
                 prescribing_number_unit:prescription.doctor_advice[b].prescribing_number_unit,
                 medical_insurance_number:prescription.doctor_advice[b].med_list_codg,
-                id:prescription.doctor_advice[b].drug_id
+                id:prescription.doctor_advice[b].drug_id,
+                drug:prescription.doctor_advice[b].drug,
               };
               tempAdvice.push(obj)
 

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -685,7 +685,10 @@
               obj['id'] = drug_month_prescriptions.advices[a].drug_id;
               // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
               obj['retail_price'] = parseFloat(drug_month_prescriptions.advices[a].price);
-              count = count + drug_month_prescriptions.advices[a].prescribing_number
+              obj['drug'] = drug_month_prescriptions.advices[a].drug;
+
+
+                      count = count + drug_month_prescriptions.advices[a].prescribing_number
 
             }
           }
@@ -1017,7 +1020,10 @@
                       single_dose_unit: prescription.advices[b].single_dose_unit,
                       prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                       medical_insurance_number: prescription.advices[b].med_list_codg,
-                      id: prescription.advices[b].drug_id
+                      id: prescription.advices[b].drug_id,
+                      drug:prescription.advices[b].drug,
+
+
                     };
                     tempAdvice.push(obj)
                   }
@@ -1132,7 +1138,9 @@
                       single_dose_unit: prescription.advices[b].single_dose_unit,
                       prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                       medical_insurance_number: prescription.advices[b].med_list_codg,
-                      id: prescription.advices[b].drug_id
+                      id: prescription.advices[b].drug_id,
+                      drug:prescription.advices[b].drug,
+
                     };
                     tempAdvice.push(obj)
                   }
@@ -2415,7 +2423,8 @@
                   prescribing_number: temp[b].prescribing_number,
                   single_dose_unit: temp[b].min_unit,
                   prescribing_number_unit: temp[b].max_unit,
-                  medical_insurance_number: temp[b].medical_insurance_number
+                  medical_insurance_number: temp[b].medical_insurance_number,
+                  drug: temp[b],
 
                 };
 

src/xt_pages/hospitalStation/components/nextOrLastPrescription.vue

@@ -317,7 +317,8 @@
                 single_dose_unit:prescription.doctor_advice[b].single_dose_unit,
                 prescribing_number_unit:prescription.doctor_advice[b].prescribing_number_unit,
                 medical_insurance_number:prescription.doctor_advice[b].med_list_codg,
-                id:prescription.doctor_advice[b].drug_id
+                id:prescription.doctor_advice[b].drug_id,
+                drug:prescription.doctor_advice[b].drug,
               };
               tempAdvice.push(obj)
 

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -463,6 +463,8 @@
               obj['id'] = drug_month_prescriptions.advices[a].drug_id;
               // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
               obj['retail_price'] = parseFloat(drug_month_prescriptions.advices[a].price);
+              obj['drug'] = drug_month_prescriptions.advices[a].drug
+
               count = count + drug_month_prescriptions.advices[a].prescribing_number
 
             }
@@ -873,7 +875,8 @@
                     single_dose_unit: prescription.advices[b].single_dose_unit,
                     prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                     medical_insurance_number: prescription.advices[b].med_list_codg,
-                    id: prescription.advices[b].drug_id
+                    id: prescription.advices[b].drug_id,
+                    drug:prescription.advices[b].drug,
                   };
                   tempAdvice.push(obj)
                 }
@@ -1078,7 +1081,8 @@
                           single_dose_unit: prescription.advices[b].single_dose_unit,
                           prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                           medical_insurance_number: prescription.advices[b].med_list_codg,
-                          id: prescription.advices[b].drug_id
+                          id: prescription.advices[b].drug_id,
+                          drug:prescription.advices[b].drug,
                         };
                         tempAdvice.push(obj)
                       }
@@ -1258,7 +1262,9 @@
                           single_dose_unit: prescription.advices[b].single_dose_unit,
                           prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                           medical_insurance_number: prescription.advices[b].med_list_codg,
-                          id: prescription.advices[b].drug_id
+                          id: prescription.advices[b].drug_id,
+                          drug:prescription.advices[b].drug,
+
                         };
                         tempAdvice.push(obj)
                       }
@@ -1442,7 +1448,9 @@
                           single_dose_unit: prescription.advices[b].single_dose_unit,
                           prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                           medical_insurance_number: prescription.advices[b].med_list_codg,
-                          id: prescription.advices[b].drug_id
+                          id: prescription.advices[b].drug_id,
+                          drug:prescription.advices[b].drug,
+
                         };
                         tempAdvice.push(obj)
                       }
@@ -1677,7 +1685,9 @@
                         single_dose_unit: prescription.advices[b].single_dose_unit,
                         prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                         medical_insurance_number: prescription.advices[b].med_list_codg,
-                        id: prescription.advices[b].drug_id
+                        id: prescription.advices[b].drug_id,
+                        drug:prescription.advices[b].drug,
+
                       };
                       tempAdvice.push(obj)
                     }
@@ -1865,7 +1875,9 @@
                       single_dose_unit: prescription.advices[b].single_dose_unit,
                       prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                       medical_insurance_number: prescription.advices[b].med_list_codg,
-                      id: prescription.advices[b].drug_id
+                      id: prescription.advices[b].drug_id,
+                      drug:prescription.advices[b].drug,
+
                     };
                     tempAdvice.push(obj)
                   }