Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/XzzxEntranceService.java

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -1938,6 +1938,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
    }
    /**
     * 计算药品费用
     *
@@ -1949,7 +1952,10 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        Double fee = 0D;
        if (infoDOs != null && infoDOs.size() > 0) {
            for (WlyyPrescriptionInfoDO info : infoDOs) {
                logger.error("getInfoFee===========Quantity:" +info.getQuantity());
                Integer quantity = Integer.parseInt(info.getQuantity());
                logger.error("getInfoFee===========quantity:" +quantity);
                logger.error("getInfoFee===========PackRetprice:" +info.getPackRetprice());
                fee += info.getPackRetprice() * quantity;
                logger.error("getInfoFee===========:" +fee);
            }