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

增加显示毒性药品处方标识

See merge request lihong/thmz_system!120

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

@@ -775,6 +775,8 @@ function printView(data) {
         $('#drugFlag').attr("value", "麻、精一");
     } else if (list[0].drugFlag == 4) {
         $('#drugFlag').attr("value", "精二");
+    } else if(list[0].drugFlag == 1){
+        $('#drugFlag').attr("value", "毒");
     }
     JsBarcode("#cfBarcode", data.patientId+'|'+data.times+'|'+data.orderNo, {
         lineColor: '#333', //线条颜色

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

@@ -2330,6 +2330,8 @@ function printView(data) {
         $('#drugFlag').attr("value", "麻、精一");
     } else if (list[0].drugFlag == 4) {
         $('#drugFlag').attr("value", "精二");
+    } else if(list[0].drugFlag == 1){
+        $('#drugFlag').attr("value", "毒");
     }
     JsBarcode("#cfBarcode", data.patientId+'|'+data.times+'|'+data.orderNo, {
         lineColor: '#333', //线条颜色