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 @@