From 53f59bdcd9d9b56bc59f3a5d9d98ccdda3a2bc83 Mon Sep 17 00:00:00 2001 From: zengwh Date: Fri, 25 Sep 2020 21:38:09 +0800 Subject: [PATCH] beifen2 --- doc/emr_record.bak | Bin 32895488 -> 65789440 bytes .../controller/beHospitaledController.java | 69 ++++++- src/main/java/com/emr/util/OracleConnect.java | 48 ++++- src/main/java/com/emr/vo/HisCollectInfo.java | 18 ++ .../views/beHospitaledDir/beHospList.jsp | 41 ++-- .../views/lastVerifyDir/lastVerifyList.jsp | 195 +----------------- 6 files changed, 151 insertions(+), 220 deletions(-) create mode 100644 src/main/java/com/emr/vo/HisCollectInfo.java diff --git a/doc/emr_record.bak b/doc/emr_record.bak index 795162634c0256c9b3c0cd0becda7399b17a442e..1760e607fe0b275f1a92fca121e8a66593c9fb24 100644 GIT binary patch delta 31162 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 diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java index c0b30e7..5c55a90 100644 --- a/src/main/java/com/emr/controller/beHospitaledController.java +++ b/src/main/java/com/emr/controller/beHospitaledController.java @@ -8,10 +8,16 @@ package com.emr.controller; import com.emr.dao.Archive_MasterMapper; import com.emr.dao.EmrPatientMapper; -import com.emr.entity.*; -import com.emr.service.*; +import com.emr.entity.Archive_Master; +import com.emr.entity.Archive_Master_Vo; +import com.emr.entity.Emr_Fault_Detail; +import com.emr.entity.OffsetLimitPage; +import com.emr.service.Archive_MasterService; +import com.emr.service.Emr_Fault_DetailService; import com.emr.util.ExportExcelUtil; +import com.emr.util.Msg; import com.emr.util.OracleConnect; +import com.emr.vo.HisCollectInfo; import org.apache.commons.lang3.StringUtils; import org.apache.cxf.endpoint.Client; import org.apache.shiro.SecurityUtils; @@ -225,6 +231,65 @@ public class beHospitaledController { return -1; } } + + /** + * 查询pdf生成完成情况 + * @param collectInfo + * @return + */ + @RequestMapping("getPdfCollectInfoFromHis") + @ResponseBody + public int getPdfCollectInfoFromHis(HisCollectInfo collectInfo){ + try { + String sql = getSelectSqlForGetPdfCollect(collectInfo); + List list = OracleConnect.select1(sql); + } catch (Exception e) { + e.printStackTrace(); + } + return 1; + } + + private String getSelectSqlForGetPdfCollect(HisCollectInfo collectInfo){ + collectInfo.setFpatno("4316993"); + String sql = "select FENTRY_NO,FENTRY_NAME,FREC_NAME,FFILE_ID,PDF_FLAG from pacs.v_emrpdf_rec where fpatno = '"+collectInfo.getFpatno()+"'"; + //标题 + String frecName = collectInfo.getFrecName(); + if(StringUtils.isNotBlank(frecName)){ + sql += " and FREC_NAME like '%"+frecName+"%'"; + } + //分类编码 + String fentryNo = collectInfo.getFentryNo(); + if(StringUtils.isNotBlank(fentryNo)){ + sql += " and FENTRY_NO = '"+fentryNo+"'"; + } + //状态 + String pdfflag = collectInfo.getPdfflag(); + if(StringUtils.isNotBlank(pdfflag)){ + sql += " and PDF_FLAG = '"+pdfflag+"'"; + } + return sql; + } + + @RequestMapping("insetHisPdfCollect") + @ResponseBody + public Msg insetHisPdfCollect(){ + try { + //fentryno:分类编号 + String fentryno = "12345"; + //fpatno:记帐号 + String fpatno = "4316993"; + //fpatno:记帐号 + String fapplytime = "2020-03-04 11:22:22"; + //fpatno:记帐号 + String ffile_id = "2321321321321"; + String sql = "insert into pacs.p_pdf_print(FENTRYNO,FPATNO,FAPPLYTIME,FFILE_ID) values('"+fentryno+"','"+fpatno+"','"+fapplytime+"','"+ffile_id+"')"; + int str = OracleConnect.insert(sql); + System.out.println("str:"+str); + } catch (Exception e) { + e.printStackTrace(); + } + return Msg.success(); + } } diff --git a/src/main/java/com/emr/util/OracleConnect.java b/src/main/java/com/emr/util/OracleConnect.java index c921257..b1d5c94 100644 --- a/src/main/java/com/emr/util/OracleConnect.java +++ b/src/main/java/com/emr/util/OracleConnect.java @@ -2,19 +2,15 @@ package com.emr.util; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.SQLException; -import java.sql.Statement; +import com.emr.vo.HisCollectInfo; +import com.mchange.v2.c3p0.ComboPooledDataSource; + +import java.sql.*; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.mchange.v2.c3p0.ComboPooledDataSource; - /** * Oracle链接数据库对象 * @@ -106,4 +102,40 @@ public class OracleConnect { OracleConnect.CloseConn(rs, pst, conn); return str; } + public static List select1(String arg0) throws Exception { + Connection conn = new OracleConnect().getConnect(); + pst = conn.prepareStatement(arg0); + rs = pst.executeQuery(); + List list = new ArrayList<>(); + if (rs != null) { + ResultSetMetaData md = rs.getMetaData(); + int columnCount = md.getColumnCount(); + Map rowData = new HashMap(); + while (rs.next()) { + HisCollectInfo info = new HisCollectInfo(); + info.setFentryNo(rs.getString(1)); + info.setFentryName(rs.getString(2)); + info.setFrecName(rs.getString(3)); + info.setFfileId(rs.getString(4)); + info.setPdfflag(rs.getString(5)); + list.add(info); + } + } + OracleConnect.CloseConn(rs, pst, conn); + return list; + } + + public static int insert(String sql) throws Exception { + Connection conn = new OracleConnect().getConnect(); + try { + pst=conn.prepareStatement(sql); + return pst.executeUpdate(); + } catch (SQLException e) { + e.printStackTrace(); + }finally { + OracleConnect.CloseConn(null, pst, conn); + } + return 1; + } + } diff --git a/src/main/java/com/emr/vo/HisCollectInfo.java b/src/main/java/com/emr/vo/HisCollectInfo.java new file mode 100644 index 0000000..c5228be --- /dev/null +++ b/src/main/java/com/emr/vo/HisCollectInfo.java @@ -0,0 +1,18 @@ +package com.emr.vo; + +import lombok.Data; + +@Data +public class HisCollectInfo { + private String fpatno;//记帐号 + + private String fentryNo;//分段编号 + + private String fentryName;//分段名 + + private String frecName;//文件名 + + private String ffileId;//文件id + + private String pdfflag;//完成情况1:完成；0：未完成 +} diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index 48399f5..88f4fe8 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -269,6 +269,7 @@
+
病历信息
@@ -287,7 +288,6 @@
-
入院科室：
@@ -709,27 +709,27 @@
-
-
+
-
-
+
- - - + +
- - + +
@@ -1708,15 +1708,17 @@ } }, 'click .selInfo': function (e, value, row, index) { + //赋值记帐号 + $("#fpatno").val(row.patientId); //查询是否医生或护士是否提交 var result = 1; - /*result = selectHis(row); + //result = selectHis(row); if (result == 1) { } else if(result == -1){ toastr.warning("系统出错了请联系系统管理员"); }else { toastr.warning('医生或护士未提交数据，请稍后再试'); - }*/ + } $('#selModal').modal({ backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。 keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。 @@ -1749,7 +1751,7 @@ $("#outHospLab").html(row.dischargeDisposition); $("#inLab").html(row.inpNo); $("#inTimeLab").html(row.visitId); - if (row.lockinfo != '') { + /*if (row.lockinfo == '') { $("#wzContent").text(row.lockinfo); } else { //请求接口查看并回显 @@ -1765,7 +1767,7 @@ } }, }) - } + }*/ ///入/出院年+出院月+住院号+住院次数 var outDate = ""; if (row.dischargeDateTime != null && row.dischargeDateTime != "") { @@ -2198,9 +2200,10 @@ var temp = { limit: limit, //页面大小 offset: offset, //页码 - order: params.order, //排位命令（desc，asc） - patientId: patientId, - assortId: assortId + fpatno: $("#fpatno").val(), + frecName:$("#frecName").val(), + fentryNo:$("#fentryNo").val(), + pdfflag:$("#pdfflag").val() }; return temp; }, @@ -2297,6 +2300,10 @@ } }); } + //pdf生成情况查询按钮 + $("#collectPdfInfosearchBtn").click(function(){ + $("#table3").bootstrapTable("refreshOptions", {pageNumber: 1}); + }) \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index 7aefcf2..98362fa 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -1821,7 +1821,6 @@ }, }) } - //入/出院年+出院月+住院号+住院次数 var outDate = ""; if (row.dischargeDateTime != null && row.dischargeDateTime != "") { @@ -1832,6 +1831,8 @@ $("#outDateLab").val(outDate[0] + "" + outDate[1] + "" + row.inpNo.trim() + "" + row.visitId + ""); initTree(row.id); + //查看文件列表 + initTable2(); } }, cellStyle: function (value, row, index) { @@ -1855,198 +1856,6 @@ var idArr = []; - function initTable2() { - $("#table2").bootstrapTable({ // 对应table标签的id - //method: 'POST', - url: "${path}/inHosp/getAssortdetail", // 获取表格数据的url - contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据 - //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行 - cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true - striped: true, //表格显示条纹，默认为false - pagination: true, // 在表格底部显示分页组件，默认false - paginationShowPageGo: true, - pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。 - smartDisplay: false, - pageSize: 2, // 页面数据条数 - pageNumber: 1, // 初始化加载第一页，默认第一页 - sidePagination: 'server', // 设置为服务器端分页 客户端：client - search: false, - showColumns: true, - searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法 - undefinedText: '---', //当数据为 undefined 时显示的字符 - singleSelect: false,//设置True 将禁止多选 - clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox - height: 560, //定义表格的高度。 - searchTimeOut: 500,// 默认500 设置搜索超时时间。 - toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right' - paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。 - showHeader: true,//是否显示列头。 - trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。 - queryParams: function (params) { - var currPageSize = this.pageSize; - if (currPageSize == 2) { - currPageSize = 10; - } - var limit = null; - var offset = params.offset; - var patientId = $("#idLab").html(); - var assortId = $("#assortId").html(); - if (assortId == 0) assortId = null; - //判断是否导出全部all - if ($("#sel_exportoption").val() == "all") { - offset = 0; - limit = this.totalRows; - this.pageSize = limit; - } else { - limit = currPageSize; - this.pageSize = currPageSize; - } - - var temp = { - limit: limit, //页面大小 - offset: offset, //页码 - order: params.order, //排位命令（desc，asc） - patientId: patientId, - assortId: assortId - }; - return temp; - }, - sortName: 'assortSort', // 要排序的字段 - sortOrder: 'desc', // 排序规则 - columns: [{ - title: '全选', - field: 'select', //复选框 - checkbox: true, - width: 25, - align: 'center', - hidden: true, - }, { - title: '序', - field: 'id', - align: 'left', - visible: false - }, - - { - title: '分段类id', - field: 'assortId', - align: 'left', - valign: 'middle', - visible: false - }, - - { - title: '标题', - field: 'title', - align: 'left', - valign: 'middle', - }, - { - title: '上传时间', - field: 'uploaddatetime', - align: 'left', - valign: 'middle', - width: 150, // 定义列的宽度，单位为像素px - }, - { - title: '来源', - field: 'source', - align: 'center', - valign: 'middle', - width: 50, // 定义列的宽度，单位为像素px - }, - { - title: '状态', - field: 'flag', - align: 'center', - valign: 'middle', - width: 80, // 定义列的宽度，单位为像素px - formatter: function (value, row, index) { - //在院 未归档 归档中 初审 已归档 已认证 - var a = ''; - if (value == "1") { - a = '作废'; - } else if (value == "0") { - a = '使用'; - } - return a; - } - }, - { - title: "操作", - align: 'left', - valign: 'middle', - width: 120, // 定义列的宽度，单位为像素px - formatter: function (value, row, index) { - //return ''; - var html = '';// '删除'; - if (row.flag == "0") { - html = html + ''; - } - return html; - }, events: { - 'click .editInfo': function (e, value, row, index) { - $('#assortModal').modal({ - backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。 - keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。 - show: true//弹出对话框 - }); - - //同步 - $("#inpId").val(row.id); - $("#inpTitle").val(row.title); - $("#inpType").val(row.assortId); - $("#inpSource").val(row.source); - $("#inpFlag").val(row.flag); - if (row.pdfPath != "" && row.pdfPath != "") { - $("#fileUrlInp").val(row.pdfPath); - $('#previewFile').css("display", "block");//显示预览按钮 - } - }, 'click .stateInfo': function (e, value, row, index) { - $('#exampleModal').modal({ - backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。 - keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。 - show: true//弹出对话框 - }); - - //同步 - $("#idT").val(row.id); - - } - }, - cellStyle: function (value, row, index) { - return {classes: 'success'} - - } - } - ], - onLoadSuccess: function (result) { //加载成功时执行 - // console.info("加载成功"); - }, - onLoadError: function () { //加载失败时执行 - console.info("加载数据失败"); - }, onCheckAll: function (rows) { //点击全选框时触发的操作 - if (rows != null && rows.length) { - for (var i = 0; i < rows.length; i++) { - idArr.push(rows[i].id) - } - } - }, onCheck: function (row) {//点击每一个单选框时触发的操作 - idArr.push(row.id) - }, onUncheck: function (row) {//取消每一个单选框时对应的操作； - var index = idArr.indexOf(row.id); - if (index > -1) { - idArr.splice(index, 1); - } - }, onUncheckAll: function (row) {//取消每一个单选框时对应的操作； - idArr = []; - } - - }); - } - - initTable2(); - $("#selModal").keydown(function (e) { if (e.keyCode == 13) { event.preventDefault();//禁用默认回车事件