毒麻精显示，用量显示

src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzPharmacyMapper.java

@@ -717,7 +717,7 @@ public interface MzPharmacyMapper {
             "a.group_no ," +
             "#{confirmTime}," +
             "b.name ," +
-            "left(b.specification,16)specification ," +
+            "left(b.specification,8)specification ," +
             "#{confirmId}," +
             "#{confirmName}," +
             "#{doctorId}," +

src/main/java/cn/hnthyy/thmz/vo/MzSendMedicineVo.java

@@ -109,4 +109,6 @@ public class MzSendMedicineVo implements Serializable {
     private String supplyCode;
     //频率
     private String frequency;
+    //毒麻标志:1:毒;2:麻;3:精神1;4:精神2
+    private String drugFlag;
 }

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

@@ -277,8 +277,8 @@ function prescriptionDetail(realNo, groupNo, orderNo, receiptNo, times, patientI
                 align: "center",
                 valign: 'middle',
             }
-            /* , {
-                 field: 'drug_flag',//毒麻标志:1:毒;2:麻;3:精神1;4:精神2
+            , {
+                 field: 'drugFlag',//毒麻标志:1:毒;2:麻;3:精神1;4:精神2
                  title: '<span style="color: red">毒麻</span>',
                  align: "center",
                  valign: 'middle',
@@ -295,7 +295,7 @@ function prescriptionDetail(realNo, groupNo, orderNo, receiptNo, times, patientI
                          return '<span style="color: red">-</span>'
                      }
                  }
-             }*/
+             }
             , {
                 field: 'stockAmount',
                 title: '当前库存',
@@ -356,8 +356,7 @@ function queryParams(params) {
             confirmFlag: $("#dispensingStatusSearch").val() == "" ? null : $("#dispensingStatusSearch").val(),
             payMark: 0, //已收费
             groupNo: 71, //门诊西药房
-            windowsNoYf: '04', //4号窗口
-            groupType: '1' //西药
+            windowsNoYf: '04' //4号窗口
         }
     };
     return temp;
@@ -428,11 +427,6 @@ function printPrescription(patientId, times, orderNo) {
                     }
                 }
                 var list = res.data.list;
-                /*if (list[0].drugFlag == 2 || list[0].drugFlag == 3) {
-                    $('#drugFlag').attr("value", "麻、精一");
-                } else if (list[0].drugFlag == 4) {
-                    $('#drugFlag').attr("value", "精二");
-                }else */
                 if (res.data.warnDeptName.indexOf("儿科") != -1) {
                     $('#drugFlag').attr("value", "儿科");
                     printIndex = ekCfPrintIndex;
@@ -443,6 +437,11 @@ function printPrescription(patientId, times, orderNo) {
                     $('#drugFlag').attr("value", "普通");
                     printIndex = mzCfPrintIndex;
                 }
+                if (list[0].drugFlag == 2 || list[0].drugFlag == 3) {
+                    $('#drugFlag').attr("value", "麻、精一");
+                } else if (list[0].drugFlag == 4) {
+                    $('#drugFlag').attr("value", "精二");
+                }
                 $('#priceTime').attr("value", format(list[0].priceTime, "yyyy-MM-dd HH:mm"));
                 $('#employeeName').attr("value", res.data.employeeName + "/" + res.data.employeeCode);
                 if (res.data.sex == 1) {

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

@@ -768,12 +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);
-                        if((drugs[j].weight == null && drugs[j].volum == null) || (drugs[j].weight != null && drugs[j].volum != null)){
+                        if(drugs[j].drugUnitName == '粒' || drugs[j].drugUnitName == '片'|| drugs[j].drugUnitName == '支'){
+                            $("#ypbq_comm").attr("value", drugs[j].comm + ',每次' + 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", 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);
-                            if(drugQuan == 0){
+                            if(drugQuan < 1){
                                 $("#ypbq_comm").attr("value", drugs[j].comm + ',每次' + drugs[j].drugQuan + drugs[j].drugUnitName);
                             }else{
                                 drugQuan = Math.round(drugQuan*100)/100;
@@ -1045,8 +1047,8 @@ function prescriptionDetail(realNo, groupNo, orderNo, receiptNo, times, patientI
                 align: "center",
                 valign: 'middle',
             }
-            /* , {
-                 field: 'drug_flag',//毒麻标志:1:毒;2:麻;3:精神1;4:精神2
+             , {
+                 field: 'drugFlag',//毒麻标志:1:毒;2:麻;3:精神1;4:精神2
                  title: '<span style="color: red">毒麻</span>',
                  align: "center",
                  valign: 'middle',
@@ -1063,7 +1065,7 @@ function prescriptionDetail(realNo, groupNo, orderNo, receiptNo, times, patientI
                          return '<span style="color: red">-</span>'
                      }
                  }
-             }*/
+             }
             , {
                 field: 'stockAmount',
                 title: '当前库存',