挂号采用新的号表

src/main/java/cn/hnthyy/thmz/mapper/his/MzyRequestMapper.java

@@ -127,12 +127,12 @@ public interface MzyRequestMapper {
      * @return
      */
     @Select({"<script>",
-            "select * from mzy_request where request_day = #{requestDay,jdbcType=DATE} and unit_code=#{unitCode,jdbcType=CHAR} and ampm =#{ampm,jdbcType=CHAR}  and charge_type=#{chargeType} and left_num>0 ",
+            "select * from mzy_request_new where request_day = #{requestDay,jdbcType=DATE} and unit_code=#{unitCode,jdbcType=CHAR} and ampm =#{ampm,jdbcType=CHAR}  and charge_type=#{chargeType} and left_num>0 ",
             "<when test='doctorCode!=null'>",
             " and doctor_code=#{doctorCode} ",
             "</when>",
             "</script>"})
-    List<MzyRequest> selectOldRequestByRequestDay(@Param("requestDay") String requestDay, @Param("unitCode") String unitCode, @Param("ampm") String ampm, @Param("chargeType") String chargeType, @Param("doctorCode") String doctorCode);
+    List<MzyRequest> selectRequestByRequestDay(@Param("requestDay") String requestDay, @Param("unitCode") String unitCode, @Param("ampm") String ampm, @Param("chargeType") String chargeType, @Param("doctorCode") String doctorCode);
 
     /**
      * 退号时需要将号表数据返回

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

@@ -70,7 +70,7 @@ public class MzyRequestServiceImpl implements MzyRequestService {
         List<MzyZdChargeType> list = new ArrayList<>();
         chargeTypes.forEach(ct -> {
             if (StringUtils.isNotBlank(ct)) {
-                List<MzyRequest> mzyRequests = mzyRequestMapper.selectOldRequestByRequestDay(requestDay, unitCode, ampm, ct, null);
+                List<MzyRequest> mzyRequests = mzyRequestMapper.selectRequestByRequestDay(requestDay, unitCode, ampm, ct, null);
                 if (mzyRequests != null && mzyRequests.size() > 0) {
                     MzyZdChargeType mzct = mzyZdChargeTypeMapper.selectByCode(ct);
                     if (mzct != null) {
@@ -89,7 +89,7 @@ public class MzyRequestServiceImpl implements MzyRequestService {
             throw new MzException("没有查询到匹配的可挂号表，请先创建！");
         }
 
-        List<MzyRequest> mzyRequests = mzyRequestMapper.selectOldRequestByRequestDay(DateFormatUtils.format(mzyRequest.getRequestDay(), "yyyy-MM-dd"), mzyRequest.getUnitCode(), mzyRequest.getAmpm(), mzyRequest.getChargeType(), mzyRequest.getDoctorCode());
+        List<MzyRequest> mzyRequests = mzyRequestMapper.selectRequestByRequestDay(DateFormatUtils.format(mzyRequest.getRequestDay(), "yyyy-MM-dd"), mzyRequest.getUnitCode(), mzyRequest.getAmpm(), mzyRequest.getChargeType(), mzyRequest.getDoctorCode());
         if (mzyRequests == null || mzyRequests.size() == 0) {
             throw new MzException("没有查询到匹配的可挂号表，请先创建！");
         }