diff --git a/src/main/java/com/emr/vo/ArchiveFlowInfoVo.java b/src/main/java/com/emr/vo/ArchiveFlowInfoVo.java index 0cfb8b6..4f4ad45 100644 --- a/src/main/java/com/emr/vo/ArchiveFlowInfoVo.java +++ b/src/main/java/com/emr/vo/ArchiveFlowInfoVo.java @@ -27,6 +27,11 @@ public class ArchiveFlowInfoVo extends ArchiveFlowInfo { */ private Integer faultId; + /** + * 缺陷原因 + */ + private String content; + /** * 退回原因 */ diff --git a/src/main/resources/mapper/ArchiveFlowInfoMapper.xml b/src/main/resources/mapper/ArchiveFlowInfoMapper.xml index e20e5e8..1890fa4 100644 --- a/src/main/resources/mapper/ArchiveFlowInfoMapper.xml +++ b/src/main/resources/mapper/ArchiveFlowInfoMapper.xml @@ -43,7 +43,7 @@ #{useSeconds,jdbcType=BIGINT}, #{remark,jdbcType=NVARCHAR}, #{userName,jdbcType=NVARCHAR}, #{sumbitTime,jdbcType=TIMESTAMP}, #{createtime,jdbcType=TIMESTAMP}) - + insert into archive_flow_info @@ -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 diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/timeLine.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/timeLine.jsp index 22a4d49..ed1df32 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/timeLine.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/timeLine.jsp @@ -101,16 +101,17 @@ - -
- -

缺陷选项:${info.faultAssortName}

-
- -

退回答复:${info.backContent}

-
-
-
+
+ +

缺陷选项:${info.faultAssortName}

+
+ +

缺陷信息内容:${info.content}

+
+ +

退回信息内容:${info.backContent}

+
+
@@ -179,16 +180,17 @@ - -
- -

缺陷选项:${info.faultAssortName}

-
- -

退回答复:${info.backContent}

-
-
-
+
+ +

缺陷选项:${info.faultAssortName}

+
+ +

缺陷信息内容:${info.content}

+
+ +

退回信息内容:${info.backContent}

+
+
@@ -255,16 +257,17 @@ - -
- -

缺陷选项:${info.faultAssortName}

-
- -

退回答复:${info.backContent}

-
-
-
+
+ +

缺陷选项:${info.faultAssortName}

+
+ +

缺陷信息内容:${info.content}

+
+ +

退回信息内容:${info.backContent}

+
+
diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp index 85db56f..9a93770 100644 --- a/src/main/webapp/WEB-INF/views/index.jsp +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -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 @@