打印标签每次用量调整

src/main/resources/static/js/mz/west_pharmacy_send.js

@@ -768,10 +768,14 @@ function printInjectionOralMedicine(patientId, orderNo, realNo, times, receiptNo
                         $("#ypbq_sex").attr("value", getSex(drugs[0].sex));
                         $("#ypbq_age").attr("value", drugs[0].age);
                         $("#NO").attr("value", j + 1 + "/" + drugs.length);
-                        //每次用量计算 通过一次剂量单位截取同单位的最小药品规格
-                        //drugs[j].specification.slice();
-                        let weight = (drugs[j].weight == '' || drugs[j].weight == null) ? drugs[j].volum : drugs[j].weight;
-                        $("#ypbq_comm").attr("value", drugs[j].comm + ',每次' + drugs[j].drugQuan / weight + drugs[j].miniUnitName);
+                        if((drugs[j].weight == null && drugs[j].volum == null) || (drugs[j].weight != null && drugs[j].volum != null)){
+                            $("#ypbq_comm").attr("value", drugs[j].comm + ',每次' + drugs[j].drugQuan + drugs[j].drugUnitName);
+                        }else{
+                            let weight = (drugs[j].weight == '' || drugs[j].weight == null) ? drugs[j].volum : drugs[j].weight;
+                            var drugQuan = (drugs[j].drugQuan / weight).toFixed(2);
+                            drugQuan = Math.round(drugQuan*100)/100;
+                            $("#ypbq_comm").attr("value", drugs[j].comm + ',每次' + drugQuan + drugs[j].miniUnitName);
+                        }
                         LODOP.ADD_PRINT_HTM("5mm", "5mm", "RightMargin:5mm", "BottomMargin:5mm", $("div[id='print_view_bq']").html());
                         LODOP.NewPage();//下一页
                     }

src/main/resources/templates/mz/west_pharmacy_send.html

@@ -226,7 +226,7 @@
                                    disabled value="" id="ypbq_ypUnitName"/>
                             <br/>
                             <span>用法用量:</span>
-                            <input style="border: 0px;width: 50px;background-color: white;color: black;"
+                            <input style="border: 0px;width: 60px;background-color: white;color: black;"
                                    disabled value="" id="ypbq_printName"/>
                             <input style="border: 0px;width: 120px;background-color: white;color: black;"
                                    disabled value="" id="ypbq_comm"/>