merge

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzChargeDetailServiceImpl.java

@@ -130,6 +130,9 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
     @Autowired
     private YpZdDictService ypZdDictService;
     @Autowired
+    private MzyReqrecService mzyReqrecService;
+    @Autowired
+    private YpZdGroupNameService ypZdGroupNameService;
     //解决循环依赖
     @Lazy
     private OrderStatusChangeService orderStatusChangeService;
@@ -237,6 +240,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
     private MzOrderLockMapper mzOrderLockMapper;
     @Resource
     private WpMzPrescriptionService wpMzPrescriptionService;
+
     @Resource
     private WxmallPackagePurchasedItemService wxmallPackagePurchasedItemService;
     @Resource
@@ -1659,7 +1663,6 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
             }
         }
         if(NumberEnum.ONE.getCode().equals(mzPrescriptionVo.getGhFeeFlag())){
-           ZdChargeItem zdChargeItem = zdChargeItemService.queryZdChargeItemGhFeeByEmpCode(mzPrescriptionVo.getDoctorCode());
            if(zdChargeItem == null || zdChargeItem.getChargeAmount() == null || BigDecimal.ZERO.compareTo(zdChargeItem.getChargeAmount()) == 0){
                throw new MzException("选择收取挂号费,您未配置收取的挂号类别或配置的费用已停用,请先配置!");
            }