Merge branch 'dev-1.1.4' into 'dev-1.1.4'

FYI

See merge request lihong/thmz_system!83

src/main/java/cn/hnthyy/thmz/mapper/his/yp/YpPdQueueMapper.java

@@ -13,10 +13,10 @@ public interface YpPdQueueMapper {
             " values (#{patientId}, #{times}, #{idCard}, #{status}, #{pdTime}, #{sortNo})")
     int insertYpPdQueue(YpPdQueue ypPdQueue);
 
-    @Select(" select max(sort_no) as sort_no from yp_pd_queue where CONVERT(VARCHAR(100), pd_time, 23) = CONVERT(VARCHAR(100), GETDATE(), 23) ")
+    @Select(" select max(sort_no) as sort_no from yp_pd_queue with(nolock) where CONVERT(VARCHAR(100), pd_time, 23) = CONVERT(VARCHAR(100), GETDATE(), 23) ")
     String selectYpPdMaxSort();
 
-    @Select("select top 1 * from yp_pd_queue where patient_id = #{patientId} and CONVERT(VARCHAR(100), pd_time, 23) = CONVERT(VARCHAR(100), GETDATE(), 23) ")
+    @Select("select top 1 * from yp_pd_queue with(nolock) where patient_id = #{patientId} and CONVERT(VARCHAR(100), pd_time, 23) = CONVERT(VARCHAR(100), GETDATE(), 23) ")
     YpPdQueue selectYpPdQueueByPatientId(@Param("patientId") String patientId);
 
     @Update("update yp_pd_queue set status = '1' where patient_id = #{patientId} and CONVERT(VARCHAR(100), pd_time, 23) = CONVERT(VARCHAR(100), GETDATE(), 23) ")