diff --git a/src/main/java/com/emr/controller/faultController.java b/src/main/java/com/emr/controller/faultController.java index d7ee5734..e3cc6e8e 100644 --- a/src/main/java/com/emr/controller/faultController.java +++ b/src/main/java/com/emr/controller/faultController.java @@ -191,7 +191,20 @@ public class faultController { @ResponseBody @RequestMapping(value = "/exportScoreExcel") public void exportScoreExcel(HttpServletResponse response, Emr_Fault_Vo emrFaultVo) throws Exception { - + response.setContentType("application/vnd.ms-excel;charset=UTF-8"); + String[] header = new String[]{ "住院号", "住院次数", "姓名", "出院科室", "出院日期", "归档状态", "评分", "评分(等级)", "主管医生", "退回总次数","缺陷内容","缺陷自动内容","扣分","创建人"}; + String[] fileNames = new String[]{ "inpNo", "visitId", "name", "deptName", "dischargeDateTime", "archivestate", "score", "grade","doctorInCharge", "totalBackNum","typeName","priceTwo","creater"}; + String fileName = "病例评分" + (new SimpleDateFormat("yyyyMMddHHmmss")).format(new Date()) + ".xls"; + List list = emrFaultDetailService.masterTotalScoreListExec(emrFaultVo); + for (Emr_Fault_Vo lists:list){ + BigDecimal score = lists.getScore(); + if (score==null){ + BigDecimal num1 = new BigDecimal("100"); + lists.setScore(num1); + } + } + ThreadExcelUtils utils = new ThreadExcelUtils(fileName, "", header, fileNames); + utils.exportExcelToFilePath(response, utils.listConvert(list)); } public boolean compare(String time1,String time2) throws ParseException { @@ -534,6 +547,14 @@ public class faultController { } + @ResponseBody + @RequestMapping(value = "/faultListByTjPriceTwo") + public OffsetLimitPage faultListByTjPriceTwo(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit) { + OffsetLimitPage result = emrFaultDetailService.selByColPriceTwo(emrFaultVo, offset, limit); + return result; + + } + @ResponseBody @RequestMapping(value = "/masterTotalList") public OffsetLimitPage masterTotalList(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit) { diff --git a/src/main/java/com/emr/dao/Emr_Fault_DetailMapper.java b/src/main/java/com/emr/dao/Emr_Fault_DetailMapper.java index 876b3e0e..3884383d 100644 --- a/src/main/java/com/emr/dao/Emr_Fault_DetailMapper.java +++ b/src/main/java/com/emr/dao/Emr_Fault_DetailMapper.java @@ -142,6 +142,12 @@ public interface Emr_Fault_DetailMapper { List masterTotalListTwo(Emr_Fault_Vo emrFaultVo); + /** + * 根据条件查询病案信息、退回总次数、总费用和总评分 + * @param emrFaultVo + * @return + */ + List masterTotalListTwoExce(Emr_Fault_Vo emrFaultVo); /** * 根据条件查询病案信息、退回总次数、总费用和总评分 @@ -164,6 +170,14 @@ public interface Emr_Fault_DetailMapper { */ List selByCol(Emr_Fault_Vo emrFaultVo); + + /** + * 根据条件查询病案缺陷列表 + * @param emrFaultVo + * @return + */ + List selByColPriceTwo(Emr_Fault_Vo emrFaultVo); + List faultBackMasterIdListByBackFlag(@Param("backFlags")String backFlags,@Param("masterIds")String masterIds); diff --git a/src/main/java/com/emr/service/Emr_Fault_DetailService.java b/src/main/java/com/emr/service/Emr_Fault_DetailService.java index 9d028148..b8f19dea 100644 --- a/src/main/java/com/emr/service/Emr_Fault_DetailService.java +++ b/src/main/java/com/emr/service/Emr_Fault_DetailService.java @@ -143,7 +143,7 @@ public interface Emr_Fault_DetailService { List masterTotalList(Emr_Fault_Vo emrFaultVo); - + List masterTotalSocerListExec(Emr_Fault_Vo emrFaultVo); /** * 根据条件查询病案信息、退回总次数、总费用和总评分列表 @@ -169,6 +169,12 @@ public interface Emr_Fault_DetailService { * @return */ OffsetLimitPage masterTotalScoreList(Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit); + /** + * 根据条件查询病案信息、退回总次数、总费用和总评分列表分页 + * @param emrFaultVo + * @return + */ + List masterTotalScoreListExec(Emr_Fault_Vo emrFaultVo); /** * 根据条件查询病案缺陷的退回及评分列表 * @param emrFaultVo @@ -197,6 +203,22 @@ public interface Emr_Fault_DetailService { */ OffsetLimitPage selByCol(Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit); + + /** + * 根据条件查询病案缺陷列表 + * @param emrFaultVo + * @return + */ + OffsetLimitPage selByColPriceTwo(Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit); + + + /** + * 根据条件查询病案缺陷列表 + * @param emrFaultVo + * @return + */ + List selByColPriceTwoExecl(Emr_Fault_Vo emrFaultVo); + } diff --git a/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java b/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java index 6f707866..164727cc 100644 --- a/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java @@ -372,6 +372,74 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService { return list; } + @Override + public List masterTotalSocerListExec(Emr_Fault_Vo emrFaultVo) { + //获取病案信息 + List list= emrFaultDetailMapper.masterTotalListTwoExce(emrFaultVo); + if(list!=null && list.size()>0) { + JSONArray powerUsers = powerUserService.getPowerUserList("1"); + List powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); + if (powerUserList != null){ + Map mappedMovies = Maps.uniqueIndex(powerUserList, new Function() { + @Override + public String apply(JSONObject temp) { + return temp.getString("userName"); + }}); + + for (Emr_Fault_Vo emr_fault_vo : list) { + //主管医生 + JSONObject userInfo = mappedMovies.get(emr_fault_vo.getDoctorInCharge()); + if (userInfo == null) { + emr_fault_vo.setDoctorInCharge(emr_fault_vo.getDoctorInCharge()); + } else { + emr_fault_vo.setDoctorInCharge(userInfo.getString("name")); + } + //退回人 + userInfo = mappedMovies.get(emr_fault_vo.getCreater()); + if (userInfo == null) { + emr_fault_vo.setCreater(emr_fault_vo.getCreater()); + } else { + emr_fault_vo.setCreater(userInfo.getString("name")); + } + List peiceByMasterID = emrFaultDetailMapper.getPeiceByMasterID(emr_fault_vo.getMasterId()); + if (peiceByMasterID!=null && !peiceByMasterID.isEmpty()){ + for (int i=0;peiceByMasterID.size()>i;i++){ + if (peiceByMasterID.get(0).getCnum()>0){ + emr_fault_vo.setGrade("不合格"); + } + if (peiceByMasterID.get(0).getBnum()>1){ + emr_fault_vo.setGrade("不合格"); + } + BigDecimal priceSum = peiceByMasterID.get(0).getPriceSum(); + BigDecimal num1 = new BigDecimal("100"); + if(priceSum!=null){ + BigDecimal b = new BigDecimal(90); + BigDecimal result2 = num1.subtract(priceSum); + emr_fault_vo.setScore(result2); + if (peiceByMasterID.get(0).getCnum()==0 &&peiceByMasterID.get(0).getBnum()==0 && result2.compareTo(b) == 1){ + emr_fault_vo.setGrade("优秀病历"); + } + if (result2.compareTo(b) == -1){ + emr_fault_vo.setGrade("不合格"); + } + }else { + emr_fault_vo.setScore(num1); + if (peiceByMasterID.get(0).getCnum()==0 &&peiceByMasterID.get(0).getBnum()==0 ){ + emr_fault_vo.setGrade("优秀病历"); + } + } + } + }else { + emr_fault_vo.setGrade("优秀病历"); + } + + } + + } + } + return list; + } + @Override @@ -414,17 +482,27 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService { } BigDecimal priceSum = peiceByMasterID.get(0).getPriceSum(); BigDecimal num1 = new BigDecimal("100"); - BigDecimal result2 = num1.subtract(priceSum); - BigDecimal b = new BigDecimal(90); - if (result2.compareTo(b) == -1){ - emr_fault_vo.setGrade("不合格"); - } - if (peiceByMasterID.get(0).getCnum()==0 &&peiceByMasterID.get(0).getBnum()==0 && result2.compareTo(b) == 1){ - emr_fault_vo.setGrade("优秀病历"); + if(priceSum!=null){ + BigDecimal b = new BigDecimal(90); + BigDecimal result2 = num1.subtract(priceSum); + emr_fault_vo.setScore(result2); + if (peiceByMasterID.get(0).getCnum()==0 &&peiceByMasterID.get(0).getBnum()==0 && result2.compareTo(b) == 1){ + emr_fault_vo.setGrade("优秀病历"); + } + if (result2.compareTo(b) == -1){ + emr_fault_vo.setGrade("不合格"); + } + }else { + emr_fault_vo.setScore(num1); + if (peiceByMasterID.get(0).getCnum()==0 &&peiceByMasterID.get(0).getBnum()==0 ){ + emr_fault_vo.setGrade("优秀病历"); + } } - emr_fault_vo.setScore(result2); } + }else { + emr_fault_vo.setGrade("优秀病历"); } + } } @@ -432,6 +510,7 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService { return list; } + @Override public OffsetLimitPage masterTotalList(Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); @@ -448,6 +527,13 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService { return new OffsetLimitPage((Page) list); } + + @Override + public List masterTotalScoreListExec(Emr_Fault_Vo emrFaultVo) { + List list =masterTotalSocerListExec(emrFaultVo); + return list; + } + @Override public List faultBackScoreList(Emr_Fault_Vo emrFaultVo) { List list= emrFaultDetailMapper.faultBackScoreList(emrFaultVo); @@ -590,6 +676,68 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService { return new OffsetLimitPage((Page) list); } + + @Override + public OffsetLimitPage selByColPriceTwo(Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit) { + PageHelper.offsetPage(offset, limit); + List list = emrFaultDetailMapper.selByColPriceTwo(emrFaultVo); + if(list!=null && list.size()>0) { + JSONArray powerUsers = powerUserService.getPowerUserList("1"); + List powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); + if (powerUserList != null) { + Map mappedMovies = Maps.uniqueIndex(powerUserList, new Function() { + @Override + public String apply(JSONObject temp) { + return temp.getString("userName"); + } + }); + + for (Emr_Fault_Vo emr_fault_vo : list) { + //创建人 + JSONObject userInfo = mappedMovies.get(emr_fault_vo.getCreater()); + if (userInfo == null) { + emr_fault_vo.setCreater(emr_fault_vo.getCreater()); + } else { + emr_fault_vo.setCreater(userInfo.getString("name")); + } + } + } + } + return new OffsetLimitPage((Page) list); + } + + + + + + @Override + public List selByColPriceTwoExecl(Emr_Fault_Vo emrFaultVo) { + List list = emrFaultDetailMapper.selByColPriceTwo(emrFaultVo); + if(list!=null && list.size()>0) { + JSONArray powerUsers = powerUserService.getPowerUserList("1"); + List powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); + if (powerUserList != null) { + Map mappedMovies = Maps.uniqueIndex(powerUserList, new Function() { + @Override + public String apply(JSONObject temp) { + return temp.getString("userName"); + } + }); + + for (Emr_Fault_Vo emr_fault_vo : list) { + //创建人 + JSONObject userInfo = mappedMovies.get(emr_fault_vo.getCreater()); + if (userInfo == null) { + emr_fault_vo.setCreater(emr_fault_vo.getCreater()); + } else { + emr_fault_vo.setCreater(userInfo.getString("name")); + } + } + } + } + return list; + } + public boolean compare(String time1,String time2) throws ParseException{ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Date a=sdf.parse(time1); diff --git a/src/main/resources/mapper/Emr_Fault_DetailMapper.xml b/src/main/resources/mapper/Emr_Fault_DetailMapper.xml index 0581e817..79ea1a75 100644 --- a/src/main/resources/mapper/Emr_Fault_DetailMapper.xml +++ b/src/main/resources/mapper/Emr_Fault_DetailMapper.xml @@ -212,6 +212,142 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/faultScoreDir/faultScoreList.jsp b/src/main/webapp/WEB-INF/views/faultScoreDir/faultScoreList.jsp index ef8b2922..f89d872a 100644 --- a/src/main/webapp/WEB-INF/views/faultScoreDir/faultScoreList.jsp +++ b/src/main/webapp/WEB-INF/views/faultScoreDir/faultScoreList.jsp @@ -508,6 +508,13 @@ field: 'grade', align: 'center', valign: 'middle', + // formatter: function (value, row, index) { + // let grade = row.grade; + // if(grade==null ||grade==undefined || grade==0){ + // grade='优秀病历'; + // } + // return grade; + // } }, { title: '主管医生', @@ -530,163 +537,163 @@ //console.info("加载数据失败"); tipLoad = 0; },onExpandRow: function (index, row, $detail) { - InitSubTable(index, row, $detail); + InitSubTable2(index, row, $detail); //backIdArr.push($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); - } - }); - } + <%--//初始化子表格(无线循环)--%> + <%--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) { @@ -694,7 +701,7 @@ toastr.warning("退回次数为异常，请先纠正!"); return; } - var archiveDetailId = row.archiveDetailId; + var archiveDetailId = row.masterId; var startDateTo=row.startDateTo; var endDateTo=row.endDateTo; var cur_table2 = $detail.html('
').find('table'); @@ -703,7 +710,7 @@ backIndex++; $(cur_table2).bootstrapTable({ //method: 'POST', - url: "${path}/fault/faultListByTj", // 获取表格数据的url + url: "${path}/fault/faultListByTjPriceTwo", // 获取表格数据的url contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据 //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行 detailView: false,//父子表，为true会在父数据前添加 “+” @@ -761,9 +768,7 @@ order: params.order, //排位命令（desc，asc） archiveDetailId: archiveDetailId, startDateTo: startDateTo, - creater:""+$("#creater").val(), endDateTo: endDateTo, - backFlag:"5,6", assortId:""+typeFlag }; @@ -808,17 +813,16 @@ //return changeDateFormat(value) } },{ - field: 'score', - title: '评分(分)', + field: 'priceTwo', + title: '扣分(分)', //sortable: true, align: 'center', valign: 'middle', formatter: function (value, row, index) { if(value==null ||value==undefined){ - value=100; + value=0; } return value; - //return changeDateFormat(value) } }, { @@ -1090,13 +1094,13 @@ //导出excel功能 $("#excelBtn").click(function () { toastr.warning("正在导出，请稍等..."); - var backFlag = "5,6"; var inpNo = "" + $("#inpNo").val(); var visitId = "" + $("#visitId").val(); var name = "" + $("#name").val(); var startDate = "" + $("#startDate").val(); var endDate = "" + $("#endDate").val(); var archivestate = "" + $("#archivestate").val(); + var sysflag = "" + $("#sysflag").val(); /*var url = window.location.href; var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); @@ -1124,13 +1128,12 @@ typeFlag = $("#typeFlag").val().toString(); } var assortId=""+typeFlag; - var creater=""+$("#creater").val(); //var backer=""+$("#backer").val(); //导出ArchiveState in('已归档','已认证','初审') - window.location.href = "${path}/fault/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId + + window.location.href = "${path}/fault/exportScoreExcel?inpNo=" + inpNo + "&visitId=" + visitId + "&name=" + name + "&startDate=" + startDate + "&endDate=" + endDate + "&archivestate=" + archivestate+ "&deptName="+ deptName + "&doctorInCharge=" + doctorInCharge - + "&assortId=" + assortId + "&creater=" + creater+"&backFlag="+backFlag; + + "&assortId=" + assortId+"&sysflag"+sysflag; });