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

中草药发药问题修复

See merge request hurugang/thmz_system!35

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

@@ -670,8 +670,8 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
                 zyDetailChargeNew.setGenTime(now).setChargeDate(now).setChargeCode("BILL02").setChargeStatus("2").setSelfFlag("0").setOpeFlag("0").setTransFlagYb("0");
                 zyDetailChargeNew.setOpIdCode(yzActOrderCy.getDoctorCode()).setDoctorCode(yzActOrderCy.getDoctorCode());
                 zyDetailChargeNew.setInfantFlag(yzActOrderCy.getInpatientNo().indexOf("$") == -1 ? "0" : "1");
-                zyDetailChargeNew.setChargeAmount(yzActOrderCyDetail.getQuantity());
-                zyDetailChargeNew.setChargeFee(BigDecimal.valueOf(yzActOrderCyDetail.getQuantity()*yzActOrderCyDetail.getUnitPrice()));
+                zyDetailChargeNew.setChargeAmount(yzActOrderCyDetail.getQuantity()*yzActOrderCy.getQuantity());
+                zyDetailChargeNew.setChargeFee(BigDecimal.valueOf(yzActOrderCyDetail.getQuantity()*yzActOrderCyDetail.getUnitPrice()*yzActOrderCy.getQuantity()));
                 zyDetailChargeNew.setOrderNo(yzActOrderCy.getOrderNo());
                 YpZdDict ypZdDict = ypZdDictMapper.selectYpZdDictByCodeAndSerial(yzActOrderCyDetail.getChargeCode(), yzActOrderCyDetail.getSerial());
                 zyDetailChargeNew.setSeparateFlag(ypZdDict.getSeparateFlag()).setSuppressFlag(ypZdDict.getSupriceFlag());