linjj
/
emr_record_czry
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改兼容sqlServer2016时间格式

Browse Source
master
zengwh 4 years ago
parent 702d5e09a7
commit 2634ed2ede
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File

4
README.md
Unescape Escape View File

@ -0,0 +1,4 @@
#2.0.1版本
#2.0.2版本 2021-12-20
1.修改借阅申请和审批的时间查询兼容sqlServer2016
2.修改兼容sqlServer2016的控制中心模块

9
src/main/java/com/emr/controller/otherManage/monitoringCenterController.java
Unescape Escape View File

@ -68,19 +68,20 @@ public class monitoringCenterController {
commomNum = commomMapper.selectCommomCount(); commomNum = commomMapper.selectCommomCount();
lockNum = emrLockMapper.selectCountLocking(); lockNum = emrLockMapper.selectCountLocking();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
String nowDate = sdf.format(new Date());
List<Emr_Apply_Approve> apply_approves = applyApproveMapper.selectCountByApproveState(); List<Emr_Apply_Approve> apply_approves = applyApproveMapper.selectCountByApproveState();
for (Emr_Apply_Approve approve : apply_approves){ for (Emr_Apply_Approve approve : apply_approves){
try { try {
if (sdf.parse(approve.getEffeTime()).compareTo(new Date()) > 0){ if (approve.getEffeTime().compareTo(nowDate) > 0){
applyApproveNum += 1; applyApproveNum += 1;
} }
} catch (ParseException e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
List<Emr_Apply_Approve> applyApproves = applyApproveMapper.selectCountByApproveStateIsNull(); List<Emr_Apply_Approve> applyApproves = applyApproveMapper.selectCountByApproveStateIsNull();
for (Emr_Apply_Approve approve : applyApproves){ for (Emr_Apply_Approve approve : applyApproves){
if (sdf.parse(approve.getEffeTime()).compareTo(new Date()) > 0){ if (approve.getEffeTime().compareTo(nowDate) > 0){
applyApproveNullNum += 1; applyApproveNullNum += 1;
} }
} }
@ -88,7 +89,7 @@ public class monitoringCenterController {
phCount = scanPathMapper.selectCountPh(); phCount = scanPathMapper.selectCountPh();
//查询图像总数 //查询图像总数
pdfCount = scanPathMapper.selectCountPdf(); pdfCount = scanPathMapper.selectCountPdf();
} catch (ParseException e) { } catch (Exception e) {
ExceptionPrintUtil.printException(e); ExceptionPrintUtil.printException(e);
e.printStackTrace(); e.printStackTrace();
} }

26
src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml
Unescape Escape View File

@ -239,7 +239,7 @@
FROM FROM
emr_apply_approve emr_apply_approve
WHERE WHERE
effe_time > GETDATE() -1 effe_time > convert(varchar(10),getdate()-1,23)
AND AND
approve_state = '1' approve_state = '1'
AND AND
@ -263,7 +263,7 @@
FROM FROM
emr_apply_approve emr_apply_approve
WHERE WHERE
effe_time > GETDATE() -1 effe_time > convert(varchar(10),getdate()-1,120)
AND AND
apply_state = '2' apply_state = '2'
AND AND
@ -315,11 +315,11 @@
a.dis_date, a.dis_date,
a.approve_notes, a.approve_notes,
a.patient_id, a.patient_id,
CASE WHEN effe_time &lt;= GETDATE() THEN '已过期' WHEN apply_state='1' THEN '未提交' WHEN apply_state='2' THEN '已提交' CASE WHEN effe_time &lt;= convert(varchar(10),getdate(),23) THEN '已过期' WHEN apply_state='1' THEN '未提交' WHEN apply_state='2' THEN '已提交'
END apply_state, END apply_state,
a.approver, a.approver,
a.approve_time, a.approve_time,
CASE WHEN effe_time &lt;= GETDATE() THEN '已过期' WHEN approve_state = '1' THEN '审核通过' WHEN approve_state='2' THEN CASE WHEN effe_time &lt;= 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, '审核不通过' WHEN approve_state is null THEN '待审批' END approve_state,
c.name, c.name,
CASE WHEN emr_lock.id is null THEN 0 ELSE 1 END lockStatus CASE WHEN emr_lock.id is null THEN 0 ELSE 1 END lockStatus
@ -373,11 +373,11 @@
AND a.apply_type = ${record.applyType} AND a.apply_type = ${record.applyType}
</if> </if>
<if test="record.applyState != '' and record.applyState != null"> <if test="record.applyState != '' and record.applyState != null">
AND (CASE WHEN effe_time &lt;= GETDATE() THEN '已过期' WHEN apply_state='1' THEN '未提交' WHEN apply_state='2' AND (CASE WHEN effe_time &lt;= convert(varchar(10),getdate(),23) THEN '已过期' WHEN apply_state='1' THEN '未提交' WHEN apply_state='2'
THEN '已提交' END) = #{record.applyState} THEN '已提交' END) = #{record.applyState}
</if> </if>
<if test="record.approveState != '' and record.approveState != null"> <if test="record.approveState != '' and record.approveState != null">
AND (CASE WHEN effe_time &lt;= GETDATE() THEN '已过期' WHEN approve_state = '1' THEN '审核通过' WHEN AND (CASE WHEN effe_time &lt;= 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 '待审批' approve_state='2' THEN '审核不通过' WHEN approve_state is null THEN '待审批' WHEN approve_state = '' THEN '待审批'
END) = #{record.approveState} END) = #{record.approveState}
</if> </if>
@ -400,11 +400,11 @@
a.dis_date, a.dis_date,
a.approve_notes, a.approve_notes,
a.patient_id, a.patient_id,
CASE WHEN effe_time &lt;= GETDATE() THEN '已过期' WHEN apply_state='1' THEN '未提交' WHEN apply_state='2' THEN '已提交' CASE WHEN effe_time &lt;= convert(varchar(10),getdate(),23) THEN '已过期' WHEN apply_state='1' THEN '未提交' WHEN apply_state='2' THEN '已提交'
END apply_state, END apply_state,
a.approver, a.approver,
a.approve_time, a.approve_time,
CASE WHEN effe_time &lt;= GETDATE() THEN '已过期' WHEN approve_state = '1' THEN '审核通过' WHEN approve_state='2' THEN CASE WHEN effe_time &lt;= 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, '审核不通过' WHEN approve_state is null THEN '待审批' WHEN approve_state = '' THEN '待审批' END approve_state,
c.name, c.name,
CASE WHEN emr_lock.id is null THEN 0 ELSE 1 END lockStatus CASE WHEN emr_lock.id is null THEN 0 ELSE 1 END lockStatus
@ -458,11 +458,11 @@
AND a.apply_type = ${record.applyType} AND a.apply_type = ${record.applyType}
</if> </if>
<if test="record.applyState != '' and record.applyState != null"> <if test="record.applyState != '' and record.applyState != null">
AND (CASE WHEN effe_time &lt;= GETDATE() THEN '已过期' WHEN apply_state='1' THEN '未提交' WHEN apply_state='2' AND (CASE WHEN effe_time &lt;= convert(varchar(10),getdate(),23) THEN '已过期' WHEN apply_state='1' THEN '未提交' WHEN apply_state='2'
THEN '已提交' END) = #{record.applyState} THEN '已提交' END) = #{record.applyState}
</if> </if>
<if test="record.approveState != '' and record.approveState != null"> <if test="record.approveState != '' and record.approveState != null">
AND (CASE WHEN effe_time &lt;= GETDATE() THEN '已过期' WHEN approve_state = '1' THEN '审核通过' WHEN AND (CASE WHEN effe_time &lt;= 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 '待审批' approve_state='2' THEN '审核不通过' WHEN approve_state is null THEN '待审批' WHEN approve_state = '' THEN '待审批'
END) = #{record.approveState} END) = #{record.approveState}
</if> </if>
@ -541,11 +541,11 @@
a.inpatient_no, a.inpatient_no,
a.admiss_times, a.admiss_times,
a.approve_notes, a.approve_notes,
CASE WHEN effe_time &lt;= GETDATE() THEN '已过期' WHEN apply_state=1 THEN '未提交' WHEN apply_state=2 THEN '已提交' END CASE WHEN effe_time &lt;= convert(varchar(10),getdate(),23) THEN '已过期' WHEN apply_state=1 THEN '未提交' WHEN apply_state=2 THEN '已提交' END
apply_state, apply_state,
a.approver, a.approver,
a.approve_time, a.approve_time,
CASE WHEN effe_time &lt;= GETDATE() THEN '已过期' WHEN approve_state = 1 THEN '审核通过' WHEN approve_state=2 THEN CASE WHEN effe_time &lt;= 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, '审核不通过' WHEN approve_state is null THEN '待审批' WHEN approve_state = '' THEN '待审批' END approve_state,
c.name, c.name,
c.dis_date, c.dis_date,
@ -594,7 +594,7 @@
COUNT(1) COUNT(1)
FROM emr_apply_approve FROM emr_apply_approve
where approve_state = 1 where approve_state = 1
AND effe_time > GETDATE() AND effe_time > convert(varchar(10),getdate(),23)
AND applyer = #{userName} AND applyer = #{userName}
AND patient_id = #{patientId} AND patient_id = #{patientId}
<choose> <choose>

Write Preview
Loading…
Cancel
Save