修改查询hisPdf文件生成明细

master
zengwh 5 years ago
parent d262f095e2
commit df343174ae

Binary file not shown.

@ -282,19 +282,21 @@ public class beHospitaledController {
if(!CollectionUtils.isEmpty(archiveDetails) || !CollectionUtils.isEmpty(archiveSumbitdateInfoList)){
for (HisCollectInfo hisCollectInfo : list) {
String ffileId = hisCollectInfo.getFfileId();
if(!CollectionUtils.isEmpty(archiveDetails)){
for (Archive_Detail archiveDetail : archiveDetails) {
if (ffileId.equals(archiveDetail.getSubassort())) {
hisCollectInfo.setUpdateLoadTime(archiveDetail.getUploaddatetime());
break;
if(StringUtils.isNotBlank(ffileId)) {
if (!CollectionUtils.isEmpty(archiveDetails)) {
for (Archive_Detail archiveDetail : archiveDetails) {
if (ffileId.equals(archiveDetail.getSubassort())) {
hisCollectInfo.setUpdateLoadTime(archiveDetail.getUploaddatetime());
break;
}
}
}
}
if(!CollectionUtils.isEmpty(archiveSumbitdateInfoList)){
for (ArchiveSumbitdateInfo info : archiveSumbitdateInfoList) {
if (ffileId.equals(info.getFileId())) {
hisCollectInfo.setSumbitTime(info.getCreateTime());
break;
if (!CollectionUtils.isEmpty(archiveSumbitdateInfoList)) {
for (ArchiveSumbitdateInfo info : archiveSumbitdateInfoList) {
if (ffileId.equals(info.getFileId())) {
hisCollectInfo.setSumbitTime(info.getCreateTime());
break;
}
}
}
}

@ -107,18 +107,15 @@ public class OracleConnect {
pst = conn.prepareStatement(arg0);
rs = pst.executeQuery();
List<HisCollectInfo> list = new ArrayList<>();
if (rs != null) {
System.out.println("查询oracle");
if(!rs.next()) {
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);
}
if(rs.next()) {
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);

@ -1730,12 +1730,6 @@
//查询是否医生或护士是否提交
var result = 1;
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。
@ -2167,16 +2161,12 @@
});
//查看缺失详情
$("#showDefectTable").click(function () {
$("#modal-default").modal({
show: true
});
//加载分类
loadAssort();
//加载文件生成情况表格
initTable3();
})
//加载分类
function loadAssort(){
$('#myModal').modal('show');
$("#fentryNo").empty();
$.ajax({
type: 'post',
@ -2186,8 +2176,8 @@
},
dataType: 'json',
success: function (data) {
var html = '<option value="">全部</option>';
if(data != null){
if(data.length > 0){
var html = '<option value="">全部</option>';
//获取分段集合
var map = new Map();
for(var i = 0;i < data.length;i++){
@ -2197,8 +2187,16 @@
map.forEach(function(value,key){
html += '<option value="'+key+'">'+value+'</option>';
})
//加载文件生成情况表格
initTable3();
$("#modal-default").modal({
show: true
});
$("#fentryNo").append(html);
}else{
toastr.warning("未查询到his病历生成任务,请耐心等待!")
}
$("#fentryNo").append(html);
$('#myModal').modal('hide');
}
});
}
@ -2217,7 +2215,7 @@
},
dataType:'json',
success:function(data){
if(data != null) {
if(data.length > 0) {
//加载成功数量
loadCollectNum(data);
$('#table3').bootstrapTable('destroy');
@ -2348,36 +2346,35 @@
}
}
],
onLoadError: function () { //加载失败时执行
console.info("加载数据失败");
}
});
$('#myModal').modal('hide');
}
$('#myModal').modal('hide');
}
})
}
//加载采集数量
function loadCollectNum(data){
function loadCollectNum(data) {
//总数量
$("#collectTotle").text(data.length);
//完成数
var finishNum = 0;
for(var i = 0;i < data.length;i++){
if(data[i].pdfflag == '1'){
for (var i = 0; i < data.length; i++) {
if (data[i].pdfflag == '1') {
finishNum++;
}
}
$("#collectFinish").text(finishNum);
//为完成数
$("#collectUnFinish").text(data.length-finishNum);
//完成百分比
var percent = Math.round(finishNum*100/data.length);
$("#collectFinishPercent").text(percent);
$("#collectUnFinish").text(data.length - finishNum);
var color = 'red';
if(percent >= 80){
color = 'green';
//完成百分比
if (data.length > 0) {
var percent = Math.round(finishNum * 100 / data.length);
$("#collectFinishPercent").text(percent);
if (percent >= 80) {
color = 'green';
}
}
$("#collectFinishPercentId").css("color",color);
}
@ -2427,7 +2424,6 @@
toastr.error(data.msg);
}
$('#myModal').modal('hide');
}
})
}

Loading…
Cancel
Save