diff --git a/src/main/java/com/emr/controller/faultController.java b/src/main/java/com/emr/controller/faultController.java index 4a414236..fb39222f 100644 --- a/src/main/java/com/emr/controller/faultController.java +++ b/src/main/java/com/emr/controller/faultController.java @@ -15,6 +15,7 @@ import org.apache.shiro.SecurityUtils; import org.apache.shiro.session.Session; import org.apache.shiro.subject.Subject; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.Model; @@ -32,6 +33,9 @@ import java.util.*; @RequestMapping("fault") public class faultController { + @Value("${backFee}") + private String backFee; + @Autowired private Emr_Fault_DetailService emrFaultDetailService; @@ -53,57 +57,94 @@ public class faultController { return result; } + @ResponseBody @RequestMapping(value = "/exportExcel") public void exportExcel(HttpServletResponse response, Emr_Fault_Vo emrFaultVo) throws Exception { response.setContentType("application/vnd.ms-excel;charset=UTF-8"); - String[] header = {"病历清单id","住院号","住院次数","姓名","出院科室","出院日期","归档状态","评分","回退内容","缺陷选项","缺陷内容","创建时间"}; - String[] fileNames = {"id","inpNo","visitId","name","deptName","dischargeDateTime","archivestate","score","backContent","typeName","content","createTime"}; + String[] header = {"病历清单id","住院号","住院次数","姓名","出院科室","出院日期","归档状态","评分","退回总次数","退回总费用(元)","当前退回次数","退回费用","退回人","退回时间","回退内容","缺陷选项","缺陷评分","缺陷内容","创建人","创建时间"}; + String[] fileNames = {"ArchiveDetailId","inpNo","visitId","name","deptName","dischargeDateTime","archivestate","price","totalBackNum","totalBackFee","backNum","backFee","updater","updateTime","backContent","assortName","score","content","creater","createTime"}; //文件名 String fileName = "缺陷信息数据" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls"; //构造excel的数据 - List list = emrFaultDetailService.getQualityControlList(emrFaultVo); - /*Emr_Dictionary dic = new Emr_Dictionary(); - dic.setEffective(1); - dic.setTypecode("dept_code"); - //科室列表 - List dicList = emrDictionaryService.dicByTypeCode(dic); - //获取缺陷类别列表 - Emr_Fault_Type obj = new Emr_Fault_Type(); - obj.setEffective(1); - //缺陷选项 - List typeLis = emrFaultTypeService.selectByCol(obj); - for (int i = 0; i < list.size(); i++) { - String assortId = list.get(i).getAssortId(); - if (assortId != "" && assortId != null) { - String[] assorArr = assortId.split(","); - //替换类别 - for (int j = 0; j < typeLis.size(); j++) { - String id = String.valueOf(typeLis.get(j).getId()); - if (Arrays.asList(assorArr).contains(id)) { - assortId = assortId.replace(id, typeLis.get(j).getTypeName()); - list.get(i).setAssortId(assortId); + // List list = emrFaultDetailService.getQualityControlList(emrFaultVo); + //获取病案室退回医生或护士的缺陷列表 + List list = emrFaultDetailService.selByCol(emrFaultVo); + //获取病案退回是第几次 updater为退回人 + List backList =emrFaultDetailService.faultBackScoreList(emrFaultVo); + //获取病案信息 + String priceVal=""; + if(backFee!=null && backFee!=""){ + priceVal=backFee; + }else{ + //默认退回一次扣30元 + priceVal="30"; + } + emrFaultVo.setBackFee(priceVal); + List masterList=emrFaultDetailService.masterTotalList(emrFaultVo); + + if(list!=null && list.size()>0){ + if(backList!=null && backList.size()>0){ + if(masterList!=null && masterList.size()>0){ + for (Emr_Fault_Vo faultInfo : list) { + for (Emr_Fault_Vo masertInfo : masterList) { + if(faultInfo.getArchiveDetailId().equals(masertInfo.getArchiveDetailId())) { + faultInfo.setInpNo(masertInfo.getInpNo()); + faultInfo.setVisitId(masertInfo.getVisitId()); + faultInfo.setName(masertInfo.getName()); + faultInfo.setDeptName(masertInfo.getDeptName()); + faultInfo.setDischargeDateTime(masertInfo.getDischargeDateTime()); + faultInfo.setArchiveState(masertInfo.getArchiveState()); + faultInfo.setPrice(masertInfo.getScore()); + faultInfo.setTotalBackNum(masertInfo.getTotalBackNum()); + faultInfo.setTotalBackFee(masertInfo.getTotalBackFee()); + + + } + } + for (Emr_Fault_Vo backInfo : backList) { + if(faultInfo.getArchiveDetailId().equals(backInfo.getArchiveDetailId())) { + if(backInfo.getCreateTime()!=null && backInfo.getCreateTime()!=""){ + if(backInfo.getStartDateTo()!=null && backInfo.getStartDateTo()!="" && backInfo.getEndDateTo()!=null && backInfo.getEndDateTo()!=""){ + SimpleDateFormat ft = new SimpleDateFormat ("yyyy-MM-dd hh:mm:ss"); + Date nowTime = ft.parse(backInfo.getCreateTime()); + Date startTime = ft.parse(backInfo.getStartDateTo()); + Date endTime = ft.parse(backInfo.getEndDateTo()); + if( isEffectiveDate(nowTime,startTime,endTime)){ + faultInfo.setStartDateTo(backInfo.getStartDateTo()); + faultInfo.setEndDateTo(backInfo.getEndDateTo()); + faultInfo.setBackNum(backInfo.getBackNum()); + faultInfo.setUpdater(backInfo.getCreater()); + faultInfo.setUpdateTime(backInfo.getCreateTime()); + faultInfo.setContent(backInfo.getContent()); + + } + } + else if(faultInfo.getEndDateTo()!=null && faultInfo.getEndDateTo()!=""){ + if(compare(backInfo.getCreateTime(),faultInfo.getEndDateTo())){ + faultInfo.setBackNum(backInfo.getBackNum()); + faultInfo.setUpdater(backInfo.getCreater()); + faultInfo.setUpdateTime(backInfo.getCreateTime()); + faultInfo.setContent(backInfo.getContent()); + } + }else if(faultInfo.getStartDateTo()!=null && faultInfo.getStartDateTo()!=""){ + if(compare(faultInfo.getStartDateTo(),backInfo.getCreateTime())){ + faultInfo.setBackNum(backInfo.getBackNum()); + faultInfo.setUpdater(backInfo.getCreater()); + faultInfo.setUpdateTime(backInfo.getCreateTime()); + faultInfo.setContent(backInfo.getContent()); + } + } + } + + } + } } - } - } - //替换科室 - for (int k = 0; k < dicList.size(); k++) { - String deptName = list.get(i).getDeptName(); - //入院科室dept_admission_to - String dept2 = list.get(i).getDeptAdmissionTo(); - if ((deptName != null && deptName.equals(dicList.get(k).getCode()))) { - //出院科室 - deptName = deptName.replace(deptName, dicList.get(k).getName()); - list.get(i).setDeptName(deptName); - } - if(dept2 != null && dept2.equals(dicList.get(k).getCode())) { - //入院科室 - dept2 = dept2.replace(dept2, dicList.get(k).getName()); - list.get(i).setDeptAdmissionTo(dept2); } } - }*/ + } + ThreadExcelUtils utils = new ThreadExcelUtils(fileName, "", header, fileNames); /* System.out.println("开始执行导出......."); long start = System.currentTimeMillis();*/ @@ -414,6 +455,49 @@ public class faultController { OffsetLimitPage result = emrFaultDetailService.getQualityControlList(emrFaultVo, offset, limit); return result; } + + + @ResponseBody + @RequestMapping(value = "/faultBackScoreList") + public OffsetLimitPage faultBackScoreList(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit) { + OffsetLimitPage result = emrFaultDetailService.faultBackScoreList(emrFaultVo, offset, limit); + return result; + } + + /*@ResponseBody + @RequestMapping(value = "/exportExcel2") + public void exportExcel2(HttpServletResponse response, Emr_Fault_Vo emrFaultVo) throws Exception { + response.setContentType("application/vnd.ms-excel;charset=UTF-8"); + String[] header = {"病历清单id","住院号","住院次数","姓名","出院科室","出院日期","归档状态","评分","退回次数","退回时间","退回人"}; + String[] fileNames = {"archiveDetailId","inpNo","visitId","name","deptName","dischargeDateTime","archivestate","score","backNum","createTime","creater"}; + //文件名 + String fileName = "病案退回次数及评分信息" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls"; + //构造excel的数据 + List list = emrFaultDetailService.faultBackScoreList(emrFaultVo); + ThreadExcelUtils utils = new ThreadExcelUtils(fileName, "", header, fileNames); + *//* System.out.println("开始执行导出......."); + long start = System.currentTimeMillis();*//* + String result=utils.exportExcelToFilePath(response,utils.listConvert(list)); + *//* long end = System.currentTimeMillis(); + System.out.println("耗时：" + (end - start) / 1000 + "秒");*//* + }*/ + + @ResponseBody + @RequestMapping(value = "/faultListByTj") + public OffsetLimitPage faultListByTj(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit) { + OffsetLimitPage result = emrFaultDetailService.selByCol(emrFaultVo, offset, limit); + return result; + + } + + @ResponseBody + @RequestMapping(value = "/masterTotalList") + public OffsetLimitPage masterTotalList(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit) { + emrFaultVo.setBackFee(backFee); + OffsetLimitPage result = emrFaultDetailService.masterTotalList(emrFaultVo, offset, limit); + return result; + + } } diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 7f79dd97..eafd86a2 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -1409,113 +1409,112 @@ ORDER BY f.handle_time desc + + + - select - - from emr_fault_detail - where 1=1 and id = #{id,jdbcType=INTEGER} - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp index d8cc24bb..2633b92c 100644 --- a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp +++ b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp @@ -96,58 +96,67 @@ <%--<%––%>--%> <%--<%––%>--%> <%----%> - - -
- - -<%-- --%> -
-
- - - <%-- --%> -
- -
- <%-- - --%> + +
+
+ + + <%-- --%> +
+ <%--
+ + + <%––%> +
--%> +
+ + + <%----%> +
+ +
+ <%-- + --%> <%--
--%>
-
- - -
- - - - +
+ +
+ + + + +
@@ -277,9 +286,10 @@ if(tipLoad==1){ $("#table").bootstrapTable({ // 对应table标签的id //method: 'POST', - url: "${path}/fault/getQualityControlList", // 获取表格数据的url + url: "${path}/fault/masterTotalList", // 获取表格数据的url getQualityControlList contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据 //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行 + detailView: true,//父子表，为true会在父数据前添加 “+” cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true striped: true, //表格显示条纹，默认为false pagination: true, // 在表格底部显示分页组件，默认false @@ -346,27 +356,21 @@ deptName = $("#deptName").val().toString(); } - var typeFlag = $("#typeFlag").val(); - if (typeFlag== undefined ||typeFlag== null ||typeFlag== "undefined") { - typeFlag = ""; - } else { - typeFlag = $("#typeFlag").val().toString(); - } - var temp = { - limit: limit, //页面大小 - offset: offset, //页码 - order: params.order, //排位命令（desc，asc） - startDate: $("#startDate").val(), - endDate: $("#endDate").val(), - inpNo: "" + $("#inpNo").val(), - visitId:""+$("#visitId").val(), - name:""+$("#name").val(), - doctorInCharge:""+$("#doctorInCharge").val(), - updater:""+typeFlag, - creater:""+$("#creater").val(), - archivestate:"" + $("#archivestate").val(), - deptName: deptName + + var temp = { + limit: limit, //页面大小 + offset: offset, //页码 + order: params.order, //排位命令（desc，asc） + startDate: $("#startDate").val(), + endDate: $("#endDate").val(), + inpNo: "" + $("#inpNo").val(), + visitId:""+$("#visitId").val(), + name:""+$("#name").val(), + doctorInCharge:""+$("#doctorInCharge").val(), + //creater:""+$("#creater").val(), + archivestate:"" + $("#archivestate").val(), + deptName: deptName }; return temp; @@ -478,57 +482,37 @@ title: '评分(分)', //sortable: true, align: 'center', - valign: 'middle', - formatter: function (value, row, index) { - return value; - //return changeDateFormat(value) - } + valign: 'middle' }, { - field: 'price', - title: '扣分项', - //sortable: true, + title: '主管医生', + field: 'doctorInCharge', align: 'center', valign: 'middle', - formatter: function (value, row, index) { - return value; - //return changeDateFormat(value) - } - }, - { - field: 'backContent', - title: '退回内容', - visible: false, - formatter: function (value, row, index) { - return value; - //return changeDateFormat(value) - } - }, - { - field: 'typeName', - title: '缺陷选项', - valign: 'middle', - formatter: function (value, row, index) { - return value; - //return changeDateFormat(value) - } - }, - { - field: 'content', - title: '缺陷自定内容', + },{ + field: 'totalBackNum', + title: '退回总次数', + //sortable: true, + align: 'center', + valign: 'middle' + },{ + field: 'backFee', + title: '退回单价', + //sortable: true, + align: 'center', + valign: 'middle' + },{ + field: 'totalBackFee', + title: '退回总费用(元)', + align: 'center', valign: 'middle', formatter: function (value, row, index) { + //console.log(row); return value; //return changeDateFormat(value) } - }, - { - title: '主管医生', - field: 'doctorInCharge', - align: 'center', - valign: 'middle', - }, - { + } + /*{ field: 'createTime', title: '创建时间', valign: 'middle', @@ -545,7 +529,7 @@ return value; //return changeDateFormat(value) } - }, + },*/ // { // field: 'updater', // title: '修改人', @@ -585,8 +569,336 @@ onLoadError: function () { //加载失败时执行 //console.info("加载数据失败"); tipLoad = 0; + },onExpandRow: function (index, row, $detail) { + InitSubTable(index, row, $detail); } }); + + + //初始化子表格(无线循环) + InitSubTable = function (index, row, $detail) { + //console.log(row); + if(row.backNum=="异常"){ + toastr.warning("退回次数为异常，请先纠正!"); + return; + } + var archiveDetailId = row.archiveDetailId; + var cur_table = $detail.html('
').find('table'); + //console.log(endDateTo+"========================"+startDateTo); + + $(cur_table).bootstrapTable({ + //method: 'POST', + url: "${path}/fault/faultBackScoreList", // 获取表格数据的url + contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据 + //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行 + detailView: true,//父子表，为true会在父数据前添加 “+” + cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true + striped: true, //表格显示条纹，默认为false + pagination: true, // 在表格底部显示分页组件，默认false + paginationShowPageGo: true, + pageList: [10, 20,50,100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。 + smartDisplay: false, + pageSize: 10, // 页面数据条数 + pageNumber: 1, // 初始化加载第一页，默认第一页 + sidePagination: 'server', // 设置为服务器端分页 客户端：client + search: false, + showColumns: false, + // toolbar: '#toolbar2',//指定工具栏 + // 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 将自动去掉搜索字符的前后空格。 + //是否显示导出按钮 + showExport: false, + queryParams: function (params) { + var currPageSize= this.pageSize; + if(currPageSize==2){ + currPageSize=10; + } + var limit= null; + var offset= params.offset; + //判断是否导出全部all + if ($("#sel_exportoption2").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） + archiveDetailId:archiveDetailId + //updater:""+$("#backer").val() + }; + return temp; + }, + sortName: 'id', // 要排序的字段 + sortOrder: 'desc', // 排序规则 + columns: [ + /*{ + title: '全选', + field: 'select', //复选框 + checkbox: true, + width: 25, + align: 'left', + valign: 'middle', + },*/ + { + title: '序号', + field: 'id', + align: 'center', + valign: 'middle', + //field: 'ID', + // visible: false, + formatter: function (value, row, index) { + return index + 1; + } + }, + { + title: '病案清单id', + field: 'archiveDetailId', + valign: 'middle', + visible: false + //sortable: true, + }, + { + title: '退回开始时间', + field: 'startDateTo', + align: 'center', + valign: 'middle', + }, + { + title: '退回结束时间', + field: 'endDateTo', + align: 'center', + valign: 'middle', + }, + { + field: 'score', + title: '评分(分)', + //sortable: true, + align: 'center', + valign: 'middle' + }, + { + field: 'backNum', + title: '退回次数', + //sortable: true, + align: 'center', + valign: 'middle', + formatter: function (value, row, index) { + var a =''; + if(value=="异常"){ + a ='' + value + ''; + }else{ + a=value; + } + return a; + } + }, + + { + field: 'createTime', + title: '退回时间', + valign: 'middle', + align: 'center', + }, + { + field: 'creater', + title: '退回人', + valign: 'middle', + align: 'left', + } + ], //无线循环取子表，直到子表里面没有记录 + onExpandRow: function (index, row, $Subdetail) { + InitSubTable2(index, row, $Subdetail); + } + }); + } + + //初始化子表格(无线循环) + InitSubTable2 = function (index, row, $detail) { + if(row.backNum=="异常"){ + toastr.warning("退回次数为异常，请先纠正!"); + return; + } + var archiveDetailId = row.archiveDetailId; + var startDateTo=row.startDateTo; + var endDateTo=row.endDateTo; + var cur_table2 = $detail.html('
').find('table'); + console.log(archiveDetailId+"========"+archiveDetailId+"====="+startDateTo+"======="+endDateTo); + + $(cur_table2).bootstrapTable({ + //method: 'POST', + url: "${path}/fault/faultListByTj", // 获取表格数据的url + contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据 + //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行 + detailView: false,//父子表，为true会在父数据前添加 “+” + cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true + striped: true, //表格显示条纹，默认为false + pagination: true, // 在表格底部显示分页组件，默认false + paginationShowPageGo: true, + pageList: [10, 20,50,100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。 + smartDisplay: false, + pageSize: 10, // 页面数据条数 + pageNumber: 1, // 初始化加载第一页，默认第一页 + sidePagination: 'server', // 设置为服务器端分页 客户端：client + search: false, + showColumns: false, + // toolbar: '#toolbar2',//指定工具栏 + // 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 将自动去掉搜索字符的前后空格。 + //是否显示导出按钮 + showExport: false, + queryParams: function (params) { + var currPageSize= this.pageSize; + if(currPageSize==2){ + currPageSize=10; + } + var limit= null; + var offset= params.offset; + //判断是否导出全部all + if ($("#sel_exportoption2").val() == "all") { + offset=0; + limit=this.totalRows; + this.pageSize= limit; + }else{ + limit = currPageSize; + this.pageSize = currPageSize; + } + + var typeFlag = $("#typeFlag").val(); + if (typeFlag== undefined ||typeFlag== null ||typeFlag== "undefined") { + typeFlag = ""; + } else { + typeFlag = $("#typeFlag").val().toString(); + } + + var temp = { + limit: limit, //页面大小 + offset: offset, //页码 + order: params.order, //排位命令（desc，asc） + archiveDetailId: archiveDetailId, + startDateTo: startDateTo, + creater:""+$("#creater").val(), + endDateTo: endDateTo, + backFlag:"5,6", + assortId:""+typeFlag + + }; + return temp; + }, + sortName: 'id', // 要排序的字段 + sortOrder: 'desc', // 排序规则 + columns: [ + /*{ + title: '全选', + field: 'select', //复选框 + checkbox: true, + width: 25, + align: 'left', + valign: 'middle', + },*/ + { + title: '序号', + field: 'id', + align: 'center', + valign: 'middle', + //field: 'ID', + // visible: false, + formatter: function (value, row, index) { + return index + 1; + } + }, + { + title: '病案清单id', + field: 'archiveDetailId', + valign: 'middle', + visible: false + //sortable: true, + }, + { + field: 'assortName', + title: '缺陷选项', + valign: 'middle', + formatter: function (value, row, index) { + // console.log(row); + return value; + //return changeDateFormat(value) + } + },{ + field: 'score', + title: '扣分(分)', + //sortable: true, + align: 'center', + valign: 'middle', + formatter: function (value, row, index) { + if(value==null){ + value=0; + } + return value; + //return changeDateFormat(value) + } + }, + { + field: 'content', + title: '缺陷自定内容', + valign: 'middle', + formatter: function (value, row, index) { + return value; + //return changeDateFormat(value) + } + }, + { + field: 'backContent', + title: '退回内容', + //visible: false, + formatter: function (value, row, index) { + return value; + //return changeDateFormat(value) + } + },{ + field: 'createTime', + title: '创建时间', + valign: 'middle', + formatter: function (value, row, index) { + return value; + //return changeDateFormat(value) + } + }, + { + field: 'creater', + title: '创建人', + valign: 'middle', + formatter: function (value, row, index) { + return value; + //return changeDateFormat(value) + } + } + ], //无线循环取子表，直到子表里面没有记录 + //onExpandRow: function (index, row, $Subdetail) { + //InitSubTable2(index, row, $Subdetail); + //} + }); + } } } @@ -594,7 +906,30 @@ $('#searchBtn').click(function () { //查询之后重新从第一页算起 if (tipLoad == 0) { - $("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); //刷新 + + var startDate2=$("#startDate").val(), + endDate2= $("#endDate").val(), + inpNo2="" + $("#inpNo").val(), + visitId2=""+$("#visitId").val(), + name2=""+$("#name").val(), + doctorInCharge2=""+$("#doctorInCharge").val(), + typeFlag2 = $("#typeFlag").val(), + creater2=""+$("#creater").val(), + //backer2=""+$("#backer").val(), + archivestate2="" + $("#archivestate").val(), + deptName2= $("#archivestate").val(); + + if((startDate2==null || startDate2=="") && (endDate2==null || endDate2=="")&& (inpNo2==null || inpNo2=="") && (visitId2==null || visitId2=="") + && (name2==null || name2=="") && (doctorInCharge2==null || doctorInCharge2=="") && (archivestate2==null || archivestate2=="") && (deptName2==null || deptName2=="")){ + if((typeFlag2!=null && typeFlag2!="") || (creater2!=null || creater2!="") ){ + $("#faultTable").bootstrapTable("refreshOptions", {pageNumber: 1}); //刷新 + }else{ + $("#backTable").bootstrapTable("refreshOptions", {pageNumber: 1}); //刷新 + } + }else{ + $("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); //刷新 + } + //$('#table').bootstrapTable('refresh'); } else { toastr.warning("正在查询，请稍等..."); @@ -618,6 +953,8 @@ for (var i = 0; i < data.length; i++) { $("#doctorInCharge").append(""); $("#creater").append(""); + //$("#backer").append(""); + } } $(".selectpicker").selectpicker('refresh'); @@ -719,6 +1056,7 @@ //导出excel功能 $("#excelBtn").click(function () { + var backFlag = "5,6"; var inpNo = "" + $("#inpNo").val(); var visitId = "" + $("#visitId").val(); var name = "" + $("#name").val(); @@ -744,21 +1082,23 @@ } //主管医生、创建人、缺陷选项 - /*var doctorInCharge=""+$("#doctorInCharge").val(); + var doctorInCharge=""+$("#doctorInCharge").val(); var typeFlag = $("#typeFlag").val(); if (typeFlag== undefined ||typeFlag== null ||typeFlag== "undefined") { typeFlag = ""; } else { typeFlag = $("#typeFlag").val().toString(); } - var updater=""+typeFlag; - var creater=""+$("#creater").val();*/ + var assortId=""+typeFlag; + var creater=""+$("#creater").val(); + //var backer=""+$("#backer").val(); //导出ArchiveState in('已归档','已认证','初审') window.location.href = "${path}/fault/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId + "&name=" + name + "&startDate=" + startDate + "&endDate=" + endDate + "&archivestate=" + archivestate+ - "&deptName="+ deptName; - //+ "&doctorInCharge=" + doctorInCharge ; - //+ "&updater=" + updater + "&creater=" + creater; + "&deptName="+ deptName + "&doctorInCharge=" + doctorInCharge + + "&assortId=" + assortId + "&creater=" + creater+"&backFlag="+backFlag; + + });