解决冲突问题

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

@@ -245,7 +245,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         MzPatientMi mzPatientMi = mzPatientMiService.queryByPatientId(mzChargeDetail.getPatientId());
         List<MzChargeDetail> mzChargeDetailList = mzChargeDetailMapper.selectMzChargeDetailByPatientId(mzChargeDetail.getPatientId(), mzChargeDetail.getTimes(),null, PayMarkEnum.NO_CHARGE.code);
         Integer maxOrderNo = 0;
-        Integer itemNo = 1;
+        Integer itemNo = 100;
         Date priceTime = null;
         String priceId = null;
         if (mzChargeDetailList != null && mzChargeDetailList.size() > 0) {