diff --git a/src/main/java/com/emr/controller/VCountController.java b/src/main/java/com/emr/controller/VCountController.java index 3b98c897..c72bf6cf 100644 --- a/src/main/java/com/emr/controller/VCountController.java +++ b/src/main/java/com/emr/controller/VCountController.java @@ -123,7 +123,7 @@ public class VCountController { String tableThNames = "名字,入院科室,入院日期,出院科室,出院日期,主管医生"; String fieldCns = "name,deptAdmissionTo,admissionDateTime,deptName,dischargeDateTime,doctorInCharge"; //构造excel的数据 - List list = archiveMasterService.selectByUnfile2(archiveMasterVo); + List list = archiveMasterService.selectByUnfile(archiveMasterVo); Emr_Dictionary dic = new Emr_Dictionary(); dic.setEffective(1); dic.setTypecode("dept_code"); diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java index 7c30beb0..e2485696 100644 --- a/src/main/java/com/emr/controller/beHospitaledController.java +++ b/src/main/java/com/emr/controller/beHospitaledController.java @@ -86,7 +86,7 @@ public class beHospitaledController { String tableThNames = "病历清单id,住院号,住院次数,名字,性别,身份证,出院科室,出院日期,主管医生,状态,医生是否提交,医生,医生提交日期,护士是否提交,护士,护士提交日期,电子病历医生提交,电子病历护士提交,是否死亡"; String fieldCns = "id,inpNo,visitId,name,sex,idNo,deptName,dischargeDateTime,doctorInCharge,archivestate,cmtDoctor,doctorName,cmtDoctorDate,cmtNurse,nurseName,cmtDurseDate,emrDoctorCmt,emrNureCmt,deathFlag"; //构造excel的数据beHospList - List list = archiveMasterService.selectByColumn(archiveMasterVo); + List list = archiveMasterService.selectByColumn(archiveMasterVo); //文件名 diff --git a/src/main/java/com/emr/dao/Archive_MasterMapper.java b/src/main/java/com/emr/dao/Archive_MasterMapper.java index be9a4d9f..8a75e3b6 100644 --- a/src/main/java/com/emr/dao/Archive_MasterMapper.java +++ b/src/main/java/com/emr/dao/Archive_MasterMapper.java @@ -17,12 +17,13 @@ public interface Archive_MasterMapper { List selectByCol(Archive_Master_Vo record); - List selectByColumn(Archive_Master_Vo record); + List selectByColumn(Archive_Master_Vo record); List selectByLast(Archive_Master_Vo record); List selectByUnfile(Archive_Master_Vo record); - List selectByUnfile2(Archive_Master_Vo record); + + //List selectByUnfile2(Archive_Master_Vo record); /** * 导出超7天的，初审和已归档 * @param record diff --git a/src/main/java/com/emr/entity/Archive_Master_Vo.java b/src/main/java/com/emr/entity/Archive_Master_Vo.java index e0393b1c..52db1a6c 100644 --- a/src/main/java/com/emr/entity/Archive_Master_Vo.java +++ b/src/main/java/com/emr/entity/Archive_Master_Vo.java @@ -121,6 +121,8 @@ public class Archive_Master_Vo { private String overdueDays; + private int numb; + public String getOverdueDays() { return overdueDays; } @@ -550,6 +552,13 @@ public class Archive_Master_Vo { this.bedNumber = bedNumber; } + public int getNumb() { + return numb; + } + + public void setNumb(int numb) { + this.numb = numb; + } } diff --git a/src/main/java/com/emr/service/Archive_MasterService.java b/src/main/java/com/emr/service/Archive_MasterService.java index 85765cdf..294c685b 100644 --- a/src/main/java/com/emr/service/Archive_MasterService.java +++ b/src/main/java/com/emr/service/Archive_MasterService.java @@ -47,7 +47,7 @@ public interface Archive_MasterService { * @param archiveMasterVo * @return */ - List selectByColumn(Archive_Master_Vo archiveMasterVo); + List selectByColumn(Archive_Master_Vo archiveMasterVo); /** @@ -63,7 +63,7 @@ public interface Archive_MasterService { * @param archiveMasterVo * @return */ - List selectByUnfile2(Archive_Master_Vo archiveMasterVo); + //List selectByUnfile2(Archive_Master_Vo archiveMasterVo); /** * 导出超7天的，初审和已归档 * @param record diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java index a6b7dfdf..65dca8c7 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -84,7 +84,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { } @Override - public List selectByColumn(Archive_Master_Vo archiveMasterVo) { + public List selectByColumn(Archive_Master_Vo archiveMasterVo) { return archiveMasterMapper.selectByColumn(archiveMasterVo); } @@ -93,10 +93,10 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { return archiveMasterMapper.selectByUnfile(archiveMasterVo); } - @Override + /* @Override public List selectByUnfile2(Archive_Master_Vo archiveMasterVo) { return archiveMasterMapper.selectByUnfile2(archiveMasterVo); - } + }*/ @Override public List sel7DayByCol(Archive_Master_Vo archiveMasterVo) { @@ -116,7 +116,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { @Override public OffsetLimitPage selectByColumn(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); - List list = archiveMasterMapper.selectByColumn(archiveMasterVo); + List list = archiveMasterMapper.selectByColumn(archiveMasterVo); JSONArray powerUsers = powerUserService.getPowerUserList("1"); List powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); @@ -127,8 +127,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { return temp.getString("userName"); }}); - for (Archive_Master archive_master : list) { - + for (Archive_Master_Vo archive_master : list) { JSONObject userInfo = mappedMovies.get(archive_master.getDoctorName()); if (userInfo==null){ archive_master.setDoctorName(archive_master.getDoctorName()); diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties index 53c8f6b3..3076f0dd 100644 --- a/src/main/resources/config/jdbc.properties +++ b/src/main/resources/config/jdbc.properties @@ -42,7 +42,8 @@ HomepageDictionary=http://127.0.0.1:9999/WholeCheckInterface/services/HomepageDi HomepageMethod=CheckData powerGetUserList=http://127.0.0.1:9999/power/font/getUserList?userName=admin - +allAddortIds = 00000000 +pdfWater = \u5e7f\u4e1c\u533b\u79d1\u5927\u5b66\u9644\u5c5e\u533b\u9662 diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index d4c73baf..50d74fc4 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -86,6 +86,7 @@ + id, patient_id, inp_no, visit_id, name, sex, dept_name, discharge_date_time, ArchiveState, @@ -216,11 +217,11 @@ ORDER BY m.admission_date_time desc - select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to ,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,m.is_scanning, - m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.bed_number,ISNULL(s.bedNumber, 0) bedNumber + m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.bed_number,ISNULL(s.numb, 0) numb from archive_master m LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) d @@ -228,7 +229,7 @@ LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) f on m.dept_name=f.code - LEFT JOIN(select archive_detail_id,count(*) bedNumber from emr_fault_detail where 1=1 and content!='' and content is not null and back_flag is not null GROUP BY archive_detail_id) s + LEFT JOIN(select archive_detail_id,count(*) numb from emr_fault_detail where 1=1 and content!='' and content is not null and back_flag is not null GROUP BY archive_detail_id) s on m.id=s.archive_detail_id where 1=1 and ArchiveState in('归档中','提交','主任退回') @@ -465,7 +466,10 @@ and m.name like '%'+#{name,jdbcType=NCHAR}+'%' - and m.ArchiveState in(#{archivestate,jdbcType=NVARCHAR}) + and m.ArchiveState in + + #{item} + and m.ID_NO like '%'+#{idNo,jdbcType=NCHAR}+'%' @@ -486,7 +490,7 @@ - + and m.discharge_date_time = #{dischargeDateTime,jdbcType=NVARCHAR} diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index 1d1b10fc..12663507 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -1,4 +1,5 @@ -<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.*" %> + +<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.*" %> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <% @@ -28,6 +29,7 @@ font-weight: bold; padding: 5px 5px 5px 5px !important; } + .modal-footer { padding: 5px; } @@ -47,20 +49,20 @@ } .divCss3 { - margin-top: 5px; + margin-top: -10px; margin-left: 20px; color: blue; + text-align: left; } .modal-content { - width: 165%; /*width: 1300px;*/ + width: calc(210%); /*width: 1300px;*/ overflow-x: hidden; overflow-y: auto; - } .modal { - margin-left: -39%; + margin-left: -45%; overflow-x: auto; /*z-index: 1049;*/ } @@ -70,12 +72,14 @@ width: 97.5%; margin-top: 10px; margin-bottom: 5px; + color: blue; + margin-left: 20px; } - .labCss { - /*color: gainsboro;*/ - color: #c1c3c4; - } + .labCss { + /*color: gainsboro;*/ + color: #c1c3c4; + } .titleCss { text-align: left; @@ -88,15 +92,23 @@ margin-bottom: 10px; } + .treeBtn1 { + margin-top: 10px; + margin-right: 10px; + width: 42%; + } + .treeBtn { margin-top: 10px; margin-left: 10px; margin-right: 10px; + width: 42%; } .zTreeDemo { height: auto; min-height: 350px; + margin-left: -10px; } .divCss5 { @@ -104,7 +116,8 @@ height: auto; min-height: 350px; } - #backDivs{ + + #backDivs { border-top: 1px dashed #3c8dbc; } @@ -149,6 +162,32 @@ !important; } + .toolbarCss { + margin-right: 20px; + margin-bottom: 0px; + !important; + } + + .fixed-table-toolbar .bs-bars .pull-right{ + height: 20px; + !important; + } + + #toolbar2 > div { + margin-bottom: -10px; + !important; + } + + #key { + width: 70%; + !important; + } + + #searchBtn1 { + width: 20%; + !important; + } + .imgDivCss { min-height: 400px !important; } @@ -158,47 +197,52 @@ } - /* .isImg{ - width: 100%; - height: 150% - }*/ + /* .isImg{ + width: 100%; + height: 150% + }*/ + .shadeImg { - height:100%; + height: 100%; } #returnModal .modal-content { - margin-left: 3%; - margin-top: 35%; + margin-left: 10%; + margin-top: 10%; width: 160%; } #returnModal2 .modal-content { margin-left: 30%; - margin-top: 35%; + margin-top: 10%; width: 120%; } - #verifyModal .modal-content { margin-left: 50%; - margin-top: 35%; + margin-top: 10%; width: 100%; } #doctorModal .modal-content { margin-left: 50%; - margin-top: 35%; + margin-top: 10%; width: 120%; } #nursModal .modal-content { margin-left: 50%; - margin-top: 35%; + margin-top: 10%; width: 120%; } + + #QXInfoModal .modal-header2 { + width: calc(210%); + } + #WZModal .modal-content { margin-left: 50%; - margin-top: 35%; + margin-top: 10%; width: 80%; } @@ -217,19 +261,51 @@ text-overflow: ellipsis; } + #delPdfPageModal .modal-header2 { + width: calc(210%); /*margin-left:-15%;*/ + } + + #delPdfPageModal .modal-content { + width: calc(210%); /*margin-left:-15%;*/ + height: calc(100vh - 80px); + overflow: hidden; + !important; + } + + #infoDiv { + width: 18%; + height: 98%; + float: right; + overflow-y: hidden; + overflow-x: hidden; + } + + #pdf_page { + width: 100%; + height: 95%; + !important; + } + + #imglist { + overflow-x: hidden; + overflow-y: auto; + height: calc(100vh - 0px); + } + #delPdfPageModal2 > div > div { margin-top: 20%; - margin-left: 60%; - width: 400px; + margin-left: 70%; + width: 90%; !important; } #timeLineModal .modal-content { margin-left: 50%; - margin-top: 35%; + margin-top: 10%; width: 100%; } - #mb{ + + #mb { display: none; height: 120%; width: 100%; @@ -238,9 +314,9 @@ z-index: 1200; /*height: 1380px;*/ background: #FFF; - top:0; + top: 0; left: 0; - opacity:0.6; + opacity: 0.6; } #arrow { @@ -255,46 +331,80 @@ font-weight: bold; float: left; } + /*.panel-primary > .panel-heading{*/ /*background-color: #3c8dbc;*/ /*border-color: #3c8dbc;*/ /*}*/ - .showDelDiv{ + + .showDelDiv { + margin-left: 0px; border: 1px solid #e5e5e5; width: 90%; margin-bottom: 5px; } + .showImg2 { margin-left: 2%; margin-bottom: 2px; - width:95%; + width: 95%; height: 200px; } - .imglist{ - margin-left: 15px; + + #imglist { + text-align: center; + margin-left: 0px; margin-bottom: 5px; - width: 90%; - height: 200px; + width: 98%; + height: 80%; + overflow-y: auto; + overflow-x: hidden; } - .returnPageCls{ + + .returnPageCls { margin-right: 2px; } - #addDelDiv{ - width: 85%; + + #addDelDiv { + width: 81%; background-color: #0b93d5; text-align: center; color: red; } - #delAllImgBtn{ + + #delAllImgBtn { width: 35%; } - #addPdfPageBtn{ + + #addPdfPageBtn { width: 40%; } - #delImgPageModalCss{ - margin-left: 20%; + + #maxImg > div > div { + width: calc(210%); + } + + .maxBodyCss { + height: 87%; + !important; + } + + #delImgPageModal > div > div { + width: 70%; + margin-left: 55%; + margin-top: 20%; + } + + + #wzContent { + margin-left: 30px; + margin-right: 30px; + /*height: 60px;*/ + overflow-x: hidden; + overflow-y: hidden; } + @@ -325,7 +435,7 @@ <%----%> <%----%> <%----%> -
+
<%--
-
+
-
@@ -355,7 +466,7 @@
-
+
-
+
                @@ -487,35 +598,25 @@
-
- <%--
--%> - <%--离院方式：--%> - <%--
--%> -
- 完整性审核： -
-
- 地三生三世所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所 -
- -
+
完整性审核
+
+ <%--
+ <%–
–%> + <%–离院方式：–%> + <%–
–%> +
--%>
- -
-
病历清单
+ <%--
病历清单
--%>
-
-
- -
+
+
- --%> - 选择文件 + 选择文件
@@ -757,12 +859,12 @@ <%--发大弹窗--%>
归档病历是否已全部无纸化无扫描件 - 是 - 否 + 是 + 否
@@ -1157,27 +1264,27 @@ <%--删除pdf某页弹窗--%>