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

@@ -82,6 +82,7 @@ import org.springframework.util.CollectionUtils;
import java.io.IOException;
import java.io.OutputStream;
import java.lang.Boolean;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.*;
@@ -1946,16 +1947,12 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
    public Double getInfoFee(List<WlyyPrescriptionInfoDO> infoDOs) {
        DecimalFormat df = new DecimalFormat("#.00");
        Double fee = 0D;
        try {
            if (infoDOs != null && infoDOs.size() > 0) {
                for (WlyyPrescriptionInfoDO info : infoDOs) {
                    Integer quantity = Integer.parseInt(info.getQuantity());
                    fee += info.getPackRetprice() * quantity;
                    logger.error("getInfoFee:" +fee);
                }
        if (infoDOs != null && infoDOs.size() > 0) {
            for (WlyyPrescriptionInfoDO info : infoDOs) {
                Integer quantity = Integer.parseInt(info.getQuantity());
                fee += info.getPackRetprice() * quantity;
                logger.error("getInfoFee===========:" +fee);
            }
        } catch (Exception e) {
            logger.error("getInfoFee:" + e.toString());
        }
        fee = Double.parseDouble(df.format(fee));
        return fee;