From 764c8bb8d1b41d4bc2229b2f30da00fe3f89d01a Mon Sep 17 00:00:00 2001
From: ALW <850658129@qq.com>
Date: Tue, 13 Sep 2022 17:39:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=9F=E8=AE=A1=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E5=B1=95=E5=BC=80=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/beHospitaledController.java | 20 +++++
.../service/ipml/ArchiveOtherExtService.java | 20 ++---
.../webapp/static/js/vCount/vCountList.js | 87 ++++++++++++++-----
3 files changed, 97 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java
index e388c53..57a0227 100644
--- a/src/main/java/com/emr/controller/beHospitaledController.java
+++ b/src/main/java/com/emr/controller/beHospitaledController.java
@@ -160,6 +160,26 @@ public class beHospitaledController {
}
}
+
+
+ @ResponseBody
+ @RequestMapping(value = "/beHospList1")
+ public OffsetLimitPage beHospList1(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,Integer isSearch,HttpServletRequest request){
+ //判断是否是初始化查询，是初始化查询把开始结束时间置空
+ archiveMasterVo.setStartDateTo(null);
+ archiveMasterVo.setEndDateTo(null);
+ try {
+ return archiveMasterService.selectByColumn(archiveMasterVo, offset, limit,request);
+ } catch (Exception e) {
+ ExceptionPrintUtil.printException(e);
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+
+
+
@ResponseBody
@RequestMapping(value = "/exportExcel")
public void exportExcel(HttpServletResponse response, HttpServletRequest request,Archive_Master_Vo archiveMasterVo,Integer isSearch){
diff --git a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java
index 2880541..57ea0a6 100644
--- a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java
+++ b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java
@@ -186,17 +186,17 @@ public class ArchiveOtherExtService {
String idsTemp = idsStr;
//存在护理记录则调用护理按需采集功能
//20220909注释按需采集护理的单独处理逻辑（护理不在按照之前按需一个护理其它的所有的护理都要从新采集）
-// if(null != sysFlag && sysFlag == 1) {
-// //调用护理按需采集功能
-// archiveOtherService.updateArchiveOther(jzh, masterId,null,null);
-// //ext表更新非护理记录
-// if(StringUtils.isNotBlank(notNursingIds)){
-// idsTemp = splitString2String(notNursingIds);
-// }
-// }
+ if(null != sysFlag && sysFlag == 1) {
+ //调用护理按需采集功能
+ archiveOtherService.updateArchiveOther(jzh, masterId,null,null);
+ //ext表更新非护理记录
+ if(StringUtils.isNotBlank(notNursingIds)){
+ idsTemp = splitString2String(notNursingIds);
+ }
+ }
// if (null != sysFlag && sysFlag == 3){
-//// archiveOtherService.updateArchiveOtherExt(ids)
-//// }
+// archiveOtherService.updateArchiveOtherExt(ids)
+// }
//ext表更新非护理记录
if(StringUtils.isNotBlank(notNursingIds)){
diff --git a/src/main/webapp/static/js/vCount/vCountList.js b/src/main/webapp/static/js/vCount/vCountList.js
index 717d51d..89da905 100644
--- a/src/main/webapp/static/js/vCount/vCountList.js
+++ b/src/main/webapp/static/js/vCount/vCountList.js
@@ -778,7 +778,7 @@ function initTable() {
' \n' +
' ';
$detail.html(html);
- initTable1();
+ initTable1(row);
}
});
}
@@ -786,9 +786,9 @@ function initTable() {
//第二层，按科室分组查
-function initTable1() {
+function initTable1(row) {
$("#table1").bootstrapTable({ // 对应table标签的id
- url: path + "/statistics/getRecordStatisticsGroupDept", // 获取表格数据的url
+ url: path + "/beHosp/beHospList1", // 获取表格数据的url
cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
striped: true, //表格显示条纹，默认为false
pagination: true, // 在表格底部显示分页组件，默认false
@@ -804,6 +804,9 @@ function initTable1() {
searchTimeOut: 500,// 默认500 设置搜索超时时间。
showHeader: true,//是否显示列头。
//查询条件
+ queryParams: function (params) {
+ return queryParams(params,this,row);
+ },
columns: [
{
title: '序号',
@@ -813,44 +816,45 @@ function initTable1() {
}
},
{
- title: '出院科室',
- field: 'deptNameCn',
+ title: '住院号',
+ field: 'inpNo',
align: 'left'
},
{
- title: '出院人数',
- field: 'allRecordCount',
+ title: '住院次数',
+ field: 'visitId',
align: 'center'
},
{
- title: '总文件数',
- field: 'allFileCount',
+ title: '姓名',
+ field: 'name',
align: 'center'
},
{
- title: '总页数',
- field: 'allPageCount',
+ title: '性别',
+ field: 'sex',
align: 'center'
},
{
- title: '自动采集总文件数',
- field: 'autoCollectionFileCount',
+ title: '出院科室',
+ field: 'deptName',
align: 'center'
},
{
- title: '自动采集总页数',
- field: 'autoCollectionPageCount',
+ title: '出院日期',
+ field: 'dischargeDateTime',
align: 'center'
},
{
- title: '扫描上传总文件数',
- field: 'manualScanFileCount',
+ title: '主管医生',
+ field: 'doctorInCharge',
align: 'center'
},
{
- title: '扫描上传总页数',
- field: 'manualScanPageCount',
- align: 'center'
+ title: '状态',
+ field: 'status',
+ align: 'center',
+ formatter:paramsMatter
},
],
onLoadSuccess: function (result) { //加载成功时执行
@@ -870,6 +874,49 @@ function initTable1() {
});
}
+//格式化状态
+function paramsMatter(value, row) {
+ var result = '';
+ if(row.days > 0){
+ result = '(超期)';
+ }
+ if(value == null){
+ value = '';
+ }
+ if(result != '') {
+ return '' + result + row.currentStatus + '
';
+ }
+ return value;
+}
+
+//各表格查询条件
+function queryParams(params,_this,row){
+ var currPageSize = _this.pageSize;
+ if (currPageSize == 2) {
+ currPageSize = 10;
+ }
+ var limit = null;
+ var offset = params.offset;
+ //判断是否导出全部all
+ if ($("#sel_exportoption").val() == "all") {
+ offset = 0;
+ limit = _this.totalRows;
+ _this.pageSize = limit;
+ } else {
+ limit = currPageSize;
+ _this.pageSize = currPageSize;
+ }
+ var deptName = row.deptCode;
+ var temp = {
+ offset:offset,
+ limit:limit,
+ deptName:deptName
+ };
+ return temp;
+}
+
+
+
//查询
$('#searchBtn').click(function () {
//查询之后重新从第一页算起