diff --git a/doc/sql脚本.sql b/doc/sql脚本.sql new file mode 100644 index 0000000..84e90ef --- /dev/null +++ b/doc/sql脚本.sql @@ -0,0 +1,158 @@ +-- 增加任务清单主表 hcy 2024-05-13 + +IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[Export_Task]') AND type IN ('U')) + DROP TABLE [dbo].[Export_Task] +GO + +CREATE TABLE [dbo].[Export_Task] ( + [task_id] int IDENTITY(1,1) NOT NULL, + [task_name] varchar(30) COLLATE Chinese_PRC_CI_AS NULL, + [state] int NULL, + [create_date] datetime2(0) NULL +) +GO + +ALTER TABLE [dbo].[Export_Task] SET (LOCK_ESCALATION = TABLE) +GO + +EXEC sp_addextendedproperty +'MS_Description', N'主键task_id', +'SCHEMA', N'dbo', +'TABLE', N'Export_Task', +'COLUMN', N'task_id' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'任务名称', +'SCHEMA', N'dbo', +'TABLE', N'Export_Task', +'COLUMN', N'task_name' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'0.无效 1.有效', +'SCHEMA', N'dbo', +'TABLE', N'Export_Task', +'COLUMN', N'state' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'创建时间', +'SCHEMA', N'dbo', +'TABLE', N'Export_Task', +'COLUMN', N'create_date' +GO + + +-- ---------------------------- +-- Auto increment value for Export_Task +-- ---------------------------- +DBCC CHECKIDENT ('[dbo].[Export_Task]', RESEED, 1) +GO + + +-- ---------------------------- +-- Primary Key structure for table Export_Task +-- ---------------------------- +ALTER TABLE [dbo].[Export_Task] ADD CONSTRAINT [PK_Export_Task_id] PRIMARY KEY CLUSTERED ([task_id]) +WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) +ON [PRIMARY] +GO + + + +-- 增加任务清单明细表 hcy 2024-05-13 + +IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[Export_Task_Details]') AND type IN ('U')) + DROP TABLE [dbo].[Export_Task_Details] +GO + +CREATE TABLE [dbo].[Export_Task_Details] ( + [id] int IDENTITY(1,1) NOT NULL, + [taskId] int NULL, + [inpNo] varchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [dischargeDateTime] datetime2(0) NULL, + [state] int NULL +) +GO + +ALTER TABLE [dbo].[Export_Task_Details] SET (LOCK_ESCALATION = TABLE) +GO + +EXEC sp_addextendedproperty +'MS_Description', N'主键id', +'SCHEMA', N'dbo', +'TABLE', N'Export_Task_Details', +'COLUMN', N'id' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'任务表id', +'SCHEMA', N'dbo', +'TABLE', N'Export_Task_Details', +'COLUMN', N'taskId' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'病案号', +'SCHEMA', N'dbo', +'TABLE', N'Export_Task_Details', +'COLUMN', N'inpNo' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'出院日期', +'SCHEMA', N'dbo', +'TABLE', N'Export_Task_Details', +'COLUMN', N'dischargeDateTime' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'0.未开始1.完成2.失败', +'SCHEMA', N'dbo', +'TABLE', N'Export_Task_Details', +'COLUMN', N'state' +GO + + +-- ---------------------------- +-- Auto increment value for Export_Task_Details +-- ---------------------------- +DBCC CHECKIDENT ('[dbo].[Export_Task_Details]', RESEED, 1) +GO + + +-- ---------------------------- +-- Primary Key structure for table Export_Task_Details +-- ---------------------------- +ALTER TABLE [dbo].[Export_Task_Details] ADD CONSTRAINT [PK__Export_T__3213E83F1D7B6025] PRIMARY KEY CLUSTERED ([id]) +WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) +ON [PRIMARY] +GO + + +-- 增加导出分段字典表 hcy 2024-05-13 + +IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[export_zd_assort]') AND type IN ('U')) + DROP TABLE [dbo].[export_zd_assort] +GO + +CREATE TABLE [dbo].[export_zd_assort] ( + [assort_id] varchar(255) COLLATE Chinese_PRC_CI_AS NOT NULL, + [assort_name] varchar(255) COLLATE Chinese_PRC_CI_AS NULL, + [assort_sort] int NULL, + [export_flag] varchar(255) COLLATE Chinese_PRC_CI_AS NULL, + [gj_assort_name] varchar(255) COLLATE Chinese_PRC_CI_AS NULL +) +GO + +ALTER TABLE [dbo].[export_zd_assort] SET (LOCK_ESCALATION = TABLE) +GO + +-- 增加任务清单导入、费用清单菜单 hcy 2024-05-13 + +INSERT INTO `power_menu`(`menu_name`, `menu_icon`, `menu_url`, `menu_desc`, `method`, `function_type`, `method_type`, `sys_id`, `sys_flag`, `parent_id`, `sort`, `effective`, `create_date`, `creater`, `update_date`, `updater`, `remark`) VALUES ('常用查询-费用清单上传', NULL, '/commom/uploadCostList', '功能', 'uploadCostList', '', '文档类', 15, 'emr_record', 216, 13, 1, '2019-09-05', 'admin', '2024-04-23', 'admin', ''); +INSERT INTO `power_menu`(`menu_name`, `menu_icon`, `menu_url`, `menu_desc`, `method`, `function_type`, `method_type`, `sys_id`, `sys_flag`, `parent_id`, `sort`, `effective`, `create_date`, `creater`, `update_date`, `updater`, `remark`) VALUES ('任务清单列表', 'fa fa-circle-o', '/exportTask/exportTaskList', '菜单', NULL, NULL, NULL, 15, 'emr_record', 211, 6, 1, '2024-04-28', 'admin', '2024-04-28', 'admin', ''); +INSERT INTO `power_menu`(`menu_name`, `menu_icon`, `menu_url`, `menu_desc`, `method`, `function_type`, `method_type`, `sys_id`, `sys_flag`, `parent_id`, `sort`, `effective`, `create_date`, `creater`, `update_date`, `updater`, `remark`) VALUES ('任务清单-导入excel', NULL, '/exportTask/impExcelTask', '功能', 'impExcelTask', '', '文档类', 15, 'emr_record', 424, 1, 1, '2024-04-28', 'admin', '2024-04-28', 'admin', ''); +INSERT INTO `power_menu`(`menu_name`, `menu_icon`, `menu_url`, `menu_desc`, `method`, `function_type`, `method_type`, `sys_id`, `sys_flag`, `parent_id`, `sort`, `effective`, `create_date`, `creater`, `update_date`, `updater`, `remark`) VALUES ('任务清单-导出pdf', NULL, '/exportTask/exportPdf', '功能', 'exportPdf', '', '文档类', 15, 'emr_record', 424, 2, 1, '2024-04-28', 'admin', '2024-04-28', 'admin', ''); +INSERT INTO `power_menu`(`menu_name`, `menu_icon`, `menu_url`, `menu_desc`, `method`, `function_type`, `method_type`, `sys_id`, `sys_flag`, `parent_id`, `sort`, `effective`, `create_date`, `creater`, `update_date`, `updater`, `remark`) VALUES ('任务清单明细查询', 'fa fa-circle-o', '/exportTaskDetails/exportTaskDetailsList', '菜单', NULL, NULL, NULL, 15, 'emr_record', 211, 7, 1, '2024-05-03', 'admin', '2024-05-03', 'admin', ''); diff --git a/src/main/java/com/emr/controller/exportTask/ExportTaskController.java b/src/main/java/com/emr/controller/exportTask/ExportTaskController.java index fee789f..8bbf982 100644 --- a/src/main/java/com/emr/controller/exportTask/ExportTaskController.java +++ b/src/main/java/com/emr/controller/exportTask/ExportTaskController.java @@ -66,9 +66,9 @@ public class ExportTaskController { //根据taskid查询所有需要导出病历的住院号出院日期 List taskList = exportTaskDetailsMapper.selectAllByTaskId(list.get(i).getTaskId()); if (taskList != null && taskList.size() > 0) { - list.get(i).setState(0); + list.get(i).setState(0);//按钮显示 }else{ - list.get(i).setState(1); + list.get(i).setState(2);//按钮不显示 } } } diff --git a/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java b/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java index d56b0c5..a4a5e7d 100644 --- a/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java +++ b/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java @@ -869,9 +869,9 @@ public class TemplateSearchController { public String cutomSearchTable(String selectSql,String fromTableSql,String whereSql,String orderBys,Integer page, Integer limit, HttpServletRequest request,String sortNames,String sortOrder) { //匹配权限 Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); - if (!sortNames.equals("id")&&!sortNames.equals("id")){ + if (!sortNames.equals("id")){ if (sortNames.equals("disDate")){ - orderBys="order by commomtable.dis_date"+" "+sortOrder; + orderBys="order by commomtable.inpatient_no"+" "+sortOrder +",commomtable.dis_date"+" "+sortOrder; } if (sortNames.equals("admissDate")){ orderBys="order by commomtable.admiss_date"+" "+sortOrder; diff --git a/src/main/java/com/emr/service/batchExport/BatchExportServiceImpl.java b/src/main/java/com/emr/service/batchExport/BatchExportServiceImpl.java index c3d1783..3101362 100644 --- a/src/main/java/com/emr/service/batchExport/BatchExportServiceImpl.java +++ b/src/main/java/com/emr/service/batchExport/BatchExportServiceImpl.java @@ -215,7 +215,8 @@ public class BatchExportServiceImpl implements BatchExportService { return "没有任务"; } response.reset(); - response.setContentType("application/vnd.ms-excel;charset=UTF-8"); + //response.setContentType("application/vnd.ms-excel;charset=UTF-8"); + response.setContentType("application/zip"); ZipOutputStream zos = null; BufferedOutputStream bos = null; ByteArrayOutputStream out = null; diff --git a/src/main/resources/mapper/ExportTaskDetailsMapper.xml b/src/main/resources/mapper/ExportTaskDetailsMapper.xml index 8671011..57c0edc 100644 --- a/src/main/resources/mapper/ExportTaskDetailsMapper.xml +++ b/src/main/resources/mapper/ExportTaskDetailsMapper.xml @@ -12,7 +12,7 @@ CONVERT(VARCHAR (100), dischargeDateTime, 23) as dischargeDateTime FROM Export_Task_Details WHERE taskId = #{taskId} - AND state = 0 + AND (state = 0 or state = 1)