Merge branch 'dev-1.0.9' into dev-1.1.0

src/main/java/cn/hnthyy/thmz/service/impl/his/MzyReqrecServiceImpl.java

@@ -246,7 +246,7 @@ public class MzyReqrecServiceImpl implements MzyReqrecService {
         mzyReqrec.setDcountNo(YesNoEnum.NO.code);
         mzyReqrec.setPrintDcountNo(YesNoEnum.NO.code);
         //节假日减免挂号费，不收挂号费
-        if (notPayGhFee(mzyReqrec.getUnitCode(), mzyReqrec.getRequestDay(), mzyRequest.getAmpm())) {
+        if (Constants.BRZZJF_CODE.equals(mzyReqrec.getOpId()) && notPayGhFee(mzyReqrec.getUnitCode(), mzyReqrec.getRequestDay(), mzyRequest.getAmpm())) {
             mzyReqrec.setOthFee(BigDecimal.ZERO);
             mzyReqrec.setClinicFee(BigDecimal.ZERO);
             mzyReqrec.setReqFee(BigDecimal.ZERO);