diff --git a/src/main/java/com/emr/util/XMLUtil.java b/src/main/java/com/emr/util/XMLUtil.java index b70366d2..8d10ed2b 100644 --- a/src/main/java/com/emr/util/XMLUtil.java +++ b/src/main/java/com/emr/util/XMLUtil.java @@ -36,6 +36,9 @@ public class XMLUtil { // 格式化xml输出的格式 marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); + marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true); + //sw.write("\n"); + sw.write(""); // 将对象转换成输出流形式的xml marshaller.marshal(obj, sw); } catch (JAXBException e) { diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index de1f9b6d..870ba75f 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -2764,7 +2764,7 @@ entity.cmtDoctor = 1; entity.lockinfo = $("#wzxText").val(); entity.content = $("#doctorText").val(); - if ($('#isScanedChk').is(':checked')) { + if ($('.isScanedChk1').is(':checked')) { isScanedChk = "1"; } entity.isscaned = isScanedChk; @@ -2772,7 +2772,7 @@ entity.cmtNurse = 1; entity.lockinfo = $("#wzx2Text").val(); entity.content = $("#nures2Text").val(); - if ($('#isScanedChk2').is(':checked')) { + if ($('.isScanedChk3').is(':checked')) { isScanedChk = "1"; } entity.isscaned = isScanedChk; diff --git a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp index 1ed6083c..f7aa859a 100644 --- a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp +++ b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp @@ -1001,7 +1001,8 @@
- 归档病历已全部无纸化无扫描件 + <%--归档病历已全部无纸化无扫描件--%> + 是否有纸质病历送病案室
@@ -1043,7 +1044,8 @@
- 归档病历已全部无纸化无扫描件 + <%--归档病历已全部无纸化无扫描件--%> + 是否有纸质病历送病案室
diff --git a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp index 21e41d91..5e54a111 100644 --- a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp +++ b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp @@ -244,14 +244,21 @@ // } // } - var url = window.location.href; - var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); + // var url = window.location.href; + // var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); + // + // var len = value.length; + // if (len > 0) { + // if (value.indexOf("") == -1) { + // deptName = value.toString(); + // } + // } - var len = value.length; - if (len > 0) { - if (value.indexOf("") == -1) { - deptName = value.toString(); - } + var deptName = value; + if (deptName.indexOf("") != -1) { + deptName = ""; + } else { + deptName = value.toString(); } var temp = { diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index 9d8ab920..c83c5052 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -2825,9 +2825,9 @@ //在院 未归档 归档中 初审 已归档 已认证 var a = ''; if (value == "1") { - a = ''; + a = ''; } else if (value == "0") { - a = ''; + a = ''; } else { a = '未知'; }