emr_medicalrecord_record2.0
/
emr_medical_record_fs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新版本20210125

Browse Source
master
zengwh 5 years ago
parent 82dda9c0c9
commit f0c2396f63
4 changed files with 44 additions and 33 deletions
Show Stats Download Patch File Download Diff File

5
src/main/java/com/emr/vo/ArchiveFlowInfoVo.java
Unescape Escape View File

@ -27,6 +27,11 @@ public class ArchiveFlowInfoVo extends ArchiveFlowInfo {
*/
private Integer faultId;
/**
* 缺陷原因
*/
private String content;
/**
* 退回原因
*/

3
src/main/resources/mapper/ArchiveFlowInfoMapper.xml
Unescape Escape View File

@ -43,7 +43,7 @@
#{useSeconds,jdbcType=BIGINT}, #{remark,jdbcType=NVARCHAR}, #{userName,jdbcType=NVARCHAR},
#{sumbitTime,jdbcType=TIMESTAMP}, #{createtime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.emr.entity.ArchiveFlowInfo" >
<insert id="insertSelective" parameterType="com.emr.entity.ArchiveFlowInfo" keyProperty="id" useGeneratedKeys="true">
insert into archive_flow_info
<trim prefix="(" suffix=")" suffixOverrides="," >
<if test="id != null" >
@ -236,6 +236,7 @@
archive_flow_info.oper_role,
emr_fault_detail.id faultId,
emr_fault_detail.assort_id faultAssortName,
emr_fault_detail.content,
emr_fault_detail.back_content
FROM
archive_flow_info

63
src/main/webapp/WEB-INF/views/beHospitaledDir/timeLine.jsp
Unescape Escape View File

@ -101,16 +101,17 @@
</h3>
<c:choose>
<c:when test="${info.faultId != null && info.faultId != ''}">
<c:if test="${info.faultAssortName != '' && info.faultAssortName != null && info.backContent != '' && info.backContent != null}">
<div class="timeline-body" style="color:red">
<c:if test="${info.faultAssortName != '' && info.faultAssortName != null}">
<p>缺陷选项:${info.faultAssortName}</p>
</c:if>
<c:if test="${info.backContent != '' && info.backContent != null}">
<p>退回答复:${info.backContent}</p>
</c:if>
</div>
</c:if>
<div class="timeline-body" style="color:red">
<c:if test="${info.faultAssortName != '' && info.faultAssortName != null}">
<p>缺陷选项:${info.faultAssortName}</p>
</c:if>
<c:if test="${info.content != '' && info.content != null}">
<p>缺陷信息内容:${info.content}</p>
</c:if>
<c:if test="${info.backContent != '' && info.backContent != null}">
<p>退回信息内容:${info.backContent}</p>
</c:if>
</div>
</c:when>
<c:otherwise>
<c:if test="${info.remark != '' && info.remark != null}">
@ -179,16 +180,17 @@
</h3>
<c:choose>
<c:when test="${info.faultId != null && info.faultId != ''}">
<c:if test="${info.faultAssortName != '' && info.faultAssortName != null && info.backContent != '' && info.backContent != null}">
<div class="timeline-body" style="color:red">
<c:if test="${info.faultAssortName != '' && info.faultAssortName != null}">
<p>缺陷选项:${info.faultAssortName}</p>
</c:if>
<c:if test="${info.backContent != '' && info.backContent != null}">
<p>退回答复:${info.backContent}</p>
</c:if>
</div>
</c:if>
<div class="timeline-body" style="color:red">
<c:if test="${info.faultAssortName != '' && info.faultAssortName != null}">
<p>缺陷选项:${info.faultAssortName}</p>
</c:if>
<c:if test="${info.content != '' && info.content != null}">
<p>缺陷信息内容:${info.content}</p>
</c:if>
<c:if test="${info.backContent != '' && info.backContent != null}">
<p>退回信息内容:${info.backContent}</p>
</c:if>
</div>
</c:when>
<c:otherwise>
<c:if test="${info.remark != '' && info.remark != null}">
@ -255,16 +257,17 @@
</h3>
<c:choose>
<c:when test="${info.faultId != null && info.faultId != ''}">
<c:if test="${info.faultAssortName != '' && info.faultAssortName != null && info.backContent != '' && info.backContent != null}">
<div class="timeline-body" style="color:red">
<c:if test="${info.faultAssortName != '' && info.faultAssortName != null}">
<p>缺陷选项:${info.faultAssortName}</p>
</c:if>
<c:if test="${info.backContent != '' && info.backContent != null}">
<p>退回答复:${info.backContent}</p>
</c:if>
</div>
</c:if>
<div class="timeline-body" style="color:red">
<c:if test="${info.faultAssortName != '' && info.faultAssortName != null}">
<p>缺陷选项:${info.faultAssortName}</p>
</c:if>
<c:if test="${info.content != '' && info.content != null}">
<p>缺陷信息内容:${info.content}</p>
</c:if>
<c:if test="${info.backContent != '' && info.backContent != null}">
<p>退回信息内容:${info.backContent}</p>
</c:if>
</div>
</c:when>
<c:otherwise>
<c:if test="${info.remark != '' && info.remark != null}">

6
src/main/webapp/WEB-INF/views/index.jsp
Unescape Escape View File

@ -204,7 +204,9 @@
$("#iFrame1").prop('src',sysULReal);
//赋值选中class
$("#"+defaultUrlMenuId).addClass("indexSelected");
$("#"+firstUrlMenuId).removeClass("indexSelected");
if(firstUrlMenuId != '') {
$("#" + firstUrlMenuId).removeClass("indexSelected");
}
}else{
//不包含还是按原来
$("#iFrame1").prop('src',sysUL);
@ -374,7 +376,7 @@
</div>
<footer class="main-footer">
<div class="pull-right">
<b>Version</b> 20210113
<b>Version</b> 20210125
</div>
<strong>Copyright &copy; 2019-2090 厦门嘉时软件.</strong> All rights
reserved.

Write Preview
Loading…
Cancel
Save