emr_medicalrecord_record2.0
/
EMR_Medical_Record
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

微调去掉is_valid为1等

Browse Source
master
hujl 4 years ago
parent 94149e0c00
commit 3c237fb76d
6 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File

12
src/main/resources/mapper/Archive_MasterMapper.xml
Unescape Escape View File

@ -170,7 +170,7 @@
LEFT JOIN (select MasterID,COUNT(*) num from archive_printInfo group by MasterID) printTable
on m.id=printTable.MasterID
where 1=1
and patindex('%B%',m.inp_no) = 0 and inp_no not like 'LG%'
and patindex('%B%',m.inp_no) = 0 and inp_no not like 'LG%' and m.Is_Valid!=1
<if test="deptAdmissionTo!= null and deptAdmissionTo!= ''">
and (m.dept_admission_to in
<foreach item="item" collection="deptAdmissionTo.split(',')" open="(" separator="," close=")">
@ -293,7 +293,7 @@
LEFT JOIN (select zyh,jzh,COUNT(*) num from archive_other_ext where T2!='1801-02-03 00:00:00.000' group by zyh,jzh) extNurse
on m.inp_no=extNurse.zyh
and m.visit_id=extNurse.jzh
where 1=1 and ArchiveState in('归档中','提交','主任退回')
where 1=1 and ArchiveState in('归档中','提交','主任退回') and m.Is_Valid!=1
and patindex('%B%',m.inp_no) = 0 and inp_no not like 'LG%'
<if test="emrCmit!=null and emrCmit!=''">
<if test="emrCmit==1">
@ -427,7 +427,7 @@
and ao.sysFlag='1'
LEFT JOIN (select MasterID,COUNT(*) num from archive_printInfo group by MasterID) printTable
on m.id=printTable.MasterID
where 1=1 and ArchiveState in('初审')
where 1=1 and ArchiveState in('初审') and m.Is_Valid!=1
and patindex('%B%',m.inp_no) = 0 and inp_no not like 'LG%'
<if test="printNum != null and printNum != ''">
and m.id
@ -569,7 +569,7 @@
LEFT JOIN(select archive_detail_id,count(*) numb from emr_fault_detail where 1=1 and back_flag is not null GROUP BY archive_detail_id) s
on m.id=s.archive_detail_id
where 1=1
and m.ArchiveState not in('作废','已封存') and inp_no not like 'LG%'
and m.ArchiveState not in('作废','已封存') and m.Is_Valid!=1 and inp_no not like 'LG%'
<if test="id != null and id != ''">
and m.id = #{id,jdbcType=NVARCHAR}
</if>
@ -702,7 +702,7 @@
on m.id=printTable.MasterID
where 1=1
and patindex('%B%',m.inp_no) in (0,1)
and m.ArchiveState not in('作废','已封存') and inp_no not like 'LG%'
and m.ArchiveState not in('作废','已封存') and m.Is_Valid!=1 and inp_no not like 'LG%'
<if test="printNum != null and printNum != ''">
and m.id
<choose>
@ -842,7 +842,7 @@
LEFT JOIN (select MasterID,COUNT(*) num from archive_printInfo group by MasterID) printTable
on m.id=printTable.MasterID
where 1=1 and ArchiveState in('提交','主任退回','归档中','复审退回')
and patindex('%B%',m.inp_no) = 0 and inp_no not like 'LG%'
and patindex('%B%',m.inp_no) = 0 and inp_no not like 'LG%' and m.Is_Valid!=1
<if test="printNum != null and printNum != ''">
and m.id
<choose>

2
src/main/webapp/WEB-INF/views/faultDir/faultList.jsp
Unescape Escape View File

@ -156,6 +156,8 @@
<option value="在院">在院</option>
<option value="未归档">未归档</option>
<option value="归档中">归档中</option>
<option value="提交">提交</option>
<option value="主任退回">主任退回</option>
<option value="初审">初审</option>
<option value="已认证">已认证</option>
<option value="已归档">已归档</option>

1
src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
Unescape Escape View File

@ -478,7 +478,6 @@
<option value="">全部</option>
</select>
</div>
<div class="form-group divCss8">
<label>出院日期:</label>
<div class="input-daterange input-group" id="datepicker">

4
src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp
Unescape Escape View File

@ -124,14 +124,16 @@
<select class="selectpicker bla bla bli" multiple data-live-search="true" name="doctorInCharge" id="archivestate" title="请输入归档状态"
data-actions-box="true" data-deselect-all-text="取消全选" data-select-all-text="全选" data-none-results-text="没找到相应记录{0}">
<%-- <option value="">全部</option>--%>
<option value="取消入院">取消入院</option>
<%--<option value="取消入院">取消入院</option>--%>
<option value="在院">在院</option>
<option value="未归档">未归档</option>
<option value="归档中">归档中</option>
<option value="提交">提交</option>
<option value="主任退回">主任退回</option>
<option value="初审">初审</option>
<option value="复审退回">复审退回</option>
<option value="已归档">已归档</option>
<option value="已认证">已认证</option>
<option value="已封存">已封存</option>
</select>
</div>

20
src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorageLog.jsp
Unescape Escape View File

@ -76,15 +76,17 @@
<select class="selectpicker bla bla bli" multiple data-live-search="true" name="doctorInCharge" id="archivestate" title="请输入归档状态"
data-actions-box="true" data-deselect-all-text="取消全选" data-select-all-text="全选" data-none-results-text="没找到相应记录{0}">
<%-- <option value="">全部</option>--%>
<option value="取消入院">取消入院</option>
<option value="在院">在院</option>
<option value="归档中">归档中</option>
<option value="提交">提交</option>
<option value="主任退回">主任退回</option>
<option value="初审">初审</option>
<option value="复审退回">复审退回</option>
<option value="已归档">已归档</option>
<option value="已封存">已封存</option>
<%--<option value="取消入院">取消入院</option>--%>
<option value="在院">在院</option>
<option value="未归档">未归档</option>
<option value="归档中">归档中</option>
<option value="提交">提交</option>
<option value="主任退回">主任退回</option>
<option value="初审">初审</option>
<option value="复审退回">复审退回</option>
<option value="已归档">已归档</option>
<option value="已认证">已认证</option>
<option value="已封存">已封存</option>
</select>
</div>
<div class="form-group divCss8">

2
src/main/webapp/WEB-INF/views/pdfDir/pdfLastDir.jsp
Unescape Escape View File

@ -306,7 +306,7 @@
<div class="contentDiv" id="returnFlagDiv">
<select class="selectpicker bla bla bli" multiple data-live-search="true" id="returnFlag"
data-actions-box="true" data-deselect-all-text="取消全选" data-select-all-text="全选" title="请选择可修改部分">
<option value="0">打回首页</option>
<%--<option value="0">打回首页</option>--%>
<option value="1">打回医生</option>
<option value="2">打回护士</option>
</select>

Write Preview
Loading…
Cancel
Save