diff --git a/src/main/resources/config/README.md b/src/main/resources/config/README.md index e760176..15b17ae 100644 --- a/src/main/resources/config/README.md +++ b/src/main/resources/config/README.md @@ -7,4 +7,4 @@ #2.0.4 2022-01-05 解决xp系统使用病案预览全屏按钮点击失效问题 #2.0.5 2022-01-14 -升级mybatis安全漏洞3.2.8->3.5.7、mybatis-spring1.2.2->1.3.2 +升级mybatis安全漏洞3.2.8->3.5.7、mybatis-spring1.2.2->1.3.2,借阅申请、审批列表放开已过期 diff --git a/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml b/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml index b2723c8..14e23cb 100644 --- a/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml +++ b/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml @@ -457,10 +457,10 @@ AND a.apply_type = ${record.applyType} - + AND (CASE WHEN effe_time <= convert(varchar(10),getdate(),23) THEN '已过期' WHEN approve_state = '1' THEN '审核通过' WHEN approve_state='2' THEN '审核不通过' WHEN approve_state is null THEN '待审批' WHEN approve_state = '' THEN '待审批'