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

进摆药机优化以及相关医嘱bug处理

See merge request hurugang/thmz_system!10

src/main/java/cn/hnthyy/thmz/service/impl/his/yf/YfWardPrescriptionServiceImpl.java

@@ -802,7 +802,7 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
                     prescription.setPrescriptionDose(yzActOrder.getDose());
 
                     prescription.setPrescriptionUnit(mzPharmacyMapper.selectYpUnitName(yzActOrder.getDoseUnit()));
-                    prescription.setDispensedUnit(mzPharmacyMapper.selectYpUnitName(yzActOrder.getMiniUnit()));
+                    prescription.setDispensedUnit(mzPharmacyMapper.selectYpUnitName(yzActOrder.getMiniUnit() == null ? ypZdDict.getMiniUnit() : yzActOrder.getMiniUnit()));
                     if(yzActOrder.getDoseUnit().equals(yzActOrder.getMiniUnit())){
                         prescription.setAmountPerPackage(1.0);
                     }else{

src/main/resources/static/js/yf/ward_prescription.js

@@ -1793,7 +1793,7 @@ function sendXy(flag) {
                 }
                 groupNo === '81'?$("#submitFlagSearch").val("4"):$("#submitFlagSearch").val("3");
                 $("#submitFlagSearch").selectpicker('refresh');
-                if (confirm("是否需要打印当前药单的口服标签并使用摆药机？")) {
+                if ('5' === pageClass || ('6' === pageClass && confirm("是否需要打印当前药单的口服标签并使用摆药机？"))) {
                     if (res.data) {
                         printLabelData(flag, 1);//口服药单，并使用摆药机
                         request({