任务详情增加分段

master
zengwh 5 years ago
parent a4dda9413d
commit 618e118395

Binary file not shown.

@ -34,7 +34,9 @@ public class ArchiveOtherExtController {
@RequestMapping("getArchiveExtInfo")
@ResponseBody
public OffsetLimitPage getArchiveExtInfo(Integer offset, Integer limit, ArchiveOtherExtVo archiveOtherExtVo, HttpServletRequest request){
PageHelper.offsetPage(offset,limit);
if(null != offset && null != limit) {
PageHelper.offsetPage(offset, limit);
}
try {
List<ArchiveOtherExtVo> list = archiveOtherExtService.getArchiveExtInfo(request,archiveOtherExtVo);
return new OffsetLimitPage((Page) list);
@ -44,6 +46,18 @@ public class ArchiveOtherExtController {
return null;
}
}
@RequestMapping("getArchiveExtInfoList")
@ResponseBody
public List<ArchiveOtherExtVo> getArchiveExtInfoList(ArchiveOtherExtVo archiveOtherExtVo, HttpServletRequest request){
try {
List<ArchiveOtherExtVo> list = archiveOtherExtService.getArchiveExtInfo(request,archiveOtherExtVo);
return list;
} catch (Exception e) {
ExceptionPrintUtil.printException(e);
e.printStackTrace();
return null;
}
}
/**
*

@ -30,4 +30,8 @@ public class ArchiveOtherExtVo extends ArchiveOtherExt {
private String statusFlagStr;
private String createTime;
private String assortName;
private String assortId;
}

@ -432,7 +432,7 @@
</if>
</sql>
<select id="getArchiveExtInfo" resultMap="BaseResultMap">
select * from (
select temp.*,zd_assort.assort_name,zd_assort.assort_id from (
select
archive_other_ext.ID idTemp,
SycTime,
@ -443,6 +443,7 @@
statusFlag,
pResult,
C1,
DID,
archive_other_ext_submitTime.create_time
from archive_other_ext
left join
@ -463,6 +464,7 @@
statusFlag,
pResult,
C1,
DID,
archive_other_ext_submitTime.create_time
from archive_other_ext
left join
@ -484,6 +486,7 @@
statusFlag,
pResult,
C1,
DID,
archive_other_ext_submitTime.create_time
from archive_other_ext
left join
@ -495,6 +498,17 @@
</where>
order by sysUpdateTime desc
) temp
left join
archive_detail
on temp.DID = archive_detail.id
left join
zd_assort
on archive_detail.AssortID = zd_assort.assort_id
<where>
<if test="assortId != null and assortId != ''">
and zd_assort.assort_id = #{assortId,jdbcType=NVARCHAR}
</if>
</where>
order by sysupdatetimeStr
</select>
<!--批量更新statusFlag = 0-->

@ -709,6 +709,12 @@
<option value=''>请选择状态</option>
</select>
</div>
<div class="form-group divCss8">
<label for="inpNo">分段:</label>
<select class="form-control input-sm" id="assortIdSearch">
<option value=''>请选择分段</option>
</select>
</div>
<div class="form-group divCss8">
<label for="inpNo">来源:</label>
<select class="form-control input-sm" id="sysflag">
@ -726,7 +732,7 @@
</div>
</div>--%>
<div class="form-group divCss8" style="margin:0;margin-left: 10px;">
<button type="button" class="btn btn-primary btn-sm" onclick="initTable5()">查询</button>
<button type="button" class="btn btn-primary btn-sm" onclick="initTable5('','server')">查询</button>
<button type="button" class="btn btn-primary btn-sm" id="searchBtn6">批量更新</button>
</div>
</div>
@ -745,6 +751,6 @@
</div>
</body>
<script src="${path}/static/js/beHospList/beHospList.js?time=2020-10-09"></script>
<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-10-09"></script>
<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-10-09_1"></script>
<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-10-09"></script>
</html>

@ -1001,28 +1001,87 @@ $("#workDetail").click(function(){
$("#workDetailModal").modal({
show: true//弹出对话框
});
initTable5();
//置空初始化
table5Data = '';
$.ajax({
type:'get',
url:path+'/archiveExt/getArchiveExtInfoList',
data:{jzh: $("#patientId").val()},
dataType:'json',
success:function(data){
loadTable5Table(data);
initTable5(data,'client');
},
error:function(data){
console.log('查询出错了')
}
})
})
//初始化选择框
function loadTable5Table(rows){
//初始化条件选择框
if(rows != null && rows != ''){
var sysFlagMap = new Map();
var statusFlagMap = new Map();
var assortIdMap = new Map();
for (var i = 0; i < rows.length; i++) {
var sysFlag = rows[i].sysflag;
if(sysFlag != null){
sysFlagMap.set(sysFlag,rows[i].sysFlagStr);
}
var statusflag = rows[i].statusflag;
if(statusflag != null){
statusFlagMap.set(statusflag,rows[i].statusFlagStr);
}
var assortId = rows[i].assortId;
if(assortId != null){
assortIdMap.set(assortId,rows[i].assortName);
}
}
//加载来源选择框
if(sysFlagMap != null){
var html = "<option value=''>请选择来源</option>";
$("#sysflag").empty();
sysFlagMap.forEach(function(value,key){
html += '<option value="'+key+'">'+value+'</option>'
});
$("#sysflag").append(html);
}
//加载状态选择框
if(statusFlagMap != null){
var html = "<option value=''>请选择状态</option>";
$("#statusflag").empty();
statusFlagMap.forEach(function(value,key){
html += '<option value="'+key+'">'+value+'</option>'
});
$("#statusflag").append(html);
}
//加载分段选择框
if(assortIdMap != null){
var html = "<option value=''>请选择分段</option>";
$("#assortIdSearch").empty();
assortIdMap.forEach(function(value,key){
html += '<option value="'+key+'">'+value+'</option>'
});
$("#assortIdSearch").append(html);
}
}
}
//任务详情
var table5Data = '';
function initTable5() {
function initTable5(data,sidePagination) {
var option = {};
$("#table5").bootstrapTable("destroy");
$("#table5").bootstrapTable({ // 对应table标签的id
option = { // 对应table标签的id
//method: 'POST',
url: path+"/archiveExt/getArchiveExtInfo", // 获取表格数据的url
contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求注释掉这句话也能拿到数据
//dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行
cache: false, // 设置为 false 禁用 AJAX 数据缓存, 默认为true
cache: false, // 设置为ab false 禁用 AJAX 数据缓存, 默认为true
striped: true, //表格显示条纹默认为false
pagination: true, // 在表格底部显示分页组件默认false
paginationShowPageGo: true,
pageList: [10, 20, 50, 100], // 如果设置了分页设置可供选择的页面数据条数。设置为All 则显示所有记录。
smartDisplay: false,
pageSize: 2, // 页面数据条数
pageSize: 10, // 页面数据条数
pageNumber: 1, // 初始化加载第一页,默认第一页
sidePagination: 'server', // 设置为服务器端分页 客户端client
sidePagination: sidePagination, // 设置为服务器端分页 客户端client
search: false,
//showColumns: true,
searchOnEnterKey: true, //设置为 true时按回车触发搜索方法否则自动触发搜索方法
@ -1059,6 +1118,7 @@ function initTable5() {
c1: $("#c1").val(),
statusflag:$("#statusflag").val(),
sysflag:$("#sysflag").val(),
assortId:$("#assortIdSearch").val()
};
return temp;
},
@ -1152,6 +1212,12 @@ function initTable5() {
}
}
},
{
title: '分段',
field: 'assortName',
align: 'center',
valign: 'middle'
},
{
title: '备注',
field: 'presult',
@ -1185,65 +1251,14 @@ function initTable5() {
return operDisTime(value);
}
}
],
onLoadSuccess: function (result) { //加载成功时执行
//初始化条件选择框
if(table5Data == ''){
if(result != null && result != ''){
table5Data = result;
var rows = result.rows;
var sysFlagMap = new Map();
var statusFlagMap = new Map();
for (var i = 0; i < rows.length; i++) {
var sysFlag = rows[i].sysflag;
if(sysFlag != null){
sysFlagMap.set(sysFlag,rows[i].sysFlagStr);
}
var statusflag = rows[i].statusflag;
if(statusflag != null){
statusFlagMap.set(statusflag,rows[i].statusFlagStr);
}
}
//加载来源选择框
if(sysFlagMap != null){
var html = "<option value=''>请选择来源</option>";
$("#sysflag").empty();
sysFlagMap.forEach(function(value,key){
html += '<option value="'+key+'">'+value+'</option>'
});
$("#sysflag").append(html);
}
//加载状态选择框
if(statusFlagMap != null){
var html = "<option value=''>请选择状态</option>";
$("#statusflag").empty();
statusFlagMap.forEach(function(value,key){
html += '<option value="'+key+'">'+value+'</option>'
});
$("#statusflag").append(html);
}
}
}
},
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 = [];
}
});
]
};
if(data == ''){
option.url = path+"/archiveExt/getArchiveExtInfo";
}else{
option.data = data;
}
$("#table5").bootstrapTable(option);
}
//同步更新
function submitUpdate(ids,notNursingIds,sysFlag) {
@ -1256,7 +1271,7 @@ function submitUpdate(ids,notNursingIds,sysFlag) {
if(data.code == 100){
toastr.success("同步更新已发送,请耐心等待!");
//刷新列表
initTable5();
initTable5('','server');
}else{
toastr.error(data.msg);
}

Loading…
Cancel
Save