Merge branch 'dev-1.1.4' into 'dev-1.1.4'

优化用量计算

See merge request lihong/thmz_system!114

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

@@ -1050,7 +1050,7 @@ function xyfdy(res) {
             $("#NO").attr("value", j + 1 + "/" + drugs.length);
             //用法
             let yf = drugs[j].printName + ',';
-            if (drugs[j].drugUnitName == '粒' || drugs[j].drugUnitName == '片' || drugs[j].drugUnitName == '支' || drugs[j].drugUnitName == '袋' || drugs[j].drugUnitName == '包') {
+            if (drugs[j].drugUnitName == '粒' || drugs[j].drugUnitName == '片' || drugs[j].drugUnitName == '支' || drugs[j].drugUnitName == '袋' || drugs[j].drugUnitName == '包' || drugs[j].drugUnitName == '丸') {
                 $("#ypbq_comm").attr("value", yf + drugs[j].comm + ',每次' + (drugs[j].drugQuan == 0.5 ? '半' : drugs[j].drugQuan) + drugs[j].drugUnitName);
             } else if ((drugs[j].weight == null && drugs[j].volum == null) || (drugs[j].weight != null && drugs[j].volum != null)) {
                 $("#ypbq_comm").attr("value", yf + drugs[j].comm + ',每次' + drugs[j].drugQuan + drugs[j].drugUnitName);