diff --git a/README.md b/README.md new file mode 100644 index 0000000..8ae256e --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +#2.0.1版本 +#2.0.2版本 2021-12-20 +1.修改借阅申请和审批的时间查询兼容sqlServer2016 +2.修改兼容sqlServer2016的控制中心模块 \ No newline at end of file diff --git a/src/main/java/com/emr/controller/otherManage/monitoringCenterController.java b/src/main/java/com/emr/controller/otherManage/monitoringCenterController.java index d213907..ab6c6ba 100644 --- a/src/main/java/com/emr/controller/otherManage/monitoringCenterController.java +++ b/src/main/java/com/emr/controller/otherManage/monitoringCenterController.java @@ -68,19 +68,20 @@ public class monitoringCenterController { commomNum = commomMapper.selectCommomCount(); lockNum = emrLockMapper.selectCountLocking(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String nowDate = sdf.format(new Date()); List apply_approves = applyApproveMapper.selectCountByApproveState(); for (Emr_Apply_Approve approve : apply_approves){ try { - if (sdf.parse(approve.getEffeTime()).compareTo(new Date()) > 0){ + if (approve.getEffeTime().compareTo(nowDate) > 0){ applyApproveNum += 1; } - } catch (ParseException e) { + } catch (Exception e) { e.printStackTrace(); } } List applyApproves = applyApproveMapper.selectCountByApproveStateIsNull(); for (Emr_Apply_Approve approve : applyApproves){ - if (sdf.parse(approve.getEffeTime()).compareTo(new Date()) > 0){ + if (approve.getEffeTime().compareTo(nowDate) > 0){ applyApproveNullNum += 1; } } @@ -88,7 +89,7 @@ public class monitoringCenterController { phCount = scanPathMapper.selectCountPh(); //查询图像总数 pdfCount = scanPathMapper.selectCountPdf(); - } catch (ParseException e) { + } catch (Exception e) { ExceptionPrintUtil.printException(e); e.printStackTrace(); } diff --git a/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml b/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml index 9e8f740..2184d41 100644 --- a/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml +++ b/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml @@ -239,7 +239,7 @@ FROM emr_apply_approve WHERE - effe_time > GETDATE() -1 + effe_time > convert(varchar(10),getdate()-1,23) AND approve_state = '1' AND @@ -263,7 +263,7 @@ FROM emr_apply_approve WHERE - effe_time > GETDATE() -1 + effe_time > convert(varchar(10),getdate()-1,120) AND apply_state = '2' AND @@ -315,11 +315,11 @@ a.dis_date, a.approve_notes, a.patient_id, - CASE WHEN effe_time <= GETDATE() THEN '已过期' WHEN apply_state='1' THEN '未提交' WHEN apply_state='2' THEN '已提交' + CASE WHEN effe_time <= convert(varchar(10),getdate(),23) THEN '已过期' WHEN apply_state='1' THEN '未提交' WHEN apply_state='2' THEN '已提交' END apply_state, a.approver, a.approve_time, - CASE WHEN effe_time <= GETDATE() THEN '已过期' WHEN approve_state = '1' THEN '审核通过' WHEN approve_state='2' THEN + 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 '待审批' END approve_state, c.name, CASE WHEN emr_lock.id is null THEN 0 ELSE 1 END lockStatus @@ -373,11 +373,11 @@ AND a.apply_type = ${record.applyType} - AND (CASE WHEN effe_time <= GETDATE() THEN '已过期' WHEN apply_state='1' THEN '未提交' WHEN apply_state='2' + AND (CASE WHEN effe_time <= convert(varchar(10),getdate(),23) THEN '已过期' WHEN apply_state='1' THEN '未提交' WHEN apply_state='2' THEN '已提交' END) = #{record.applyState} - AND (CASE WHEN effe_time <= GETDATE() THEN '已过期' WHEN approve_state = '1' THEN '审核通过' WHEN + 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 '待审批' END) = #{record.approveState} @@ -400,11 +400,11 @@ a.dis_date, a.approve_notes, a.patient_id, - CASE WHEN effe_time <= GETDATE() THEN '已过期' WHEN apply_state='1' THEN '未提交' WHEN apply_state='2' THEN '已提交' + CASE WHEN effe_time <= convert(varchar(10),getdate(),23) THEN '已过期' WHEN apply_state='1' THEN '未提交' WHEN apply_state='2' THEN '已提交' END apply_state, a.approver, a.approve_time, - CASE WHEN effe_time <= GETDATE() THEN '已过期' WHEN approve_state = '1' THEN '审核通过' WHEN approve_state='2' THEN + 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 '待审批' END approve_state, c.name, CASE WHEN emr_lock.id is null THEN 0 ELSE 1 END lockStatus @@ -458,11 +458,11 @@ AND a.apply_type = ${record.applyType} - AND (CASE WHEN effe_time <= GETDATE() THEN '已过期' WHEN apply_state='1' THEN '未提交' WHEN apply_state='2' + AND (CASE WHEN effe_time <= convert(varchar(10),getdate(),23) THEN '已过期' WHEN apply_state='1' THEN '未提交' WHEN apply_state='2' THEN '已提交' END) = #{record.applyState} - AND (CASE WHEN effe_time <= GETDATE() THEN '已过期' WHEN approve_state = '1' THEN '审核通过' WHEN + 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 '待审批' END) = #{record.approveState} @@ -541,11 +541,11 @@ a.inpatient_no, a.admiss_times, a.approve_notes, - CASE WHEN effe_time <= GETDATE() THEN '已过期' WHEN apply_state=1 THEN '未提交' WHEN apply_state=2 THEN '已提交' END + CASE WHEN effe_time <= convert(varchar(10),getdate(),23) THEN '已过期' WHEN apply_state=1 THEN '未提交' WHEN apply_state=2 THEN '已提交' END apply_state, a.approver, a.approve_time, - CASE WHEN effe_time <= GETDATE() THEN '已过期' WHEN approve_state = 1 THEN '审核通过' WHEN approve_state=2 THEN + 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 '待审批' END approve_state, c.name, c.dis_date, @@ -594,7 +594,7 @@ COUNT(1) FROM emr_apply_approve where approve_state = 1 - AND effe_time > GETDATE() + AND effe_time > convert(varchar(10),getdate(),23) AND applyer = #{userName} AND patient_id = #{patientId}