diff --git a/backup/vxetable-migration-20260602/datadictionary/definition/components/definition.js b/backup/vxetable-migration-20260602/datadictionary/definition/components/definition.js new file mode 100755 index 000000000..3fe25de4a --- /dev/null +++ b/backup/vxetable-migration-20260602/datadictionary/definition/components/definition.js @@ -0,0 +1,43 @@ +import request from '@/utils/request' + +// 查询费用定价信息列表 +export function listDefinition(query) { + return request({ + url: '/dict-dictionary/definition/charge-item-info', + method: 'get', + params: query + }) +} + +// 初始化下拉选 +export function initOption(query) { + return request({ + url: '/dict-dictionary/definition/init', + method: 'get', + params: query + }) +} + +// 修改费用定价信息 +export function updateDefinition(data) { + return request({ + url: `/dict-dictionary/definition/update-charge-item?id=${data.id}&price=${data.price}`, + method: 'put', + }) +} + +// 修改费用定价信息 +export function getOptions() { + return request({ + url: '/dict-dictionary/definition/status-enum-option', + method: 'get', + }) +} + +// 修改费用定价信息 +export function getDetail(id) { + return request({ + url: '/dict-dictionary/definition/charge-item-info-detail?id=' + id, + method: 'get', + }) +} \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/datadictionary/definition/components/edit.vue b/backup/vxetable-migration-20260602/datadictionary/definition/components/edit.vue new file mode 100755 index 000000000..ced38d24b --- /dev/null +++ b/backup/vxetable-migration-20260602/datadictionary/definition/components/edit.vue @@ -0,0 +1,162 @@ + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/datadictionary/definition/index.vue b/backup/vxetable-migration-20260602/datadictionary/definition/index.vue new file mode 100755 index 000000000..bf1e0f81c --- /dev/null +++ b/backup/vxetable-migration-20260602/datadictionary/definition/index.vue @@ -0,0 +1,806 @@ + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/adjustmentProfitLossRecord/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/adjustmentProfitLossRecord/index.vue new file mode 100755 index 000000000..e0c74e7da --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/adjustmentProfitLossRecord/index.vue @@ -0,0 +1,291 @@ + + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/billapproval/components/api.js b/backup/vxetable-migration-20260602/medicationmanagement/billapproval/components/api.js new file mode 100755 index 000000000..d9684152f --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/billapproval/components/api.js @@ -0,0 +1,102 @@ +import request from '@/utils/request' + +/** + * 获取单据待审批列表 + */ +export function getReceiptList(queryParams) { + return request({ + url: '/inventory-manage/receipt/receipt-page', + method: 'get', + params: queryParams + }) +} + +/** + * 初始化 + */ +export function init() { + return request({ + url: '/inventory-manage/receipt/init', + method: 'get', + }) +} + +/** + * 审批通过 + */ +export function purchaseInventoryApproved(busNo) { + return request({ + url: '/inventory-manage/receipt/purchase-inventory-approved?busNo=' + busNo, + method: 'put', + }) +} + + +/** + * 领用出库审批通过 + */ +export function requisitionIssueApproved(busNo) { + return request({ + url: '/inventory-manage/receipt/requisition-issue-approved?busNo=' + busNo, + method: 'put', + }) +} +// 领用退库审批通过 +export function returnIssueApproved(busNo) { + return request({ + url: '/inventory-manage/receipt/return-issue-approved?busNo=' + busNo, + method: 'put', + }) +} +// 报损审批通过 +export function lossReportApproved(busNo) { + return request({ + url: '/inventory-manage/receipt/loss-report-approved?busNo=' + busNo, + method: 'put', + }) +} + +/** + * 商品调拨审批通过 + */ +export function productTransferApproved(busNo) { + return request({ + url: '/inventory-manage/receipt/product-transfer-approved?busNo=' + busNo, + method: 'put', + }) +} +/** + * 盘点审批通过 + */ +export function productStocktakingApproved(busNo) { + return request({ + url: '/inventory-manage/receipt/product-stocktaking-approved?busNo=' + busNo, + method: 'put', + }) +} + +/** + * 审批驳回 + */ +export function reject(busNo) { + return request({ + url: '/inventory-manage/receipt/reject?busNo=' + busNo, + method: 'put', + }) +} +// 入库单据详情 +export function getpurchaseInventoryDetail(busNo) { + return request({ + url: '/inventory-manage/purchase/inventory-receipt', + method: 'get', + params: { busNo } // 确保参数正确传递 + }) +} +// 查询已退库单详情 +export function getpurchaseInventoryDetailReturn(busNo) { + return request({ + url: '/inventory-manage/return/return-detail', + method: 'get', + params: { busNo } + }) +} \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/billapproval/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/billapproval/index.vue new file mode 100755 index 000000000..b82dc54f2 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/billapproval/index.vue @@ -0,0 +1,434 @@ + + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockBatch/components/api.js b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockBatch/components/api.js new file mode 100755 index 000000000..4a268657f --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockBatch/components/api.js @@ -0,0 +1,122 @@ +import request from '@/utils/request' + +// 查询盘点列表 +export function getStockinventoryList(query) { + return request({ + url: '/inventory-manage/stocktaking/stocktaking-receipt-page', + method: 'get', + params: query + }) +} + +// 盘点编辑页列表 +export function getstocktakingDetail(busNo) { + return request({ + url: '/inventory-manage/stocktaking/stocktaking-receipt', + method: 'get', + params: { busNo } // 确保参数正确传递 + }) +} + +// 添加/编辑入库单据 +export function addPurchaseinventory(data) { + return request({ + url: '/inventory-manage/stocktaking/product-stocktaking', + method: 'put', + data: data + }) +} + + +// 查询盘点列表初始化查询区数据 +export function getInit() { + return request({ + url: '/inventory-manage/stocktaking/init', + method: 'get' + }) +} + +// 查询盘点详情初始化查询区数据 +export function getDetailInit() { + return request({ + url: '/inventory-manage/stocktaking/detail-init', + method: 'get' + }) +} + +// 生成批量盘点 +export function getStocktakingReceiptBatch(params) { + return request({ + url: '/inventory-manage/stocktaking/stocktaking-receipt-batch', + method: 'get', + params: params + }) +} +//保存批量盘点 +export function addBatch(data) { + return request({ + url: '/inventory-manage/stocktaking/stocktaking-receipt-addBatch', + method: 'put', + data: data + }) +} + +// 删除单据 +export function delProductStocktaking(param) { + return request({ + url: '/inventory-manage/stocktaking/product-stocktaking?supplyRequestIds=' + param, + method: 'delete', + }) +} + +// 提交审批 +export function submitApproval(busNo) { + return request({ + url: '/inventory-manage/stocktaking/submit-approval', + method: 'put', + data: { busNo } // 修复:发送对象而不是字符串 + }) +} + +// 撤回审批 +export function withdrawApproval(busNo) { + return request({ + url: '/inventory-manage/stocktaking/withdraw-approval', + method: 'put', + data: { busNo } // 修复:发送对象而不是字符串 + }) +} + +// 获取药品目录 +export function getMedicineList(queryParams) { + return request({ + url: '/app-common/inventory-item', + method: 'get', + params: queryParams + }) +} + +// 获取药品目录 +export function getCount(queryParams) { + return request({ + url: '/inventory-manage/purchase/inventory-item-info', + method: 'get', + params: queryParams + }) +} + +// 获取药房列表 +export function getPharmacyList() { + return request({ + url: '/app-common/pharmacy-list', + method: 'get', + }) +} + +// 获取药库列表 +export function getDispensaryList() { + return request({ + url: '/app-common/cabinet-list', + method: 'get', + }) +} diff --git a/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockBatch/components/medicineList.vue b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockBatch/components/medicineList.vue new file mode 100755 index 000000000..b60e0fbeb --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockBatch/components/medicineList.vue @@ -0,0 +1,106 @@ + + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockBatch/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockBatch/index.vue new file mode 100755 index 000000000..924f04865 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockBatch/index.vue @@ -0,0 +1,2557 @@ + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockPart/components/api.js b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockPart/components/api.js new file mode 100755 index 000000000..1fdcb4169 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockPart/components/api.js @@ -0,0 +1,130 @@ +import request from '@/utils/request' + +// 查询盘点列表 +export function getStockinventoryList(query) { + return request({ + url: '/inventory-manage/stocktaking/stocktaking-receipt-page', + method: 'get', + params: query + }) +} + +// 盘点编辑页列表 +export function getstocktakingDetail(busNo) { + return request({ + url: '/inventory-manage/stocktaking/stocktaking-receipt', + method: 'get', + params: { busNo } // 确保参数正确传递 + }) +} + +// 添加/编辑入库单据 +export function addProductStocktaking(data) { + return request({ + url: '/inventory-manage/stocktaking/product-stocktaking', + method: 'put', + data: data + }) +} + + +// 查询盘点列表初始化查询区数据 +export function getInit() { + return request({ + url: '/inventory-manage/stocktaking/init', + method: 'get' + }) +} + +// 查询盘点详情初始化查询区数据 +export function getDetailInit() { + return request({ + url: '/inventory-manage/stocktaking/detail-init', + method: 'get' + }) +} + +// 生成批量盘点 +export function getStocktakingReceiptBatch(params) { + return request({ + url: '/inventory-manage/stocktaking/stocktaking-receipt-batch', + method: 'get', + params: params + }) +} +//保存批量盘点 +export function addBatch(data) { + return request({ + url: '/inventory-manage/stocktaking/stocktaking-receipt-addBatch', + method: 'put', + data: data + }) +} + +// 删除单据 +export function delProductStocktaking(param) { + return request({ + url: '/inventory-manage/stocktaking/product-stocktaking?supplyRequestIds=' + param, + method: 'delete', + }) +} + +// 提交审批 +export function submitApproval(busNo) { + return request({ + url: '/inventory-manage/stocktaking/submit-approval', + method: 'put', + data: { busNo } // 修复:发送对象而不是字符串 + }) +} + +// 撤回审批 +export function withdrawApproval(busNo) { + return request({ + url: '/inventory-manage/stocktaking/withdraw-approval', + method: 'put', + data: { busNo } // 修复:发送对象而不是字符串 + }) +} + +// 获取药品目录 +export function getMedicineList(queryParams) { + return request({ + url: '/app-common/inventory-item', + method: 'get', + params: queryParams + }) +} + +// 获取药品目录 +export function getCount(queryParams) { + return request({ + url: '/inventory-manage/purchase/inventory-item-info', + method: 'get', + params: queryParams + }) +} + +// 获取药房列表 +export function getPharmacyList() { + return request({ + url: '/app-common/pharmacy-list', + method: 'get', + }) +} + +// 获取药库列表 +export function getDispensaryList() { + return request({ + url: '/app-common/cabinet-list', + method: 'get', + }) +} + +export function stocktakingReceiptAuto() { + return request({ + url: '/inventory-manage/stocktaking/stocktaking-receipt-auto', + method: 'get', + }) +} + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockPart/components/medicineList.vue b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockPart/components/medicineList.vue new file mode 100755 index 000000000..b9aa9b89a --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockPart/components/medicineList.vue @@ -0,0 +1,127 @@ + + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockPart/components/template.json b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockPart/components/template.json new file mode 100755 index 000000000..34a74d14a --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockPart/components/template.json @@ -0,0 +1,433 @@ +{ + "panels": [ + { + "index": 0, + "name": 1, + "paperType": "自定义", + "height": 130, + "width": 210, + "paperHeader": 73.5, + "paperFooter": 337.5, + "paperNumberDisabled": true, + "paperNumberContinue": true, + "expandCss": "", + "overPrintOptions": {}, + "watermarkOptions": {}, + "panelLayoutOptions": {}, + "printElements": [ + { + "options": { + "left": 222, + "top": 12, + "height": 12, + "width": 115.5, + "title": "{{HOSPITAL_NAME}}医院盘点单", + "coordinateSync": false, + "widthHeightSync": false, + "fontSize": 12, + "qrCodeLevel": 0 + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 19.5, + "top": 33, + "height": 9.75, + "width": 120, + "title": "日期", + "field": "occurrenceTime", + "coordinateSync": false, + "widthHeightSync": false, + "qrCodeLevel": 0 + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 222, + "top": 33, + "height": 9.75, + "width": 120, + "title": "单据号", + "field": "busNo", + "coordinateSync": false, + "widthHeightSync": false, + "qrCodeLevel": 0 + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 465, + "top": 33, + "height": 9.75, + "width": 120, + "title": "机构:{{HOSPITAL_NAME}}医院", + "coordinateSync": false, + "widthHeightSync": false, + "qrCodeLevel": 0 + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 19.5, + "top": 57, + "height": 9.75, + "width": 120, + "title": "盘点仓库", + "field": "purposeLocationName", + "coordinateSync": false, + "widthHeightSync": false, + "qrCodeLevel": 0 + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 19.5, + "top": 84, + "height": 36, + "width": 570, + "title": "undefined+beforeDragIn", + "field": "purchaseinventoryList", + "coordinateSync": false, + "widthHeightSync": false, + "columns": [ + [ + { + "title": "项目名", + "titleSync": false, + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 59.68821015182906, + "field": "name", + "checked": true, + "columnId": "name", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "规格", + "titleSync": false, + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 46.07372249096389, + "field": "volume", + "checked": true, + "columnId": "volume", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "厂家/产地", + "titleSync": false, + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 62.86642033621548, + "field": "manufacturerText", + "checked": true, + "columnId": "manufacturerText", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "盘点单位", + "titleSync": false, + "align": "center", + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 62.494476949595715, + "field": "measurementUnitCode_dictText", + "checked": true, + "columnId": "measurementUnitCode_dictText", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "单价", + "titleSync": false, + "align": "right", + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "formatter2": "function(value,row,index,options,rowIndex,column){ return value + ' 元'; }", + "width": 47.779659918016016, + "field": "price", + "checked": true, + "columnId": "price", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "盈亏数量", + "titleSync": false, + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 60.04350865342028, + "field": "itemQuantity", + "checked": true, + "columnId": "itemQuantity", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "盈亏金额", + "titleSync": false, + "align": "right", + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "formatter2": "function(value,row,index,options,rowIndex,column){ return value + ' 元'; }", + "width": 60.03571725956876, + "field": "profitAmount", + "checked": true, + "columnId": "profitAmount", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "产品批号", + "titleSync": false, + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 56.38575853120875, + "field": "lotNumber", + "checked": true, + "columnId": "lotNumber", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "盈亏类型", + "titleSync": false, + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 56.36601841060319, + "field": "reasonCode_dictText", + "checked": true, + "columnId": "reasonCode_dictText", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "盈亏原因", + "titleSync": false, + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 58.266507298578894, + "field": "reason", + "checked": true, + "columnId": "reason", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "厂家/产地", + "titleSync": false, + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 70.82692033621548, + "field": "manufacturerText", + "checked": false, + "columnId": "manufacturerText", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "盘前库存", + "titleSync": false, + "align": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 51.08786300584732, + "field": "totalPurposeQuantity", + "checked": false, + "columnId": "totalPurposeQuantity", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "实盘数量", + "titleSync": false, + "align": "right", + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 53.074934501634054, + "field": "totalQuantity", + "checked": false, + "columnId": "totalQuantity", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "金额", + "titleSync": false, + "align": "right", + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "formatter2": "function(value,row,index,options,rowIndex,column){ return value + ' 元'; }", + "width": 39.04544357631049, + "field": "totalPrice", + "checked": false, + "columnId": "totalPrice", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "仓库", + "titleSync": false, + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 40.041954542099724, + "field": "purposeLocationName", + "checked": false, + "columnId": "purposeLocationName", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "生产日期", + "titleSync": false, + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 63.089377997062755, + "field": "startTime", + "checked": false, + "columnId": "startTime", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "有效期至", + "titleSync": false, + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 59.05673483929025, + "field": "endTime", + "checked": false, + "columnId": "endTime", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "发票号", + "titleSync": false, + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 51.706448638859854, + "field": "invoiceNo", + "checked": false, + "columnId": "invoiceNo", + "fixed": false, + "rowspan": 1, + "colspan": 1 + } + ] + ] + }, + "printElementType": { + "title": "表格", + "type": "table", + "editable": true, + "columnDisplayEditable": true, + "columnDisplayIndexEditable": true, + "columnTitleEditable": true, + "columnResizable": true, + "columnAlignEditable": true, + "isEnableEditField": true, + "isEnableContextMenu": true, + "isEnableInsertRow": true, + "isEnableDeleteRow": true, + "isEnableInsertColumn": true, + "isEnableDeleteColumn": true, + "isEnableMergeCell": true + } + }, + { + "options": { + "left": 456, + "top": 343.5, + "height": 12, + "width": 109.5, + "title": "制单人", + "field": "name", + "coordinateSync": false, + "widthHeightSync": false, + "qrCodeLevel": 0 + }, + "printElementType": { + "title": "文本", + "type": "text" + } + } + ] + } + ] +} diff --git a/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockPart/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockPart/index.vue new file mode 100755 index 000000000..ed4ddce4b --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockPart/index.vue @@ -0,0 +1,1389 @@ + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockPartDeptDevice/components/api.js b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockPartDeptDevice/components/api.js new file mode 100755 index 000000000..1d4ba59fe --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockPartDeptDevice/components/api.js @@ -0,0 +1,42 @@ +import request from '@/utils/request'; + +// 查询盘点列表 +export function getStockTakeList (query) { + return request ({ + url: '/nurse-station/org-device-stockTake/summary-from', + method: 'get', + params: query, + }); +} + +// 获取药房列表 +export function getPharmacyList () { + return request ({ + url: '/app-common/pharmacy-list', + method: 'get', + }); +} + +// 获取药库列表 +export function getDispensaryList () { + return request ({ + url: '/app-common/cabinet-list', + method: 'get', + }); +} +// 获取药品目录 +export function getMedicineList (queryParams) { + return request ({ + url: '/app-common/inventory-item', + method: 'get', + params: queryParams, + }); +} +// 科室耗材汇总 +export function saveOrgDeviceSummary (data) { + return request ({ + url: '/nurse-station/org-device-stockTake/org-device-summary', + method: 'put', + data, + }); +} diff --git a/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockPartDeptDevice/components/medicineList.vue b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockPartDeptDevice/components/medicineList.vue new file mode 100755 index 000000000..b9aa9b89a --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockPartDeptDevice/components/medicineList.vue @@ -0,0 +1,127 @@ + + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockPartDeptDevice/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockPartDeptDevice/index.vue new file mode 100755 index 000000000..e5c070c76 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockPartDeptDevice/index.vue @@ -0,0 +1,390 @@ + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockRecord/components/api.js b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockRecord/components/api.js new file mode 100755 index 000000000..81504c910 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockRecord/components/api.js @@ -0,0 +1,106 @@ +import request from '@/utils/request' + +// 查询盘点列表 +export function getStockinventoryList(query) { + return request({ + url: '/inventory-manage/stocktaking/stocktaking-receipt-page', + method: 'get', + params: query + }) +} + +// 盘点编辑页列表 +export function getstocktakingDetail(busNo) { + return request({ + url: '/inventory-manage/stocktaking/stocktaking-receipt', + method: 'get', + params: { busNo } // 确保参数正确传递 + }) +} + +// 添加/编辑入库单据 +export function addPurchaseinventory(data) { + return request({ + url: '/inventory-manage/purchase/inventory-receipt', + method: 'put', + data: data + }) +} + + +// 查询盘点列表初始化查询区数据 +export function getInit() { + return request({ + url: '/inventory-manage/stocktaking/init', + method: 'get' + }) +} + +// 查询盘点详情初始化查询区数据 +export function getDetailInit() { + return request({ + url: '/inventory-manage/stocktaking/detail-init', + method: 'get' + }) +} + + +// 删除单据 +export function delPurchaseinventory(param) { + return request({ + url: '/inventory-manage/purchase/inventory-receipt?supplyRequestIds=' + param, + method: 'delete', + }) +} + +// 提交审批 +export function submitApproval(busNo) { + return request({ + url: '/inventory-manage/purchase/submit-approval', + method: 'put', + data: { busNo } // 修复:发送对象而不是字符串 + }) +} + +// 撤回审批 +export function withdrawApproval(busNo) { + return request({ + url: '/inventory-manage/purchase/withdraw-approval', + method: 'put', + data: { busNo } // 修复:发送对象而不是字符串 + }) +} + +// 获取药品目录 +export function getMedicineList(queryParams) { + return request({ + url: '/app-common/inventory-item', + method: 'get', + params: queryParams + }) +} + +// 获取药品目录 +export function getCount(queryParams) { + return request({ + url: '/inventory-manage/purchase/inventory-item-info', + method: 'get', + params: queryParams + }) +} + +// 获取药房列表 +export function getPharmacyList() { + return request({ + url: '/app-common/pharmacy-list', + method: 'get', + }) +} + +// 获取药库列表 +export function getDispensaryList() { + return request({ + url: '/app-common/cabinet-list', + method: 'get', + }) +} \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockRecord/components/medicineList.vue b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockRecord/components/medicineList.vue new file mode 100755 index 000000000..b60e0fbeb --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockRecord/components/medicineList.vue @@ -0,0 +1,106 @@ + + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockRecord/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockRecord/index.vue new file mode 100755 index 000000000..4c024e919 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/chkstockRecord/index.vue @@ -0,0 +1,479 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/chkstock/components/api.js b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/components/api.js new file mode 100755 index 000000000..681078dfc --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/components/api.js @@ -0,0 +1,150 @@ +import request from '@/utils/request' + +// 查询盘点列表 +export function getStockinventoryList(query) { + return request({ + url: '/inventory-manage/stocktaking/stocktaking-receipt-page', + method: 'get', + params: query + }) +} + +// 盘点编辑页列表 +export function getstocktakingDetail(params) { + return request({ + url: '/inventory-manage/stocktaking/stocktaking-receipt', + method: 'get', + params: params // 确保参数正确传递 + }) +} + +// 添加/编辑入库单据 +export function addProductStocktaking(data) { + return request({ + url: '/inventory-manage/stocktaking/product-stocktaking', + method: 'put', + data: data + }) +} + + +// 查询盘点列表初始化查询区数据 +export function getInit() { + return request({ + url: '/inventory-manage/stocktaking/init', + method: 'get' + }) +} + +// 查询盘点详情初始化查询区数据 +export function getDetailInit() { + return request({ + url: '/inventory-manage/stocktaking/detail-init', + method: 'get' + }) +} + +// 生成批量盘点 +export function getStocktakingReceiptBatch(params) { + return request({ + url: '/inventory-manage/stocktaking/stocktaking-receipt-batch', + method: 'get', + params: params // 确保参数正确传递 + }) +} +//保存批量盘点 +export function addBatch(data) { + return request({ + url: '/inventory-manage/stocktaking/stocktaking-receipt-addBatch', + method: 'put', + data: data + }) +} + +// 删除单据 +export function delProductStocktaking(param) { + return request({ + url: '/inventory-manage/stocktaking/product-stocktaking?supplyRequestIds=' + param, + method: 'delete', + }) +} + +// 提交审批 +export function submitApproval(busNo) { + return request({ + url: '/inventory-manage/stocktaking/submit-approval', + method: 'put', + data: { busNo } // 修复:发送对象而不是字符串 + }) +} + +// 撤回审批 +export function withdrawApproval(busNo) { + return request({ + url: '/inventory-manage/stocktaking/withdraw-approval', + method: 'put', + data: { busNo } // 修复:发送对象而不是字符串 + }) +} + +// 获取药品目录 +export function getMedicineList(queryParams) { + return request({ + url: '/app-common/inventory-item', + method: 'get', + params: queryParams + }) +} + +// 获取药品目录 +export function getCount(queryParams) { + return request({ + url: '/app-common/inventory-item-info', + method: 'get', + params: queryParams + }) +} + +// 获取药房列表 +export function getPharmacyList() { + return request({ + url: '/app-common/inventory-pharmacy-list', + // '/app-common/pharmacy-list', + method: 'get', + }) +} + +// 获取药库列表 +export function getDispensaryList() { + return request({ + url: '/app-common/inventory-cabinet-list', + // '/app-common/cabinet-list', + method: 'get', + }) +} + +// 获取仓库药房列表 +export function getpharmacyCabinetList() { + return request({ + url: '/app-common/pharmacy-cabinet-list', + method: 'get', + }) +} +/** + * 审批驳回 + */ +export function reject(busNo) { + return request({ + url: '/inventory-manage/receipt/reject?busNo=' + busNo, + method: 'put', + }) +} +/** + * 盘点审批通过 + */ +export function productStocktakingApproved(busNo) { + return request({ + url: '/inventory-manage/receipt/product-stocktaking-approved?busNo=' + busNo, + method: 'put', + }) +} diff --git a/backup/vxetable-migration-20260602/medicationmanagement/chkstock/components/chkstockDetailsDialog.vue b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/components/chkstockDetailsDialog.vue new file mode 100755 index 000000000..7b38d0d29 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/components/chkstockDetailsDialog.vue @@ -0,0 +1,338 @@ + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/chkstock/components/medicineList.vue b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/components/medicineList.vue new file mode 100755 index 000000000..51fe2dde3 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/chkstock/components/medicineList.vue @@ -0,0 +1,143 @@ + + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/dayEndSettlement/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/dayEndSettlement/index.vue new file mode 100755 index 000000000..0e29773ce --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/dayEndSettlement/index.vue @@ -0,0 +1,502 @@ + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/lossReportingManagement/lossReporting.js b/backup/vxetable-migration-20260602/medicationmanagement/lossReportingManagement/lossReporting.js new file mode 100755 index 000000000..421623dfd --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/lossReportingManagement/lossReporting.js @@ -0,0 +1,154 @@ +import request from '@/utils/request' + +// 查询管理列表 +export function getTransferProductList(query) { + return request({ + url:'/inventory-manage/loss/loss-report-form-page', + method: 'get', + params: query + }) +} + +// 详情 +export function getTransferProductDetail(busNo) { + return request({ + url: '/inventory-manage/loss/loss-receipt', + method: 'get', + params: { busNo } // 确保参数正确传递 + }) +} + +// 添加/编辑单据 +export function addTransferProduct(data) { + return request({ + url: '/inventory-manage/loss/loss-receipt-edit', + method: 'put', + data: data + }) +} + + +// 查询单据初始化数据 +export function getInit() { + return request({ + url: '/inventory-manage/loss/init', + method: 'get' + }) +} +export function getBusNoInit() { //单据号 + return request({ + url: '/inventory-manage/loss/bus-no-init', + method: 'get' + }) +} + + +// 删除单据 +export function delTransferProduct(param) { + return request({ + url: '/inventory-manage/loss/loss-receipt-del?supplyRequestIds=' + param, + method: 'delete', + }) +} + +// 提交审批 +export function submitApproval(busNo) { + return request({ + url: '/inventory-manage/loss/submit-approval', + method: 'put', + data: { busNo } // 修复:发送对象而不是字符串 + }) +} + +// 撤回审批 +export function withdrawApproval(busNo) { + return request({ + url: '/inventory-manage/loss/withdraw-approval', + method: 'put', + data: { busNo } // 修复:发送对象而不是字符串 + }) +} + +// 获取药品目录 +export function getMedicineList(queryParams) { + return request({ + url: '/app-common/inventory-item', + method: 'get', + params: queryParams + }) +} + +// 获取药品目录 +export function getCount(queryParams) { + return request({ + url:'/app-common/inventory-item-info', + // url: '/inventory-manage/purchase/inventory-item-info', + method: 'get', + params: queryParams + }) +} + +// 获取药房列表(带权限过滤) +export function getPharmacyList() { + return request({ + url: '/app-common/inventory-pharmacy-list', + method: 'get', + }) +} + +// 获取药房列表(无权限过滤,作为回退) +export function getPharmacyListAll() { + return request({ + url: '/app-common/pharmacy-list', + method: 'get', + }) +} +// 药房药库列表 +export function getPharmacyCabinetList() { + return request({ + url: '/app-common/pharmacy-cabinet-list', + method: 'get', + }) +} + + +// 获取药库列表(带权限过滤) +export function getDispensaryList() { + return request({ + url: '/app-common/inventory-cabinet-list', + method: 'get', + }) +} + +// 获取药库列表(无权限过滤,作为回退) +export function getDispensaryListAll() { + return request({ + url: '/app-common/cabinet-list', + method: 'get', + }) +} + +// 获取耗材库列表 +export function getWarehouseList() { + return request({ + url: '/app-common/warehouse-list', + method: 'get', + }) +} + +/** + * 审批驳回 + */ +export function reject(busNo) { + return request({ + url: '/inventory-manage/receipt/reject?busNo=' + busNo, + method: 'put', + }) +} +// 报损审批通过 +export function lossReportApproved(busNo) { + return request({ + url: '/inventory-manage/receipt/loss-report-approved?busNo=' + busNo, + method: 'put', + }) +} \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/lossReportingManagement/lossReporting/components/lossReporting.vue b/backup/vxetable-migration-20260602/medicationmanagement/lossReportingManagement/lossReporting/components/lossReporting.vue new file mode 100755 index 000000000..8213171a5 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/lossReportingManagement/lossReporting/components/lossReporting.vue @@ -0,0 +1,144 @@ + + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/lossReportingManagement/lossReporting/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/lossReportingManagement/lossReporting/index.vue new file mode 100755 index 000000000..9bb8f4146 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/lossReportingManagement/lossReporting/index.vue @@ -0,0 +1,1887 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/lossReportingManagement/lossReportingList/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/lossReportingManagement/lossReportingList/index.vue new file mode 100755 index 000000000..40c535ca1 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/lossReportingManagement/lossReportingList/index.vue @@ -0,0 +1,531 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/medicalInsuranceCatalogUpdate/components/catalogFields.js b/backup/vxetable-migration-20260602/medicationmanagement/medicalInsuranceCatalogUpdate/components/catalogFields.js new file mode 100755 index 000000000..371c7c0c3 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/medicalInsuranceCatalogUpdate/components/catalogFields.js @@ -0,0 +1,340 @@ +// 医保目录各类型字段配置 +export const catalogFieldConfigs = { + // 西药中成药目录 (1301) + 1301: { + columns: [ + { prop: 'medicalCatalogCode', label: '医疗目录编码' }, + { prop: 'drugTradeName', label: '药品商品名' }, + { prop: 'genericNameId', label: '通用名编号' }, + { prop: 'drugGenericName', label: '药品通用名' }, + { prop: 'chemicalName', label: '化学名称' }, + { prop: 'alias', label: '别名' }, + { prop: 'englishName', label: '英文名称' }, + { prop: 'registeredName', label: '注册名称' }, + { prop: 'drugSupervisionCode', label: '药监本位码' }, + { prop: 'drugForm', label: '药品剂型' }, + { prop: 'drugFormName', label: '药品剂型名称' }, + { prop: 'drugCategory', label: '药品类别' }, + { prop: 'drugCategoryName', label: '药品类别名称' }, + { prop: 'drugSpecification', label: '药品规格' }, + { prop: 'drugSpecCode', label: '药品规格代码' }, + { prop: 'registeredForm', label: '注册剂型' }, + { prop: 'registeredSpec', label: '注册规格' }, + { prop: 'registeredSpecCode', label: '注册规格代码' }, + { prop: 'dosage', label: '每次用量' }, + { prop: 'frequency', label: '使用频次' }, + { prop: 'acidBase', label: '酸根盐基' }, + { prop: 'nationalDrugCode', label: '国家药品编号' }, + { prop: 'usage', label: '用法' }, + { prop: 'tcmFlag', label: '中成药标志' }, + { prop: 'productionAreaType', label: '生产地类别' }, + { prop: 'productionAreaName', label: '生产地类别名称' }, + { prop: 'pricingUnitType', label: '计价单位类型' }, + { prop: 'otcFlag', label: '非处方药标志' }, + { prop: 'otcFlagName', label: '非处方药标志名称' }, + { prop: 'packagingMaterial', label: '包装材质' }, + { prop: 'packagingMaterialName', label: '包装材质名称' }, + { prop: 'packagingSpec', label: '包装规格' }, + { prop: 'packagingQuantity', label: '包装数量' }, + { prop: 'functionIndication', label: '功能主治' }, + { prop: 'administrationRoute', label: '给药途径' }, + { prop: 'instructions', label: '说明书' }, + { prop: 'startDate', label: '开始日期' }, + { prop: 'endDate', label: '结束日期' }, + { prop: 'minUseUnit', label: '最小使用单位' }, + { prop: 'minSaleUnit', label: '最小销售单位' }, + { prop: 'minMeasurementUnit', label: '最小计量单位' }, + { prop: 'minPackageQuantity', label: '最小包装数量' }, + { prop: 'minPackageUnit', label: '最小包装单位' }, + { prop: 'minPreparationUnit', label: '最小制剂单位' }, + { prop: 'minPackageUnitName', label: '最小包装单位名称' }, + { prop: 'minPreparationUnitName', label: '最小制剂单位名称' }, + { prop: 'conversionRatio', label: '转换比' }, + { prop: 'shelfLife', label: '药品有效期' }, + { prop: 'minPricingUnit', label: '最小计价单位' }, + { prop: 'wubiCode', label: '五笔助记码' }, + { prop: 'pinyinCode', label: '拼音助记码' }, + { prop: 'repackager', label: '分包装厂家' }, + { prop: 'manufacturerCode', label: '生产企业编号' }, + { prop: 'manufacturerName', label: '生产企业名称' }, + { prop: 'specialPriceLimitFlag', label: '特殊限价药品标志' }, + { prop: 'specialDrugFlag', label: '特殊药品标志' }, + { prop: 'useRestriction', label: '限制使用范围' }, + { prop: 'useRestrictionFlag', label: '限制使用标志' }, + { prop: 'registrationCertNo', label: '药品注册证号' }, + { prop: 'regCertStartDate', label: '药品注册证号开始日期' }, + { prop: 'regCertEndDate', label: '药品注册证号结束日期' }, + { prop: 'approvalNo', label: '批准文号' }, + { prop: 'approvalNoStartDate', label: '批准文号开始日期' }, + { prop: 'approvalNoEndDate', label: '批准文号结束日期' }, + { prop: 'marketStatus', label: '市场状态' }, + { prop: 'marketStatusName', label: '市场状态名称' }, + { prop: 'regDocumentArchive', label: '药品注册批件电子档案' }, + { prop: 'suppApplicationArchive', label: '药品补充申请批件电子档案' }, + { prop: 'nationalInsuranceNotes', label: '国家医保药品目录备注' }, + { prop: 'essentialDrugFlagName', label: '基本药物标志名称' }, + { prop: 'essentialDrugFlag', label: '基本药物标志' }, + { prop: 'vatAdjustmentFlag', label: '增值税调整药品标志' }, + { prop: 'vatAdjustmentName', label: '增值税调整药品名称' }, + { prop: 'listedDrugFlag', label: '上市药品目录集药品' }, + { prop: 'negotiationDrugFlag', label: '医保谈判药品标志' }, + { prop: 'negotiationDrugName', label: '医保谈判药品名称' }, + { prop: 'nhcDrugCode', label: '卫健委药品编码' }, + { prop: 'remarks', label: '备注' }, + { prop: 'validFlag', label: '有效标志' }, + { prop: 'uniqueRecordId', label: '唯一记录号' }, + { prop: 'createdAt', label: '数据创建时间' }, + { prop: 'updatedAt', label: '数据更新时间' }, + { prop: 'version', label: '版本号' }, + { prop: 'versionName', label: '版本名称' }, + { prop: 'pediatricUse', label: '儿童用药' }, + { prop: 'companyName', label: '公司名称' }, + { prop: 'genericEvaluationFlag', label: '仿制药一致性评价药品' }, + { prop: 'distributionCompany', label: '经销企业' }, + { prop: 'distributionContact', label: '经销企业联系人' }, + { prop: 'distributionAuthArchive', label: '经销企业授权书电子档案' }, + { prop: 'insuranceForm', label: '国家医保药品目录剂型' }, + { prop: 'insuranceClass', label: '国家医保药品目录甲乙类标识' }, + { prop: 'marketingAuthorizationHolder', label: '上市许可证持有人' }, + { prop: 'releaseFlag', label: '下发标志' }, + { prop: 'transmissionDataId', label: '传输数据ID' }, + { prop: 'validFrom', label: '生效时间' }, + { prop: 'validTo', label: '失效时间' }, + ], + }, + // 中药饮片目录 (1302) + 1302: { + columns: [ + { prop: 'medicalCatalogCode', label: '医疗目录编码' }, + { prop: 'singleDrugName', label: '单味药名称' }, + { prop: 'singleCompoundFlag', label: '单复方标志' }, //单复方标志(true:复方 false:单方) + { prop: 'qualityGrade', label: '质量等级' }, + { prop: 'herbalYear', label: '中草药年份' }, + { prop: 'medicinalPart', label: '药用部位' }, + { prop: 'safeDosage', label: '安全剂量' }, + { prop: 'conventionalUsage', label: '常规用法' }, + { prop: 'propertiesTaste', label: '性味' }, + { prop: 'meridianAttribution', label: '归经' }, + { prop: 'species', label: '品种' }, + { prop: 'startDate', label: '开始日期' }, + { prop: 'endDate', label: '结束日期' }, + { prop: 'validFlag', label: '有效标志' }, //有效标志(true:有效 false:无效) + { prop: 'uniqueRecordId', label: '唯一记录号' }, + { prop: 'createTime', label: '数据创建时间' }, + { prop: 'updateTime', label: '数据更新时间' }, + { prop: 'versionNumber', label: '版本号' }, + { prop: 'versionName', label: '版本名称' }, + { prop: 'herbName', label: '药材名称' }, + { prop: 'indications', label: '功能主治' }, + { prop: 'processingMethod', label: '炮制方法' }, + { prop: 'efficacyClassification', label: '功效分类' }, + { prop: 'herbSource', label: '药材来源' }, + { prop: 'nationalInsurancePolicy', label: '国家医保支付政策' }, + { prop: 'provincialInsurancePolicy', label: '省级医保支付政策' }, + { prop: 'standardName', label: '标准名称' }, + { prop: 'standardPage', label: '标准页码' }, + { prop: 'electronicRecord', label: '标准电子档案' }, + { prop: 'issuanceFlag', label: '下发标志' }, + { prop: 'transferDataId', label: '传输数据ID' }, + { prop: 'effectiveTime', label: '生效时间' }, + { prop: 'expiryTime', label: '失效时间' }, + ], + }, + // 医疗服务项目目录 (1305) + 1305: { + columns: [ + { prop: 'medicalCatalogCode', label: '医疗目录编码' }, + { prop: 'billingUnit', label: '计价单位' }, + { prop: 'billingUnitName', label: '计价单位名称' }, + { prop: 'medicalItemDesc', label: '诊疗项目说明' }, + { prop: 'exclusionContent', label: '诊疗除外内容' }, + { prop: 'medicalItemConnotation', label: '诊疗项目内涵' }, + { prop: 'validFlag', label: '有效标志' }, //有效标志(true:有效 false:无效) + { prop: 'remarks', label: '备注' }, + { prop: 'serviceCategory', label: '服务项目类别' }, + { prop: 'medicalServiceName', label: '医疗服务项目名称' }, + { prop: 'projectDescription', label: '项目说明' }, + { prop: 'startDate', label: '开始日期' }, + { prop: 'endDate', label: '结束日期' }, + { prop: 'uniqueRecordId', label: '唯一记录号' }, //uuid + { prop: 'versionNumber', label: '版本号' }, + { prop: 'versionName', label: '版本名称' }, + { prop: 'issuanceFlag', label: '下发标志' }, + { prop: 'transferDataId', label: '传输数据ID' }, + { prop: 'effectiveTime', label: '生效时间' }, + { prop: 'expiryTime', label: '失效时间' }, + ], + }, + // 医用耗材目录 (1306) + 1306: { + columns: [ + { prop: 'medicalCatalogCode', label: '医疗目录编码' }, + { prop: 'consumableName', label: '耗材名称' }, + { prop: 'deviceUniqueId', label: '医疗器械唯一标识' }, + { prop: 'insuranceGenericCode', label: '医保通用代码' }, + { prop: 'insuranceGenericName', label: '医保通用名称' }, + { prop: 'productModel', label: '产品型号' }, + { prop: 'specCode', label: '规格代码' }, + { prop: 'specification', label: '规格' }, + { prop: 'consumableCategory', label: '耗材分类' }, + { prop: 'specModel', label: '规格型号' }, + { prop: 'materialCode', label: '材质代码' }, + { prop: 'materialType', label: '耗材材质' }, + { prop: 'packageSpec', label: '包装规格' }, + { prop: 'packageQuantity', label: '包装数量' }, + { prop: 'packageMaterial', label: '产品包装材质' }, + { prop: 'packageUnit', label: '包装单位' }, + { prop: 'conversionRatio', label: '产品转换比' }, + { prop: 'minUsageUnit', label: '最小使用单位' }, + { prop: 'productionAreaType', label: '生产地类别' }, + { prop: 'productionAreaName', label: '生产地类别名称' }, + { prop: 'productStandard', label: '产品标准' }, + { prop: 'expiryDate', label: '产品有效期' }, + { prop: 'structureComposition', label: '性能结构与组成' }, + { prop: 'applicableScope', label: '适用范围' }, + { prop: 'usageMethod', label: '产品使用方法' }, + { prop: 'imageCode', label: '产品图片编号' }, + { prop: 'qualityStandard', label: '产品质量标准' }, + { prop: 'instructions', label: '说明书' }, + { prop: 'proofMaterials', label: '其他证明材料' }, + { prop: 'specialDeviceFlag', label: '专机专用标志' }, + { prop: 'specialDeviceName', label: '专机名称' }, + { prop: 'kitName', label: '组套名称' }, + { prop: 'kitFlag', label: '组套标志' }, + { prop: 'usageRestrictionFlag', label: '限制使用标志' }, + { prop: 'insuranceRestriction', label: '医保限用范围' }, + { prop: 'minSaleUnit', label: '最小销售单位' }, + { prop: 'highValueFlag', label: '高值耗材标志' }, //高值耗材标志(true:是 false:否) + { prop: 'medicalMaterialCode', label: '医用材料分类代码' }, + { prop: 'implantFlag', label: '植入材料和人体器官标志' }, + { prop: 'sterilizationFlag', label: '灭菌标志' }, + { prop: 'sterilizationName', label: '灭菌标志名称' }, + { prop: 'implantInterventionFlag', label: '植入或介入类标志' }, + { prop: 'implantInterventionName', label: '植入或介入类名称' }, + { prop: 'disposableFlag', label: '一次性使用标志' }, + { prop: 'disposableFlagName', label: '一次性使用标志名称' }, + { prop: 'registrantName', label: '注册备案人名称' }, + { prop: 'startDate', label: '开始日期' }, + { prop: 'endDate', label: '结束日期' }, + { prop: 'deviceManagementCategory', label: '医疗器械管理类别' }, + { prop: 'deviceCategoryName', label: '医疗器械管理类别名称' }, + { prop: 'registrationNo', label: '注册备案号' }, + { prop: 'registeredProductName', label: '注册备案产品名称' }, + { prop: 'structureDetails', label: '结构及组成' }, + { prop: 'otherContent', label: '其他内容' }, + { prop: 'approvalDate', label: '批准日期' }, + { prop: 'registrantAddress', label: '注册备案人住所' }, + { prop: 'certEffectiveStart', label: '注册证有效期开始时间' }, + { prop: 'certEffectiveEnd', label: '注册证有效期结束时间' }, + { prop: 'manufacturerCode', label: '生产企业编号' }, + { prop: 'manufacturerName', label: '生产企业名称' }, + { prop: 'productionAddress', label: '生产地址' }, + { prop: 'agentCompany', label: '代理人企业' }, + { prop: 'agentAddress', label: '代理人企业地址' }, + { prop: 'productionCountry', label: '生产国或地区' }, + { prop: 'serviceAgency', label: '售后服务机构' }, + { prop: 'certArchivePath', label: '注册或备案证电子档案' }, + { prop: 'productImages', label: '产品影像' }, + { prop: 'validFlag', label: '有效标志' }, + { prop: 'uniqueRecordId', label: '唯一记录号' }, + { prop: 'versionNumber', label: '版本号' }, + { prop: 'versionName', label: '版本名称' }, + ], + }, + // 疾病与诊断目录 (1307) + 1307: { + columns: [ + { prop: 'diseaseId', label: '西医疾病诊断' }, + { prop: 'chapter', label: '章' }, + { prop: 'chapterCodeRange', label: '章代码范围' }, + { prop: 'chapterName', label: '章名称' }, + { prop: 'sectionCodeRange', label: '节代码范围' }, + { prop: 'sectionName', label: '节名称' }, + { prop: 'categoryCode', label: '类目代码' }, + { prop: 'categoryName', label: '类目名称' }, + { prop: 'subcategoryCode', label: '亚目代码' }, + { prop: 'subcategoryName', label: '亚目名称' }, + { prop: 'diagnosisCode', label: '诊断代码' }, + { prop: 'diagnosisName', label: '诊断名称' }, + { prop: 'usageFlag', label: '使用标记' }, //使用标记(true:启用 false:停用) + { prop: 'gbDiagnosisCode', label: '国标版诊断代码' }, + { prop: 'gbDiagnosisName', label: '国标版诊断名称' }, + { prop: 'clinicalCode', label: '临床版诊断代码' }, + { prop: 'clinicalName', label: '临床版诊断名称' }, + { prop: 'remarks', label: '备注' }, + { prop: 'validFlag', label: '有效标志' }, //有效标志(true:有效 false:无效) + { prop: 'uniqueRecordId', label: '唯一记录号' }, + // { prop: 'createTime', label: '数据创建时间' }, + // { prop: 'updateTime', label: '数据更新时间' }, + { prop: 'versionNumber', label: '版本号' }, + { prop: 'versionName', label: '版本名称' }, + ], + }, + // 手术操作目录 (1308) + 1308: { + columns: [ + { prop: 'id', label: '手术标准目录ID' }, + { prop: 'chapter', label: '章' }, + { prop: 'chapterCodeRange', label: '章代码范围' }, + { prop: 'chapterName', label: '章名称' }, + { prop: 'categoryCode', label: '类目代码' }, + { prop: 'categoryName', label: '类目名称' }, + { prop: 'subcategoryCode', label: '亚目代码' }, + { prop: 'subcategoryName', label: '亚目名称' }, + { prop: 'itemCode', label: '项目代码' }, + { prop: 'itemName', label: '项目名称' }, + { prop: 'operationCode', label: '手术操作代码' }, + { prop: 'operationName', label: '手术操作名称' }, + { prop: 'usageFlag', label: '使用标记' }, + { prop: 'groupStandardOperationCode', label: '团标版手术操作代码' }, + { prop: 'groupStandardOperationName', label: '团标版手术操作名称' }, + { prop: 'clinicalVersionOperationCode', label: '临床版手术操作代码' }, + { prop: 'clinicalVersionOperationName', label: '临床版手术操作名称' }, + { prop: 'remarks', label: '备注' }, + { prop: 'validFlag', label: '有效标志' }, + { prop: 'uniqueRecordId', label: '唯一记录号' }, + { prop: 'createTime', label: '数据创建时间' }, + { prop: 'updateTime', label: '数据更新时间' }, + { prop: 'versionNumber', label: '版本号' }, + { prop: 'versionName', label: '版本名称' }, + ], + }, + // 中医疾病目录 (1314) + 1314: { + columns: [ + { prop: 'id', label: '中医疾病诊断' }, + { prop: 'categoryCode', label: '科别类目编码' }, + { prop: 'categoryName', label: '科别类目名称' }, + { prop: 'specialtySystemCategoryCode', label: '专科系统分类目编码' }, + { prop: 'specialtySystemCategoryName', label: '专科系统分类目名称' }, + { prop: 'diseaseCategoryCode', label: '疾病分类编码' }, + { prop: 'diseaseCategoryName', label: '疾病分类名称' }, + { prop: 'remarks', label: '备注' }, + { prop: 'validFlag', label: '有效标志' }, + { prop: 'uniqueRecordId', label: '唯一记录号' }, + // { prop: 'createTime', label: '数据创建时间' }, + // { prop: 'updateTime', label: '数据更新时间' }, + { prop: 'versionNumber', label: '版本号' }, + { prop: 'versionName', label: '版本名称' }, + ], + }, + // 中医证候目录 (1315) + 1315: { + columns: [ + { prop: 'tcmSyndromeId', label: '中医证候ID' }, + { prop: 'syndromeClassCode', label: '证候类目编码' }, + { prop: 'syndromeClassName', label: '证候分类名称' }, + { prop: 'syndromePropertyCode', label: '证候属性代码' }, + { prop: 'syndromeProperty', label: '证候属性' }, + { prop: 'syndromeTypeCode', label: '证候分类代码' }, + { prop: 'syndromeTypeName', label: '证候分类名称' }, + { prop: 'remark', label: '备注' }, + { prop: 'activeFlag', label: '有效标志' }, + { prop: 'uniqueRecordId', label: '唯一记录号' }, + { prop: 'craetTime', label: '创建时间' }, + { prop: 'updateTime', label: '更新时间' }, + { prop: 'version', label: '版本' }, + { prop: 'versionName', label: '版本名称' }, + ], + }, +}; diff --git a/backup/vxetable-migration-20260602/medicationmanagement/medicalInsuranceCatalogUpdate/components/medicine.js b/backup/vxetable-migration-20260602/medicationmanagement/medicalInsuranceCatalogUpdate/components/medicine.js new file mode 100755 index 000000000..423c1b670 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/medicalInsuranceCatalogUpdate/components/medicine.js @@ -0,0 +1,17 @@ +import request from '@/utils/request'; + +// 查询 +export function getYbCatalogResult(params) { + return request({ + url: '/catalog/page', + method: 'get', + params, + }); +} +//更新查询 +export function getYbCatalog(address, v) { + return request({ + url: `/yb-request/query-catalog?address=${address}&v=${v}`, + method: 'get', + }); +} diff --git a/backup/vxetable-migration-20260602/medicationmanagement/medicalInsuranceCatalogUpdate/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/medicalInsuranceCatalogUpdate/index.vue new file mode 100755 index 000000000..7e0924cfd --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/medicalInsuranceCatalogUpdate/index.vue @@ -0,0 +1,398 @@ + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/pharmacyReconciliation/components/api.js b/backup/vxetable-migration-20260602/medicationmanagement/pharmacyReconciliation/components/api.js new file mode 100755 index 000000000..bb0812cfd --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/pharmacyReconciliation/components/api.js @@ -0,0 +1,17 @@ +import request from '@/utils/request' + +export function getList(query) { + return request({ + url: '/report-manage/monthly-settlement/month', + method: 'get', + params: query + }) +} + +// 获取药房 +export function getPharmacyList() { + return request({ + url: '/report-manage/monthly-settlement/init', + method: 'get' + }) +} diff --git a/backup/vxetable-migration-20260602/medicationmanagement/pharmacyReconciliation/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/pharmacyReconciliation/index.vue new file mode 100755 index 000000000..6fa0f6b98 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/pharmacyReconciliation/index.vue @@ -0,0 +1,525 @@ + + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentApprovalManagement/components/api.js b/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentApprovalManagement/components/api.js new file mode 100755 index 000000000..abd8dd96a --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentApprovalManagement/components/api.js @@ -0,0 +1,89 @@ +import request from '@/utils/request'; + +// 查询调价审核列表 +export function getPriceAdjustmentPage (query) { + // 创建请求参数对象,确保使用后端期望的参数名 + const requestParams = { + // 映射pageNum到pageNo,因为后端API期望使用pageNo + pageNo: query.pageNum || query.current || query.page || 1, + // 映射pageSize到pageSize,保持一致 + pageSize: query.pageSize || query.size || query.limit || 10, + // 保留其他查询参数 + ...Object.entries(query).reduce((acc, [key, value]) => { + if (!['pageNum', 'current', 'page', 'pageSize', 'size', 'limit'].includes(key)) { + acc[key] = value; + } + return acc; + }, {}) + }; + + return request ({ + url: '/change/price/list/getPage', + method: 'get', + params: requestParams, + }); +} + +// 查询调价申请详情 +export function getPriceAdjustmentDetail (query) { + return request({ + url: '/change/price/list/searchSupplyRequestInfo', + method: 'post', + params: query + }); +} + +// 作废价格调整申请 +export function cancelSupplyRequestData (query) { + return request({ + url: '/change/price/list/cancelChangePriceData', + method: 'post', + params: query + }); +} + +// 查询挂号调价详情 +export function searchSupplyRequestByHealth (query) { + return request({ + url: '/change/price/list/searchChangePriceDataByHealth', + method: 'post', + params: query + }); +} + +// 查询诊疗调价详情 +export function searchSupplyRequestByActivity (query) { + return request({ + url: '/change/price/list/searchChangePriceDataByActivity', + method: 'post', + params: query || {} + }); +} + +// 查询耗材调价详情 +export function searchSupplyRequestByDevice (query) { + return request({ + url: '/change/price/list/searchChangePriceDataByDevice', + method: 'post', + params: query + }); +} + +// 查询药品调价详情 +export function searchSupplyRequestByMed(query) { + return request({ + url: '/change/price/list/searchChangePriceDataByMed', + method: 'post', + params: query || {} + }); +} + +// 提审价格调整申请 +export function submitApprovalForPriceAdjustment (query) { + return request({ + url: '/change/price/list/updateStatusByApproval', + method: 'post', + params: query + }); +} + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentApprovalManagement/components/detailDialog.vue b/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentApprovalManagement/components/detailDialog.vue new file mode 100755 index 000000000..f9d99d975 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentApprovalManagement/components/detailDialog.vue @@ -0,0 +1,226 @@ + + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentApprovalManagement/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentApprovalManagement/index.vue new file mode 100755 index 000000000..f47e366dc --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentApprovalManagement/index.vue @@ -0,0 +1,361 @@ + + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentFormApproval/components/api.js b/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentFormApproval/components/api.js new file mode 100755 index 000000000..aaa2d0966 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentFormApproval/components/api.js @@ -0,0 +1,80 @@ +import request from '@/utils/request'; + + +// 查询调价申请详情 +export function getPriceAdjustmentDetail (query) { + return request({ + url: '/change/price/list/searchSupplyRequestInfo', + method: 'post', + params: query + }); +} + + + +// 查询挂号调价详情 +export function searchSupplyRequestByHealth (query) { + return request({ + url: '/inventory-examine-page/searchSupplyRequestByHealth', + method: 'post', + params: query + }); +} + +// 查询诊疗调价详情 +export function searchSupplyRequestByActivity (query) { + return request({ + url: '/inventory-examine-page/searchSupplyRequestByActivity', + method: 'post', + params: query + }); +} + +// 查询耗材调价详情 +export function searchSupplyRequestByDevice (query) { + return request({ + url: '/inventory-examine-page/searchSupplyRequestByDevice', + method: 'post', + params: query + }); +} + +// 查询药品调价详情 +export function searchSupplyRequestByMed (query) { + return request({ + url: '/inventory-examine-page/searchSupplyRequestByMed', + method: 'post', + params: query + }); +} + + + + + +// 获取审核状态选项数据 +export function getExamineStatusOptions() { + return request({ + url: '/inventory-examine-page/init', + method: 'get' + }); +} + +// 驳回价格调整申请 +export function rejectPriceAdjustment(busNo) { + return request({ + url: '/inventory-examine-page/updateExamineByRejected', + method: 'post', + params: { busNo } + }); +} + +// 审批通过价格调整申请 +export function updateExamineByApproved(busNo) { + return request({ + url: '/inventory-examine-page/updateExamineByApproved', + method: 'post', + params: { busNo } + }); +} + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentFormApproval/components/detailDialog.vue b/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentFormApproval/components/detailDialog.vue new file mode 100755 index 000000000..0e94363a0 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentFormApproval/components/detailDialog.vue @@ -0,0 +1,254 @@ + + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentFormApproval/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentFormApproval/index.vue new file mode 100755 index 000000000..ce4d75964 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentFormApproval/index.vue @@ -0,0 +1,606 @@ + + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentManagement/components/api.js b/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentManagement/components/api.js new file mode 100755 index 000000000..b632be76e --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentManagement/components/api.js @@ -0,0 +1,180 @@ +import request from '@/utils/request'; + +// 查询费用定价信息列表 +export function listDefinition (query) { + return request ({ + url: '/change/price/list/getPage', + method: 'get', + params: query, + }); +} + +// 初始化下拉选 +export function initOption (query) { + return request ({ + url: '/dict-dictionary/definition/init', + method: 'get', + data: query, + }); +} +// 获取药品列表 +export function getMedicineList (query) { + // 确保 query 对象存在 + const params = { + ...query + }; + + // 根据categoryEnum值选择不同的接口 + let url = '/change/price/searchKeyWordDataList'; + if (query?.categoryEnum === 24) { + // 药品 + url = '/change/price/searchKeyWordDataListByMed'; + } else if (query?.categoryEnum === 25) { + // 耗材 + url = '/change/price/searchKeyWordDataListByDevice'; + } else if (query?.categoryEnum === 26) { + // 诊疗 + url = '/change/price/searchKeyWordDataListByActivity'; + } + + return request ({ + url: url, + method: 'post', + params: params, + }); +} + +// 获取药品列表 - 药品专用接口 +export function getMedicineListByMed(query) { + return request({ + url: '/change/price/searchKeyWordDataListByMed', + method: 'post', + params: query || {}, + headers: { + repeatSubmit: false // 禁用重复提交检查 + } + }); +} + +// 获取耗材列表 - 耗材专用接口 +export function getMedicineListByDevice(query) { + return request({ + url: '/change/price/searchKeyWordDataListByDevice', + method: 'post', + params: query || {}, + headers: { + repeatSubmit: false // 禁用重复提交检查 + } + }); +} + +// 获取诊疗列表 - 诊疗专用接口 +export function getMedicineListByActivity(query) { + return request({ + url: '/change/price/searchKeyWordDataListByActivity', + method: 'post', + params: query || {}, + headers: { + repeatSubmit: false // 禁用重复提交检查 + } + }); +} +// 修改费用定价信息 +export function updateDefinition (data) { + return request ({ + url: '/dict-dictionary/definition/update-charge-item?id=${data.id}&price=${data.price}', + method: 'put', + }); +} + +// 修改费用定价信息 +export function getOptions () { + return request ({ + url: '/dict-dictionary/definition/status-enum-option', + method: 'get', + }); +} + +// 修改费用定价信息 +export function getDetail (id) { + return request ({ + url: '/dict-dictionary/definition/charge-item-info-detail?id=' + id, + method: 'get', + }); +} + + +// 提交价格调整数据 +export function commitChangePriceData(data) { + return request({ + url: '/change/price/commitChangePriceData', + method: 'post', + data: data // 直接提交数组作为body + }); +} + +// 提交审核价格调整数据 +export function commitExamineChangePriceData(data) { + return request({ + url: '/change/price/submitExamineChangePriceData', + method: 'post', + data: data // 直接提交数组作为body + }); +} + +// 查询所有科室数据 +export function searchAllOrgData() { + return request({ + url: '/change/price/searchAllOrgData', + method: 'post' + }); +} + +//根据所选科室数据查询当前科室下所有类型数据 +export function searchHealthData(query) { + return request({ + url: '/change/price/searchHealthData', + method: 'post', + params: query + }); +} +// 验证药品 +export function checkMedApprovalExist(itemId) { + return request({ + url: '/change/price/checkMedApprovalExist', + method: 'post', + params: { itemId } + }); +} + +export function checkDeviceApprovalExist(itemId) { + return request({ + url: '/change/price/checkDeviceApprovalExist', + method: 'post', + params: { itemId } + }); +} + +export function checkActivityApprovalExist(itemId) { + return request({ + url: '/change/price/checkActivityApprovalExist', + method: 'post', + params: { itemId } + }); +} + +export function checkHealthApprovalExist(itemId) { + return request({ + url: '/change/price/checkHealthApprovalExist', + method: 'post', + params: { itemId } + }); +} + +// 查询调价控制开关状态接口 +export function getInitAdjustPriceSwitchState() { + return request({ + url: '/change/price/getAdjustPriceSwitchState', + method: 'get', + }); +} \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentManagement/components/medicineList.vue b/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentManagement/components/medicineList.vue new file mode 100755 index 000000000..f2a08e35a --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentManagement/components/medicineList.vue @@ -0,0 +1,137 @@ + + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentManagement/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentManagement/index.vue new file mode 100755 index 000000000..1f42faf5a --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/priceAdjustmentManagement/index.vue @@ -0,0 +1,1252 @@ + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/purchaseDocument/components/api.js b/backup/vxetable-migration-20260602/medicationmanagement/purchaseDocument/components/api.js new file mode 100755 index 000000000..50cc3d777 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/purchaseDocument/components/api.js @@ -0,0 +1,148 @@ +import request from '@/utils/request' + +// 查询采购入库列表 +export function getPurchaseinventoryList(query) { + return request({ + url: '/inventory-manage/purchase/inventory-receipt-page', + method: 'get', + params: query + }) +} + +// 入库单据详情 +export function getpurchaseInventoryDetail(busNo) { + return request({ + url: '/inventory-manage/purchase/inventory-receipt', + method: 'get', + params: { busNo } // 确保参数正确传递 + }) +} + +// 添加/编辑入库单据 +export function addPurchaseinventory(data) { + return request({ + url: '/inventory-manage/purchase/inventory-receipt', + method: 'put', + data: data + }) +} + + +// 查询采购入库单据初始化数据 +export function getInit() { + return request({ + url: '/inventory-manage/purchase/init', + method: 'get' + }) +} + +// 查询busNo +export function getInitBusNo() { + return request({ + url: '/inventory-manage/purchase/bus-no-init', + method: 'get' + }) +} + +// 删除单据 +export function delPurchaseinventory(param) { + return request({ + url: '/inventory-manage/purchase/inventory-receipt?supplyRequestIds=' + param, + method: 'delete', + }) +} + +// 提交审批 +export function submitApproval(busNo) { + return request({ + url: '/inventory-manage/purchase/submit-approval', + method: 'put', + data: { busNo } + }) +} + +// 撤回审批 +export function withdrawApproval(busNo) { + return request({ + url: '/inventory-manage/purchase/withdraw-approval', + method: 'put', + data: { busNo } + }) +} + +// 获取药品目录 +export function getMedicineList(queryParams) { + return request({ + url: '/app-common/inventory-item', + method: 'get', + params: queryParams + }) +} + +// 获取药品目录 +export function getCount(queryParams) { + return request({ + url: '/app-common/inventory-item-info', + method: 'get', + params: queryParams + }) +} + +// 获取药房列表(权限过滤) +export function getPharmacyList() { + return request({ + url: '/app-common/inventory-pharmacy-list', + method: 'get', + }) +} + +// 获取药库列表(权限过滤) +export function getDispensaryList() { + return request({ + url: '/app-common/inventory-cabinet-list', + method: 'get', + }) +} + +// 获取药房列表(不受权限过滤,作为回退) +export function getPharmacyListAll() { + return request({ + url: '/app-common/pharmacy-list', + method: 'get', + }) +} + +// 获取药库列表(不受权限过滤,作为回退) +export function getDispensaryListAll() { + return request({ + url: '/app-common/cabinet-list', + method: 'get', + }) +} + +// 获取耗材库列表 +export function getWarehouseListAll() { + return request({ + url: '/app-common/warehouse-list', + method: 'get', + }) +} + +/** + * 审批驳回 + */ +export function reject(busNo) { + return request({ + url: '/inventory-manage/receipt/reject?busNo=' + busNo, + method: 'put', + }) +} +/** + * 审批通过 + */ +export function purchaseInventoryApproved(busNo) { + return request({ + url: '/inventory-manage/receipt/purchase-inventory-approved?busNo=' + busNo, + method: 'put', + }) +} \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/purchaseDocument/components/medicineList.vue b/backup/vxetable-migration-20260602/medicationmanagement/purchaseDocument/components/medicineList.vue new file mode 100755 index 000000000..283f646be --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/purchaseDocument/components/medicineList.vue @@ -0,0 +1,119 @@ + + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/purchaseDocument/components/templateJson.json b/backup/vxetable-migration-20260602/medicationmanagement/purchaseDocument/components/templateJson.json new file mode 100755 index 000000000..f2a7a50b0 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/purchaseDocument/components/templateJson.json @@ -0,0 +1,339 @@ +{ + "panels": [ + { + "index": 0, + "name": 1, + "paperType": "自定义", + "height": 130, + "width": 210, + "paperNumberDisabled": true, + "paperNumberContinue": true, + "overPrintOptions": { + "content": "", + "opacity": 0.7, + "type": 1 + }, + "watermarkOptions": { + "content": "", + "fillStyle": "rgba(184, 184, 184, 0.3)", + "fontSize": "14px", + "rotate": 25, + "width": 200, + "height": 200, + "timestamp": false, + "format": "YYYY-MM-DD HH:mm" + }, + "panelLayoutOptions": {}, + "paperHeader": 0, + "paperFooter": 841.8897637795277, + "printElements": [ + { + "options": { + "left": 252, + "top": 13.5, + "height": 12, + "width": 75, + "title": "{{HOSPITAL_NAME}}医院", + "coordinateSync": false, + "widthHeightSync": false, + "fontSize": 12, + "qrCodeLevel": 0 + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 19.5, + "top": 33, + "height": 9.75, + "width": 120, + "title": "日期", + "field": "occurrenceTime", + "coordinateSync": false, + "widthHeightSync": false, + "qrCodeLevel": 0 + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 222, + "top": 33, + "height": 9.75, + "width": 120, + "title": "单据号", + "field": "busNo", + "coordinateSync": false, + "widthHeightSync": false, + "qrCodeLevel": 0 + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 465, + "top": 33, + "height": 9.75, + "width": 120, + "title": "机构:{{HOSPITAL_NAME}}医院", + "coordinateSync": false, + "widthHeightSync": false, + "qrCodeLevel": 0 + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 19.5, + "top": 57, + "height": 9.75, + "width": 322.5, + "title": "供应商", + "field": "supplierName", + "coordinateSync": false, + "widthHeightSync": false, + "qrCodeLevel": 0 + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 19.5, + "top": 84, + "height": 36, + "width": 570, + "title": "undefined+beforeDragIn", + "field": "purchaseinventoryList", + "coordinateSync": false, + "widthHeightSync": false, + "columns": [ + [ + { + "title": "项目名", + "titleSync": false, + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 53.52877835374887, + "field": "name", + "checked": true, + "columnId": "name", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "规格", + "titleSync": false, + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 50.3056193642802, + "field": "volume", + "checked": true, + "columnId": "volume", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "厂家/产地", + "titleSync": false, + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 84.09807741407441, + "field": "manufacturerText", + "checked": true, + "columnId": "manufacturerText", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "数量", + "titleSync": false, + "align": "right", + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "formatter2": "function(value,row,index,options,rowIndex,column){ return value + ' ' + row.unitCode_dictText; }", + "width": 37.02194283284556, + "field": "itemQuantity", + "checked": true, + "columnId": "itemQuantity", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "采购单价", + "titleSync": false, + "align": "right", + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "formatter2": "function(value,row,index,options,rowIndex,column){ return value + ' 元'; }", + "width": 45.05495152300426, + "field": "price", + "checked": true, + "columnId": "price", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "金额", + "titleSync": false, + "align": "right", + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "formatter2": "function(value,row,index,options,rowIndex,column){ return value + ' 元'; }", + "width": 39.04544357631049, + "field": "totalPrice", + "checked": true, + "columnId": "totalPrice", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "仓库", + "titleSync": false, + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 40.041954542099724, + "field": "purposeLocationName", + "checked": true, + "columnId": "purposeLocationName", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "产品批号", + "titleSync": false, + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 47.05067091842349, + "field": "lotNumber", + "checked": true, + "columnId": "lotNumber", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "生产日期", + "titleSync": false, + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 63.089377997062755, + "field": "startTime", + "checked": true, + "columnId": "startTime", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "有效期至", + "titleSync": false, + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 59.05673483929025, + "field": "endTime", + "checked": true, + "columnId": "endTime", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "发票号", + "titleSync": false, + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 51.706448638859854, + "field": "invoiceNo", + "checked": true, + "columnId": "invoiceNo", + "fixed": false, + "rowspan": 1, + "colspan": 1 + } + ] + ] + }, + "printElementType": { + "title": "表格", + "type": "table", + "editable": true, + "columnDisplayEditable": true, + "columnDisplayIndexEditable": true, + "columnTitleEditable": true, + "columnResizable": true, + "columnAlignEditable": true, + "isEnableEditField": true, + "isEnableContextMenu": true, + "isEnableInsertRow": true, + "isEnableDeleteRow": true, + "isEnableInsertColumn": true, + "isEnableDeleteColumn": true, + "isEnableMergeCell": true + } + }, + { + "options": { + "left": 480, + "top": 130.5, + "height": 12, + "width": 109.5, + "title": "合计", + "field": "totalAmount", + "coordinateSync": false, + "widthHeightSync": false, + "qrCodeLevel": 0, + "formatter": "function(title,value,options,templateData,target,paperNo){\n return value + ' 元'\n}" + }, + "printElementType": { + "title": "文本", + "type": "text" + } + } + ] + } + ] +} diff --git a/backup/vxetable-migration-20260602/medicationmanagement/purchaseDocument/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/purchaseDocument/index.vue new file mode 100755 index 000000000..400f8bf28 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/purchaseDocument/index.vue @@ -0,0 +1,2122 @@ + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/purchaseinventory/components/inventoryReceiptDialog.vue b/backup/vxetable-migration-20260602/medicationmanagement/purchaseinventory/components/inventoryReceiptDialog.vue new file mode 100755 index 000000000..1c8627f54 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/purchaseinventory/components/inventoryReceiptDialog.vue @@ -0,0 +1,1177 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/purchaseinventory/components/medicineList.vue b/backup/vxetable-migration-20260602/medicationmanagement/purchaseinventory/components/medicineList.vue new file mode 100755 index 000000000..61f01dec4 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/purchaseinventory/components/medicineList.vue @@ -0,0 +1,106 @@ + + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/purchaseinventory/components/purchaseinventory.js b/backup/vxetable-migration-20260602/medicationmanagement/purchaseinventory/components/purchaseinventory.js new file mode 100755 index 000000000..dd4cb7c00 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/purchaseinventory/components/purchaseinventory.js @@ -0,0 +1,149 @@ +import request from '@/utils/request' + +// 查询采购入库列表 +export function getPurchaseinventoryList(query) { + return request({ + url: '/inventory-manage/purchase/inventory-receipt-page', + method: 'get', + params: query + }) +} + +// 入库单据详情 +export function getpurchaseInventoryDetail(busNo) { + return request({ + url: '/inventory-manage/purchase/inventory-receipt', + method: 'get', + params: { busNo } // 确保参数正确传递 + }) +} + +// 添加/编辑入库单据 +export function addPurchaseInventory(data) { + return request({ + url: '/inventory-manage/purchase/inventory-receipt', + method: 'put', + data: data + }) +} + + +// 查询采购入库单据初始化数据 +export function getInit() { + return request({ + url: '/inventory-manage/purchase/init', + method: 'get' + }) +} + +// 查询busNo +export function getInitBusNo() { + return request({ + url: '/inventory-manage/purchase/bus-no-init', + method: 'get' + }) +} + + +// 删除单据(根据供应请求 ID) +export function delPurchaseinventory(param) { + return request({ + url: '/inventory-manage/purchase/inventory-receipt?supplyRequestIds=' + param, + method: 'delete', + }) +} + +// 删除单据(根据单据号) +export function delPurchaseinventoryByBusNo(busNoList) { + return request({ + url: '/inventory-manage/purchase/inventory-receipt-by-bus-no?busNoList=' + busNoList, + method: 'delete', + }) +} + +// 提交审批 +export function submitApproval(busNo) { + return request({ + url: '/inventory-manage/purchase/submit-approval', + method: 'put', + data: { busNo: busNo } + }) +} + +// 撤回审批 +export function withdrawApproval(busNo) { + return request({ + url: '/inventory-manage/purchase/withdraw-approval', + method: 'put', + data: { busNo: busNo } + }) +} + +// 获取药品目录 +export function getMedicineList(queryParams) { + return request({ + url: '/app-common/inventory-item', + method: 'get', + params: queryParams + }) +} + +// 获取药品目录 +export function getCount(queryParams) { + return request({ + url: '/inventory-manage/purchase/inventory-item-info', + method: 'get', + params: queryParams + }) +} + +// 获取药房列表 +export function getPharmacyList() { + return request({ + url: '/app-common/pharmacy-list', + method: 'get', + }) +} + +// 获取药库列表 +export function getDispensaryList() { + return request({ + url: '/app-common/cabinet-list', + method: 'get', + }) +} + +// 查询已退库单列表详情 +export function generatedReturnDetail(busNo) { + return request({ + url: '/inventory-manage/return/generated-return-detail', + method: 'get', + params: { busNo } + }) +} +// 查询已退库单详情 +export function getpurchaseInventoryDetailReturn(busNo) { + return request({ + url: '/inventory-manage/return/return-detail', + method: 'get', + params: { busNo } + }) +} + +// 退库提交审批 +export function submitApprovalReturn(busNo) { + return request({ + url: '/inventory-manage/return/return-submit-approval', + method: 'put', + data: { busNo: busNo } + }) +} + +// 退库撤回审批 +export function withdrawApprovalReturn(busNo) { + return request({ + url: '/inventory-manage/return/return-withdraw-approval', + method: 'put', + data: { busNo: busNo } // 修复:发送对象而不是字符串 + }) +} \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/purchaseinventory/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/purchaseinventory/index.vue new file mode 100755 index 000000000..cfb6b9381 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/purchaseinventory/index.vue @@ -0,0 +1,764 @@ + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/requisitionManagement/components/api.js b/backup/vxetable-migration-20260602/medicationmanagement/requisitionManagement/components/api.js new file mode 100755 index 000000000..3a950510a --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/requisitionManagement/components/api.js @@ -0,0 +1,213 @@ +import request from '@/utils/request' + +// 查询管理列表 +export function getTransferProductList(query) { + return request({ + url:'/issue-manage/requisition/requisition-issue-page', + method: 'get', + params: query + }) +} + +// 详情 +export function getTransferProductDetail(busNo) { + return request({ + url: '/issue-manage/requisition/requisition-issue-detail', + method: 'get', + params: { busNo } // 确保参数正确传递 + }) +} + +// 添加/编辑单据 +export function addTransferProduct(data) { + return request({ + url: '/issue-manage/requisition/requisition-issue-edit', + method: 'put', + data: data + }) +} + + +// 查询单据初始化数据 +export function getInit() { + return request({ + url: '/issue-manage/requisition/init', + method: 'get' + }) +} +export function getBusNoInit() { //单据号 + return request({ + url: '/issue-manage/requisition/bus-no-init', + method: 'get' + }) +} + + +// 删除单据 +export function delTransferProduct(param) { + return request({ + url: '/issue-manage/requisition/requisition-issue-del?supplyRequestIds=' + param, + // '/inventory-manage/purchase/inventory-receipt?supplyRequestIds=' + param, + method: 'delete', + }) +} + +// 提交审批 +export function submitApproval(busNo) { + return request({ + url: '/issue-manage/requisition/submit-approval', + // '/inventory-manage/purchase/submit-approval', + method: 'put', + data: { busNo } + }) +} + +// 撤回审批 +export function withdrawApproval(busNo) { + return request({ + url: '/issue-manage/requisition/withdraw-approval', + // '/inventory-manage/purchase/withdraw-approval', + method: 'put', + data: { busNo } + }) +} + +// 获取药品目录 +export function getMedicineList(queryParams) { + return request({ + url: '/app-common/inventory-item', + method: 'get', + params: queryParams + }) +} + +// 获取药品目录 +export function getCount(queryParams) { + return request({ + url:'/app-common/inventory-item-info', + // url: '/inventory-manage/purchase/inventory-item-info', + method: 'get', + params: queryParams + }) +} + +// 获取药房列表 +export function getPharmacyList() { + return request({ + url: '/app-common/pharmacy-list', + method: 'get', + }) +} +// 药房药库列表 +export function getPharmacyCabinetList() { + return request({ + url: '/app-common/pharmacy-cabinet-list', + method: 'get', + }) +} + + +// 获取药库列表 +export function getDispensaryList() { + return request({ + url: '/app-common/cabinet-list', + method: 'get', + }) +} + +// 查询管理列表 +export function getTHTransferProductlist(query) { + return request({ + url:'/issue-manage/return/return-issue-page', + method: 'get', + params: query + }) +} + +// 详情 +export function getTHTransferProductDetail(busNo) { + return request({ + url: '/issue-manage/return/return-issue-detail', + method: 'get', + params: { busNo } // 确保参数正确传递 + }) +} + +// 添加/编辑单据 +export function addTHTransferProduct(data) { + return request({ + url: '/issue-manage/return/return-issue-edit', + method: 'put', + data: data + }) +} + + +// 查询单据初始化数据 +export function getTHInit() { + return request({ + url: '/issue-manage/return/init', + method: 'get' + }) +} +export function getTHBusNoInit() { //单据号 + return request({ + url: '/issue-manage/return/bus-no-init', + method: 'get' + }) +} + + +// 删除单据 +export function delTHTransferProduct(param) { + return request({ + url: '/issue-manage/return/return-issue-del?supplyRequestId=' + param, + // '/inventory-manage/purchase/inventory-receipt?supplyRequestIds=' + param, + method: 'delete', + }) +} + +// 提交审批 +export function submitTHApproval(busNo) { + return request({ + url: '/issue-manage/return/submit-approval', + // '/inventory-manage/purchase/submit-approval', + method: 'put', + data: { busNo } + }) +} + +// 撤回审批 +export function withdrawTHApproval(busNo) { + return request({ + url: '/issue-manage/return/withdraw-approval', + // '/inventory-manage/purchase/withdraw-approval', + method: 'put', + data: { busNo } + }) +} +/** + * 审批驳回 + */ +export function reject(busNo) { + return request({ + url: '/inventory-manage/receipt/reject?busNo=' + busNo, + method: 'put', + }) +} +/** + * 领用出库审批通过 + */ +export function requisitionIssueApproved(busNo) { + return request({ + url: '/inventory-manage/receipt/requisition-issue-approved?busNo=' + busNo, + method: 'put', + }) +} +// 领用退库审批通过 +export function returnIssueApproved(busNo) { + return request({ + url: '/inventory-manage/receipt/return-issue-approved?busNo=' + busNo, + method: 'put', + }) +} \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/requisitionManagement/components/list.vue b/backup/vxetable-migration-20260602/medicationmanagement/requisitionManagement/components/list.vue new file mode 100755 index 000000000..9cfa00976 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/requisitionManagement/components/list.vue @@ -0,0 +1,144 @@ + + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/requisitionManagement/requisitionInventoryManagement/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/requisitionManagement/requisitionInventoryManagement/index.vue new file mode 100755 index 000000000..59af36148 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/requisitionManagement/requisitionInventoryManagement/index.vue @@ -0,0 +1,552 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/requisitionManagement/requisitionManagement/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/requisitionManagement/requisitionManagement/index.vue new file mode 100755 index 000000000..50a1493aa --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/requisitionManagement/requisitionManagement/index.vue @@ -0,0 +1,1906 @@ + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/requisitionManagement/requisitionManagementList/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/requisitionManagement/requisitionManagementList/index.vue new file mode 100755 index 000000000..25c94bba4 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/requisitionManagement/requisitionManagementList/index.vue @@ -0,0 +1,526 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/requisitionManagement/returningInventory/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/requisitionManagement/returningInventory/index.vue new file mode 100755 index 000000000..11b809041 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/requisitionManagement/returningInventory/index.vue @@ -0,0 +1,1772 @@ + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/returnedPurchase/components/api.js b/backup/vxetable-migration-20260602/medicationmanagement/returnedPurchase/components/api.js new file mode 100755 index 000000000..c80b52442 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/returnedPurchase/components/api.js @@ -0,0 +1,122 @@ +import request from '@/utils/request' + +// 查询已退库单详情 +export function getPurchaseinventoryList(busNo) { + return request({ + url: '/inventory-manage/return/generated-return-detail', + method: 'get', + params: { busNo } + }) +} + +// 根据订单号查询退货详情 +export function getpurchaseInventoryDetail(busNo) { + return request({ + url: '/inventory-manage/return/return-detail', + method: 'get', + params: { busNo } // 确保参数正确传递 + }) +} + +// 添加/编辑退货单据 +export function addPurchaseinventory(data) { + return request({ + url: '/inventory-manage/return/generate-return-receipt', + method: 'put', + data: data + }) +} + + +// 查询采购入库单据初始化数据 +export function getInit() { + return request({ + url: '/inventory-manage/return/init', + method: 'get' + }) +} + +// 查询busNo +export function getInitBusNo() { + return request({ + url: '/inventory-manage/return/bus-no-init', + method: 'get' + }) +} + +// 删除单据 +export function delPurchaseinventory(param) { + return request({ + url: '/inventory-manage/return/delete-return-receipt?supplyRequestIds=' + param, + method: 'delete', + }) +} + +// 获取药品目录 +export function getMedicineList(queryParams) { + return request({ + url: '/app-common/inventory-item', + method: 'get', + params: queryParams + }) +} +// 获取药品目录 +export function getCount(queryParams) { + return request({ + url: '/app-common/inventory-item-info', + method: 'get', + params: queryParams + }) +} + +// 获取药房列表 +export function getPharmacyList() { + return request({ + url: '/app-common/pharmacy-list', + method: 'get', + }) +} + +// 获取药库列表 +export function getDispensaryList() { + return request({ + url: '/app-common/cabinet-list', + method: 'get', + }) +} +// 退库提交审批 +export function submitApproval(busNo) { + return request({ + url: '/inventory-manage/return/return-submit-approval', + method: 'put', + data: { busNo } // 修复:发送对象而不是字符串 + }) +} + +// 退库撤回审批 +export function withdrawApproval(busNo) { + return request({ + url: '/inventory-manage/return/return-withdraw-approval', + method: 'put', + data: { busNo } // 修复:发送对象而不是字符串 + }) +} + +/** + * 审批驳回 + */ +export function reject(busNo) { + return request({ + url: '/inventory-manage/receipt/reject?busNo=' + busNo, + method: 'put', + }) +} +/** + * 审批通过 + */ +export function purchaseInventoryApproved(busNo) { + return request({ + url: '/inventory-manage/receipt/purchase-return-approved?busNo=' + busNo, + method: 'put', + }) +} \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/returnedPurchase/components/transferManagement.vue b/backup/vxetable-migration-20260602/medicationmanagement/returnedPurchase/components/transferManagement.vue new file mode 100755 index 000000000..eea59eba3 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/returnedPurchase/components/transferManagement.vue @@ -0,0 +1,118 @@ + + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/returnedPurchase/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/returnedPurchase/index.vue new file mode 100755 index 000000000..a6d457f00 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/returnedPurchase/index.vue @@ -0,0 +1,1771 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/awaitingMedicineDetails.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/awaitingMedicineDetails.vue new file mode 100755 index 000000000..134cc2965 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/awaitingMedicineDetails.vue @@ -0,0 +1,285 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/basicInformationDetails.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/basicInformationDetails.vue new file mode 100755 index 000000000..68e5b4d85 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/basicInformationDetails.vue @@ -0,0 +1,265 @@ + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/chkstockPartDetails.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/chkstockPartDetails.vue new file mode 100755 index 000000000..aadc36e51 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/chkstockPartDetails.vue @@ -0,0 +1,411 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/diseaseDetails.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/diseaseDetails.vue new file mode 100755 index 000000000..96918d800 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/diseaseDetails.vue @@ -0,0 +1,264 @@ + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/drugExpensesGrowthRate.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/drugExpensesGrowthRate.vue new file mode 100755 index 000000000..c57bc78eb --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/drugExpensesGrowthRate.vue @@ -0,0 +1,206 @@ + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/earlyWarning.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/earlyWarning.vue new file mode 100755 index 000000000..7d4fb7a68 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/earlyWarning.vue @@ -0,0 +1,347 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/financialClearing.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/financialClearing.vue new file mode 100755 index 000000000..049131e40 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/financialClearing.vue @@ -0,0 +1,395 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/index.vue new file mode 100755 index 000000000..9af725c8d --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/index.vue @@ -0,0 +1,875 @@ + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/inventoryProductDetails.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/inventoryProductDetails.vue new file mode 100755 index 000000000..c30098ae3 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/inventoryProductDetails.vue @@ -0,0 +1,500 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/liquidationRecords.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/liquidationRecords.vue new file mode 100755 index 000000000..1245f47c4 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/liquidationRecords.vue @@ -0,0 +1,893 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/lossReportingDetails.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/lossReportingDetails.vue new file mode 100755 index 000000000..6d1009836 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/lossReportingDetails.vue @@ -0,0 +1,378 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/medicationDetails.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/medicationDetails.vue new file mode 100755 index 000000000..ba23d17c9 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/medicationDetails.vue @@ -0,0 +1,1052 @@ + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/medicationInboundDetails.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/medicationInboundDetails.vue new file mode 100755 index 000000000..aef3e0af0 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/medicationInboundDetails.vue @@ -0,0 +1,258 @@ + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/medicationSaleDetails.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/medicationSaleDetails.vue new file mode 100755 index 000000000..7736557d0 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/medicationSaleDetails.vue @@ -0,0 +1,316 @@ + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/medicationStockOutDetails.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/medicationStockOutDetails.vue new file mode 100755 index 000000000..cfd47a74b --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/medicationStockOutDetails.vue @@ -0,0 +1,278 @@ + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/medicationUsageDetails.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/medicationUsageDetails.vue new file mode 100755 index 000000000..3abcc228c --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/medicationUsageDetails.vue @@ -0,0 +1,226 @@ + + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/nonWinQtyRatio.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/nonWinQtyRatio.vue new file mode 100755 index 000000000..7dc690cbd --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/nonWinQtyRatio.vue @@ -0,0 +1,211 @@ + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/numberOfVisits.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/numberOfVisits.vue new file mode 100755 index 000000000..2e76db022 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/numberOfVisits.vue @@ -0,0 +1,324 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/offlinePurchaseRatioDetails.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/offlinePurchaseRatioDetails.vue new file mode 100755 index 000000000..ddbdd97fc --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/offlinePurchaseRatioDetails.vue @@ -0,0 +1,106 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/outPatientCharge.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/outPatientCharge.vue new file mode 100755 index 000000000..719e7b0d3 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/outPatientCharge.vue @@ -0,0 +1,916 @@ + + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/outpatientDepartmentMetrics.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/outpatientDepartmentMetrics.vue new file mode 100755 index 000000000..850664e81 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/outpatientDepartmentMetrics.vue @@ -0,0 +1,543 @@ + + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/patientDetails.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/patientDetails.vue new file mode 100755 index 000000000..efb530975 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/patientDetails.vue @@ -0,0 +1,300 @@ + + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/patientMasterDetails.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/patientMasterDetails.vue new file mode 100755 index 000000000..4f0319159 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/patientMasterDetails.vue @@ -0,0 +1,191 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/pharmacyMonthlybalance.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/pharmacyMonthlybalance.vue new file mode 100755 index 000000000..1a3c209e8 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/pharmacyMonthlybalance.vue @@ -0,0 +1,415 @@ + + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/portal.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/portal.vue new file mode 100755 index 000000000..306561257 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/portal.vue @@ -0,0 +1,197 @@ + + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/productUsageDetails.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/productUsageDetails.vue new file mode 100755 index 000000000..389736312 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/productUsageDetails.vue @@ -0,0 +1,254 @@ + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/purchaseDocumentDetsils.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/purchaseDocumentDetsils.vue new file mode 100755 index 000000000..5cb614b2a --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/purchaseDocumentDetsils.vue @@ -0,0 +1,619 @@ + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/purchaseReturnDetsils.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/purchaseReturnDetsils.vue new file mode 100755 index 000000000..deee327ca --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/purchaseReturnDetsils.vue @@ -0,0 +1,491 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/reconciliation.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/reconciliation.vue new file mode 100755 index 000000000..c034ef7a3 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/reconciliation.vue @@ -0,0 +1,396 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/reconciliationDetails.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/reconciliationDetails.vue new file mode 100755 index 000000000..3ff89dfb7 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/reconciliationDetails.vue @@ -0,0 +1,771 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/registrationFeeDetails.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/registrationFeeDetails.vue new file mode 100755 index 000000000..31f71a8b4 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/registrationFeeDetails.vue @@ -0,0 +1,330 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/requisitionDetails.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/requisitionDetails.vue new file mode 100755 index 000000000..8dabb9fc3 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/requisitionDetails.vue @@ -0,0 +1,486 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/returnOrutboundDetails.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/returnOrutboundDetails.vue new file mode 100755 index 000000000..5fe732b77 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/returnOrutboundDetails.vue @@ -0,0 +1,513 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/settlementDoc.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/settlementDoc.vue new file mode 100755 index 000000000..50b19c5e5 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/settlementDoc.vue @@ -0,0 +1,445 @@ + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/statisticalManagent.js b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/statisticalManagent.js new file mode 100755 index 000000000..176dea1fd --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/statisticalManagent.js @@ -0,0 +1,611 @@ +import request from '@/utils/request'; + +// 查询库存明细列表 +export function getproductReturnPage(query) { + return request({ + url: '/inventory-manage/product/product-page', + method: 'get', + params: query, + }); +} +// 查询备份日期库存明细列表 +export function getproductReturnBackUpPage(query) { + return request({ + url: '/inventory-manage/product/product-backup-page', + method: 'get', + params: query, + }); +} + +// 查询单据初始化数据 +export function getInit() { + return request({ + url: '/inventory-manage/product/product-init', + method: 'get', + }); +} + +export function getBusNoInit() { + //单据号 + return request({ + url: '/inventory-manage/product/bus-no-init', + method: 'get', + }); +} + +// 获取药品目录 +export function getMedicineList(queryParams) { + return request({ + url: '/app-common/inventory-item', + method: 'get', + params: queryParams, + }); +} + +// 获取药品目录 +export function getCount(queryParams) { + return request({ + url: '/app-common/inventory-item-info', + method: 'get', + params: queryParams, + }); +} + +// 获取药房列表 +export function getPharmacyList() { + return request({ + url: '/app-common/pharmacy-list', + method: 'get', + }); +} +// 药房药库列表 +export function getPharmacyCabinetList() { + return request({ + url: '/app-common/pharmacy-cabinet-list', + method: 'get', + }); +} + +// 获取药库列表 +export function getDispensaryList() { + return request({ + url: '/app-common/cabinet-list', + method: 'get', + }); +} + +// 停供 +export function stopSupply(busNo) { + return request({ + url: '/inventory-manage/product/stop-supply', + method: 'put', + data: busNo, + }); +} + +// 取消停供 +export function cancelSupply(busNo) { + return request({ + url: '/inventory-manage/product/cancel-supply', + method: 'put', + data: busNo, + }); +} + +// 查询库存商品明细查询报表列表 +export function getReportProductPage(query) { + return request({ + url: '/report-manage/inventory-product/report-product-page', + method: 'get', + params: query, + }); +} +//查询采购入库明细报表 +export function getReportInboundPCage(query) { + return request({ + url: '/report-manage/inbound/report-inbound-page', + method: 'get', + params: query, + }); +} + +//查询调拨入库明细报表 +export function getReportTransferPage(query) { + return request({ + url: '/report-manage/transfer/report-transfer-page', + method: 'get', + params: query, + }); +} + +//查询库存盘点明细报表 +export function getReportStocktakingPage(query) { + return request({ + url: '/report-manage/stocktaking/report-stocktaking-page', + method: 'get', + params: query, + }); +} +//报损明细 +export function getReportLossPage(query) { + return request({ + url: '/report-manage/loss/report-loss-page', + method: 'get', + params: query, + }); +} +// 医保对账 +export function ybRequestReconcile(data) { + return request({ + url: '/yb-request/reconcile', + method: 'post', + data: data, + }); +} +// 合同 +export function getContractList() { + return request({ + url: '/app-common/contract-list', + method: 'get', + }); +} +// 对账列表 结算 +export function getReconcileList(params) { + return request({ + url: '/yb-request/reconcile-list', + method: 'get', + params: params, + }); +} +//领用出库明细 +export function getRreportOutboundPage(query) { + return request({ + url: '/report-manage/outbound/report-outbound-page', + method: 'get', + params: query, + }); +} + +// 获取科室列表 +export function getDepartmentList() { + return request({ + url: '/app-common/department-list', + method: 'get', + }); +} + +// 查询领用出库明细初始化数据 供应商 +export function getOutboundInit() { + return request({ + url: '/report-manage/outbound/init', + method: 'get', + }); +} +// 查询采购入库明细初始化数据 供应商 +export function getInboundInit() { + return request({ + url: '/report-manage/inbound/init', + method: 'get', + }); +} +//领用退库明细 +export function getRreportReturnIssue(query) { + return request({ + url: '/report-manage/return-issue/report-return-issue', + method: 'get', + params: query, + }); +} +// 查询领用退库明细初始化数据 供应商 +export function getReturnIssueInit() { + return request({ + url: '/report-manage/return-issue/init', + method: 'get', + }); +} +//采购退库明细 +export function getReportPurchaseReturn(query) { + return request({ + url: '/report-manage/purchase-return/report-purchase-return', + method: 'get', + params: query, + }); +} +// 查询采购退库明细初始化数据 +export function getPurchaseReturnInit() { + return request({ + url: '/report-manage/purchase-return/init', + method: 'get', + }); +} +//待发药查询 +export function getAwaitingPendingMedicationPageList(query) { + return request({ + url: '/pharmacy-manage/pending-medication/pending-medication-page', + method: 'get', + params: query, + }); +} +//发药明细 切换统计类型 +export function getAmbPractitionerDetail(query) { + return request({ + url: '/pharmacy-manage/medication-details/amb-practitioner-detail', + method: 'get', + params: query, + }); +} +// 门诊发药明细流水账接口 +export function getAmbMedicationDetail(query) { + return request({ + url: '/pharmacy-manage/medication-details/amb-medication-detail', + method: 'get', + params: query, + }); +} +// 查询发药明细初始化数据 +export function getMedicationDetailsInit() { + return request({ + url: '/pharmacy-manage/medication-details/init', + method: 'get', + }); +} +// 医保对账明细 +export function reconcileDetailList(data) { + return request({ + url: '/yb-request/reconcile-detail-list', + method: 'post', + data: data, + }); +} +// 医保对账明细导出txt +export function reconcileDetailTxt(data) { + return request({ + url: '/yb-request/reconcile-detail-txt', + method: 'post', + data: data, + }); +} + +// 医保明细对总账 +export function reconcileGeneral(data) { + return request({ + url: '/yb-request/reconcile-general', + method: 'post', + data: data, + }); +} +//查询门诊收费明细 +export function getReportChargePage(params) { + return request({ + url: '/report-manage/charge/report-charge-page', + method: 'get', + params: params, + }); +} +//查询门诊收费明细初始值 +export function getReportChargeInit() { + return request({ + url: '/report-manage/charge/init', + method: 'get', + }); +} +//查询挂号收费明细 +export function getReportRegisterPage(params) { + return request({ + url: '/report-manage/register/report-register-page', + method: 'get', + params: params, + }); +} + +//查询挂号收费明细初始值 +export function getReportRegisterInit() { + return request({ + url: '/report-manage/register/init', + method: 'get', + }); +} +// 文件上传 +export function ybRequestFileUp(data) { + return request({ + url: '/yb-request/file-up', + method: 'post', + data: data, + }); +} +export function getExpirationWarning(query) { + return request({ + url: '/inventory-manage/product/expiration-warning', + method: 'get', + params: query, + }); +} +export function getClroptins(query) { + return request({ + url: '/yb-request/select-clroptins', + method: 'get', + params: query, + }); +} + +export function applyFinancialClearing(data) { + return request({ + url: '/yb-request/apply-financial-clearing', + method: 'post', + data: data, + }); +} + +export function applyFinancialClearingList(query) { + return request({ + url: '/yb-request/apply-financial-clearing-list', + method: 'get', + params: query, + }); +} + +export function applyUnClearing(query) { + return request({ + url: '/yb-request/apply-un-clearing', + method: 'get', + params: query, + }); +} + +export function autoApplyFinancialClearing(data) { + return request({ + url: '/yb-request/auto-apply-financial-clearing', + method: 'post', + data: data, + }); +} + +export function traceabilityCodeManagementInit(data) { + return request({ + url: '/inventory-manage/traceNo/init', + method: 'get', + data: data, + }); +} + +export function inventoryReceiptPage(query) { + return request({ + url: '/inventory-manage/traceNo/inventory-receipt-page', + method: 'get', + params: query, + }); +} + +export function handOperatedApplyFinancialClearing(data) { + return request({ + url: '/yb-request/hand-operated-apply-financial-clearing', + method: 'post', + data: data, + }); +} + +export function handOperatedApplyReconcileAccounts(data) { + return request({ + url: '/yb-request/hand-operated-apply-reconcile-accounts', + method: 'post', + data: data, + }); +} + +export function productPageTotal(query) { + return request({ + url: '/inventory-manage/product/product-statistics', + method: 'get', + params: query, + }); +} +export function productBackupPageTotal(query) { + return request({ + url: '/inventory-manage/product/product-backup-statistics', + method: 'get', + params: query, + }); +} + +export function getMedDevInfo(query) { + return request({ + url: '/report-manage/medication-device/med-dev-info', + method: 'get', + params: query, + }); +} + +export function getMedDevAll(query) { + return request({ + url: '/report-manage/medication-device/med-dev-all', + method: 'get', + params: query, + }); +} + +export function getReportStocktakingPageAuto(query) { + return request({ + url: '/report-manage/stocktaking/report-stocktaking-page-auto', + method: 'get', + params: query, + }); +} + +//报表导出 +export function exportRecords(params) { + return request({ + url: '/pharmacy-manage/medication-details/excel-out', + method: 'get', + params: qparamsuery, + }); +} + +//查看单据详情 +export function getDocumentDetails(params) { + return request({ + url: '/inventory-manage/purchase/inventory-receipt', + method: 'get', + params: params, + }); +} + +//药剂科报表_常规报表:出库明细表(例子) +export function getStockOutDetail(query) { + return request({ + url: '/report-manage/report/stock-out-detail-page', + method: 'get', + params: query, + }); +} + +//查询患者明细主报表--20251106追加 +export function getReportPatientMasterDetail(query) { + return request({ + url: '/report-manage/report/patient-master-detail', + method: 'get', + params: query, + }); +} + +//线下采购占比报表--20251106追加 +export function getReportOfflinePurchaseRatio(query) { + return request({ + url: '/report-manage/report/offline-purchase-ratio', + method: 'get', + params: query, + }); +} + +//药品使用情况报表--20251106追加 +export function getReportMedicationUsage(query) { + return request({ + url: '/report-manage/report/medication-usage', + method: 'get', + params: query, + }); +} + +//查询患者明细报表--20251106追加 +export function getReportPatientDetails(query) { + return request({ + url: '/report-manage/report/patient-details', + method: 'get', + params: query, + }); +} + +//药剂科报表:药品费用增长率--20251106追加 +export function getDrugExpensesGrowthRate(query) { + return request({ + url: '/report-manage/report/drug-expenses-growth-rate', + method: 'get', + params: query, + }); +} + +//药剂科报表:30天回款率--20251106追加 +export function getThirtyDayCollectionRate(query) { + return request({ + url: '/report-manage/report/thirty-day-collection-rate', + method: 'get', + params: query, + }); +} + +//药剂科报表:基本情况--20251106追加 +export function getReportBasicInformationDetails(query) { + return request({ + url: '/report-manage/report/basic-information-details', + method: 'get', + params: query, + }); +} + +//药剂科报表:药品出库情况--20251106追加 +export function getReportMedicationStockOutDetails(query) { + return request({ + url: '/report-manage/report/medication-stock-out-details', + method: 'get', + params: query, + }); +} + +//药剂科报表:产品使用情况--20251106追加 +export function getReportProductUsageDetails(query) { + return request({ + url: '/report-manage/report/product-usage-details', + method: 'get', + params: query, + }); +} + +//药剂科报表:非中选产品采购量占比--20251106追加 +export function getReportNonWinQtyRatio(query) { + return request({ + url: '/report-manage/report/non-win-qty-ratio', + method: 'get', + params: query, + }); +} + +//药剂科报表:药品入库情况--20251106追加 +export function getMedicationInboundDetails(query) { + return request({ + url: '/report-manage/report/medication-inbound-details', + method: 'get', + params: query, + }); +} + +//药剂科报表:红旗药品销售情况--20251106追加 +export function getMedicationSaleDetails(query) { + return request({ + url: '/report-manage/report/medication-sale-details', + method: 'get', + params: query, + }); +} + +//药剂科报表:疾病统计(健康保健)--20251106追加 +export function getDiseaseDetails(query) { + return request({ + url: '/report-manage/report/disease-details', + method: 'get', + params: query, + }); +} + +//同一报表:门诊科室工作量统计 +export function getOutpatientDepartmentMetrics(query) { + return request({ + url: '/report-manage/report/outpatient-department-metrics', + method: 'get', + params: query, + }); +} + +//同一报表:查询门诊收费明细初始值--20251106追加 +export function getReportPhysicianWorkloadInit() { + return request({ + url: '/report-manage/report/physician-workload-init', + method: 'get', + }); +} + +//同一报表:查询门诊收费明细--20251106追加 +export function getPhysicianWorkloadPage(params) { + return request({ + url: '/report-manage/report/report-physician-workload-page', + method: 'get', + params: params, + }); +} + +// 查询追溯患者列表 +export function tracePatient(query) { + return request({ + url: '/inventory-manage/traceNo/trace-patient', + method: 'get', + params: query, + }); +} diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/stockOutDetail.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/stockOutDetail.vue new file mode 100755 index 000000000..8ad81c2f4 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/stockOutDetail.vue @@ -0,0 +1,231 @@ + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/thirtyDayCollectionRate.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/thirtyDayCollectionRate.vue new file mode 100755 index 000000000..6a1dbc576 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/thirtyDayCollectionRate.vue @@ -0,0 +1,232 @@ + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/traceabilityCodeManagement.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/traceabilityCodeManagement.vue new file mode 100755 index 000000000..657421163 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/traceabilityCodeManagement.vue @@ -0,0 +1,361 @@ + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/traceabilityPersonInfo.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/traceabilityPersonInfo.vue new file mode 100755 index 000000000..b7130211f --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/traceabilityPersonInfo.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/transferManagentDetails.vue b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/transferManagentDetails.vue new file mode 100755 index 000000000..b8d5f09b4 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/statisticalManagement/transferManagentDetails.vue @@ -0,0 +1,400 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/storeReconciliation/components/api.js b/backup/vxetable-migration-20260602/medicationmanagement/storeReconciliation/components/api.js new file mode 100755 index 000000000..d1976d7b0 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/storeReconciliation/components/api.js @@ -0,0 +1,24 @@ +import request from '@/utils/request'; + +// 获取库房对账列表 +export function getStoreReconciliationList (query) { + return request ({ + url: '/inventory-manage/dynamic/dynamic-inventory', + method: 'get', + params: query, + }); +} +// 获取库房列表// 药房药库列表 +export function getPharmacyCabinetList () { + return request ({ + url: '/app-common/pharmacy-cabinet-list', + method: 'get', + }); +} +// 查询备份单号 +export function getBackupList () { + return request ({ + url: '/app-common/backup-list', + method: 'get', + }); +} diff --git a/backup/vxetable-migration-20260602/medicationmanagement/storeReconciliation/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/storeReconciliation/index.vue new file mode 100755 index 000000000..32a7afc73 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/storeReconciliation/index.vue @@ -0,0 +1,510 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/transferManagent/batchTransfer/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/transferManagent/batchTransfer/index.vue new file mode 100755 index 000000000..af9b62681 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/transferManagent/batchTransfer/index.vue @@ -0,0 +1,1403 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/transferManagent/components/template.json b/backup/vxetable-migration-20260602/medicationmanagement/transferManagent/components/template.json new file mode 100755 index 000000000..79f10e2a7 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/transferManagent/components/template.json @@ -0,0 +1,310 @@ +{ + "panels": [ + { + "index": 0, + "name": 1, + "paperType": "A4", + "height": 297, + "width": 210, + "paperHeader": 73.5, + "paperFooter": 817.5, + "paperNumberContinue": true, + "overPrintOptions": {}, + "watermarkOptions": {}, + "panelLayoutOptions": {}, + "printElements": [ + { + "options": { + "left": 249, + "top": 12, + "height": 12, + "width": 70.5, + "title": "调拨单据", + "coordinateSync": false, + "widthHeightSync": false, + "fontSize": 16.5, + "qrCodeLevel": 0 + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 10.5, + "top": 46.5, + "height": 9.75, + "width": 120, + "title": "单据号", + "field": "busNo", + "coordinateSync": false, + "widthHeightSync": false, + "qrCodeLevel": 0 + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 141, + "top": 46.5, + "height": 9.75, + "width": 97.5, + "title": "源仓库", + "field": "sourceLocationName", + "coordinateSync": false, + "widthHeightSync": false, + "qrCodeLevel": 0 + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 249, + "top": 46.5, + "height": 9.75, + "width": 97.5, + "title": "目的仓库", + "coordinateSync": false, + "widthHeightSync": false, + "qrCodeLevel": 0, + "field": "purposeLocationName" + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 360.99609375, + "top": 46.5, + "height": 9.75, + "width": 78, + "title": "项目类型", + "coordinateSync": false, + "widthHeightSync": false, + "qrCodeLevel": 0, + "field": "itemType_dictText" + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 445.5, + "top": 46.5, + "height": 9.75, + "width": 136.5, + "title": "制单日期", + "field": "occurrenceTime", + "coordinateSync": false, + "widthHeightSync": false, + "qrCodeLevel": 0 + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 9, + "top": 88.5, + "height": 36, + "width": 573, + "title": "undefined+beforeDragIn", + "field": "detailsList", + "coordinateSync": false, + "widthHeightSync": false, + "columns": [ + [ + { + "title": "项目名称", + "titleSync": false, + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 86.67519359101631, + "field": "name", + "checked": true, + "columnId": "name", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "规格", + "titleSync": false, + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 80.21549132169478, + "field": "totalVolume", + "checked": true, + "columnId": "totalVolume", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "厂家", + "titleSync": false, + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 75.93737727220328, + "field": "manufacturerText", + "checked": true, + "columnId": "manufacturerText", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "批号", + "titleSync": false, + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 67.21760769186436, + "field": "lotNumber", + "checked": true, + "columnId": "lotNumber", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "单价", + "titleSync": false, + "align": "right", + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 60.17562958542372, + "field": "price", + "checked": true, + "columnId": "price", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "调拨单位", + "titleSync": false, + "align": "center", + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 30.9839942645893, + "field": "measurementUnitCode_dictText", + "checked": true, + "columnId": "measurementUnitCode_dictText", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "源库存数", + "titleSync": false, + "align": "right", + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 55.062860531575446, + "field": "totalSourceQuantity", + "checked": true, + "columnId": "totalSourceQuantity", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "调拨数", + "titleSync": false, + "align": "right", + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 63.064593526717786, + "field": "itemQuantity", + "checked": true, + "columnId": "itemQuantity", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "title": "合计金额", + "titleSync": false, + "align": "right", + "halign": "center", + "tableQRCodeLevel": 0, + "tableSummaryTitle": true, + "tableSummary": "", + "width": 53.66725221491505, + "field": "totalPrice", + "checked": true, + "columnId": "totalPrice", + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "width": 85.25, + "checked": false, + "fixed": false, + "rowspan": 1, + "colspan": 1 + }, + { + "width": 85.25, + "checked": false, + "fixed": false, + "rowspan": 1, + "colspan": 1 + } + ] + ] + }, + "printElementType": { + "title": "表格", + "type": "table", + "editable": true, + "columnDisplayEditable": true, + "columnDisplayIndexEditable": true, + "columnTitleEditable": true, + "columnResizable": true, + "columnAlignEditable": true, + "isEnableEditField": true, + "isEnableContextMenu": true, + "isEnableInsertRow": true, + "isEnableDeleteRow": true, + "isEnableInsertColumn": true, + "isEnableDeleteColumn": true, + "isEnableMergeCell": true + } + } + ], + "paperNumberLeft": 565, + "paperNumberTop": 819 + } + ] +} \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/transferManagent/components/transferDetailsDialog.vue b/backup/vxetable-migration-20260602/medicationmanagement/transferManagent/components/transferDetailsDialog.vue new file mode 100755 index 000000000..dc492b69e --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/transferManagent/components/transferDetailsDialog.vue @@ -0,0 +1,333 @@ + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/transferManagent/components/transferManagement.js b/backup/vxetable-migration-20260602/medicationmanagement/transferManagent/components/transferManagement.js new file mode 100755 index 000000000..705522b41 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/transferManagent/components/transferManagement.js @@ -0,0 +1,160 @@ +import request from '@/utils/request' + +// 查询调拨管理列表 +export function getTransferProductList(query) { + return request({ + url:'/inventory-manage/transfer/product-transfer-page', + method: 'get', + params: query + }) +} + +// 调拨详情 +export function getTransferProductDetail(busNo) { + return request({ + url: '/inventory-manage/transfer/product-transfer-detail', + method: 'get', + params: busNo // 确保参数正确传递 + }) +} + +// 添加/编辑调拨单据 +export function addTransferProduct(data) { + return request({ + url: '/inventory-manage/transfer/product-transfer', + // product-transfer-edit', + method: 'put', + data: data + }) +} + +// 添加/编辑批量调拨单据 +export function addTransferProductBatch(data) { + return request({ + url: '/inventory-manage/transfer/product-transfer-batch', + // product-transfer-edit', + method: 'put', + data: data + }) +} + +// 批量调拨详情 +export function getTransferProductDetails(params) { + return request({ + url: '/inventory-manage/transfer/product-transfer-batch', + method: 'get', + params: params // 确保参数正确传递 + }) +} + + +// 查询单据初始化数据 +export function getInit() { + return request({ + url: '/inventory-manage/transfer/init', + method: 'get' + }) +} +export function getBusNoInit() { //单据号 + return request({ + url: '/inventory-manage/transfer/bus-no-init', + method: 'get' + }) +} + + +// 删除单据 +export function delTransferProduct(param) { + return request({ + url: '/inventory-manage/transfer/product-transfer-del?supplyRequestIds=' + param, + method: 'delete', + }) +} + +// 提交审批 +export function submitApproval(busNo) { + return request({ + url: '/inventory-manage/transfer/submit-approval', + // product-transfer-approved + method: 'put', + data: { busNo } // 修复:发送对象而不是字符串 + }) +} + +// 撤回审批 +export function withdrawApproval(busNo) { + return request({ + url: '/inventory-manage/transfer/withdraw-approval', + method: 'put', + data: { busNo } // 修复:发送对象而不是字符串 + }) +} + +// 获取药品目录 +export function getMedicineList(queryParams) { + return request({ + url: '/app-common/inventory-item', + method: 'get', + params: queryParams + }) +} + +// 获取药品目录 +export function getCount(queryParams) { + return request({ + url: '/app-common/inventory-item-info', + method: 'get', + params: queryParams + }) +} + +// 获取药房列表 +export function getPharmacyList() { + return request({ + url: '/app-common/pharmacy-list', + method: 'get', + }) +} + +// 获取药库列表 +export function getDispensaryList() { + return request({ + url: '/app-common/cabinet-list', + method: 'get', + }) +} + +// 获取耗材库列表 +export function getWarehouseList() { + return request({ + url: '/app-common/warehouse-list', + method: 'get', + }) +} +// 获取仓库药房列表 +export function getpharmacyCabinetList() { + return request({ + url: '/app-common/pharmacy-cabinet-list', + method: 'get', + }) +} + +/** + * 审批驳回 + */ +export function reject(busNo) { + return request({ + url: '/inventory-manage/receipt/reject?busNo=' + busNo, + method: 'put', + }) +} + +/** + * 商品调拨审批通过 + */ +export function productTransferApproved(busNo) { + return request({ + url: '/inventory-manage/receipt/product-transfer-approved?busNo=' + busNo, + method: 'put', + }) +} \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/transferManagent/components/transferManagement.vue b/backup/vxetable-migration-20260602/medicationmanagement/transferManagent/components/transferManagement.vue new file mode 100755 index 000000000..bfab69d97 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/transferManagent/components/transferManagement.vue @@ -0,0 +1,175 @@ + + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/transferManagent/transferManagent/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/transferManagent/transferManagent/index.vue new file mode 100755 index 000000000..2359d0b84 --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/transferManagent/transferManagent/index.vue @@ -0,0 +1,1668 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/medicationmanagement/transferManagent/transferManagentList/index.vue b/backup/vxetable-migration-20260602/medicationmanagement/transferManagent/transferManagentList/index.vue new file mode 100755 index 000000000..ecbafa20e --- /dev/null +++ b/backup/vxetable-migration-20260602/medicationmanagement/transferManagent/transferManagentList/index.vue @@ -0,0 +1,556 @@ + + + + \ No newline at end of file diff --git a/backup/vxetable-migration-20260602/package.json b/backup/vxetable-migration-20260602/package.json new file mode 100755 index 000000000..52769f150 --- /dev/null +++ b/backup/vxetable-migration-20260602/package.json @@ -0,0 +1,93 @@ +{ + "name": "openhis", + "version": "3.8.10", + "description": "OpenHIS管理系统", + "author": "OpenHIS", + "license": "MIT", + "type": "module", + "scripts": { + "dev": "vite --mode dev", + "build:prod": "vite build --mode prod", + "build:stage": "vite build --mode staging", + "build:test": "vite build --mode test", + "build:dev": "vite build --mode dev", + "preview": "vite preview", + "build:spug": "vite build --mode spug", + "test": "vitest", + "test:run": "vitest run", + "test:coverage": "vitest run --coverage", + "test:ui": "vitest --ui", + "lint": "eslint . --ext .js,.vue src/", + "test:e2e": "playwright test", + "test:e2e:ui": "playwright test --ui", + "test:e2e:report": "playwright show-report" + }, + "repository": { + "type": "git", + "url": "giturl" + }, + "dependencies": { + "@element-plus/icons-vue": "^2.3.2", + "@vueup/vue-quill": "1.2.0", + "@vueuse/core": "10.6.1", + "axios": "0.27.2", + "china-division": "^2.7.0", + "d3": "^7.9.0", + "dayjs": "^1.11.19", + "decimal.js": "^10.5.0", + "echarts": "^5.4.3", + "element-china-area-data": "^6.1.0", + "element-plus": "^2.12.0", + "file-saver": "^2.0.5", + "fuse.js": "^7.0.0", + "html2pdf.js": "^0.10.3", + "js-cookie": "^3.0.5", + "jsencrypt": "^3.3.2", + "json-bigint": "^1.0.0", + "lodash": "^4.17.21", + "lodash-es": "^4.17.21", + "moment": "^2.30.1", + "next": "^16.1.0", + "nprogress": "^0.2.0", + "pinia": "^2.2.0", + "pinyin": "^4.0.0-alpha.2", + "province-city-china": "^8.5.8", + "qrcode": "^1.5.4", + "qrcodejs2": "^0.0.2", + "react": "18.2.0", + "react-dom": "18.2.0", + "segmentit": "^2.0.3", + "sortablejs": "^1.15.6", + "v-region": "^3.3.0", + "vue": "^3.5.13", + "vue-area-linkage": "^5.1.0", + "vue-cropper": "^1.1.1", + "vue-plugin-hiprint": "^0.0.19", + "vue-router": "^4.3.0" + }, + "devDependencies": { + "@playwright/test": "^1.58.2", + "@types/node": "^25.0.1", + "@vitejs/plugin-vue": "4.5.0", + "@vue/compiler-sfc": "3.3.9", + "@vue/test-utils": "^2.4.6", + "eslint": "^9.39.4", + "eslint-import-resolver-alias": "^1.1.2", + "eslint-plugin-import": "^2.32.0", + "eslint-plugin-vue": "^10.9.0", + "globals": "^17.5.0", + "happy-dom": "^20.8.3", + "jsdom": "^28.1.0", + "pg": "^8.18.0", + "sass": "1.69.5", + "typescript": "^5.9.3", + "unplugin-auto-import": "0.17.1", + "unplugin-vue-setup-extend-plus": "1.0.0", + "vite": "5.0.4", + "vite-plugin-compression": "0.5.1", + "vite-plugin-svg-icons": "2.0.1", + "vite-plugin-vue-mcp": "^0.3.2", + "vitest": "^4.0.18", + "vue-tsc": "^3.1.8" + } +} \ No newline at end of file diff --git a/logs/openhis.log b/logs/openhis.log new file mode 100644 index 000000000..32a91c745 --- /dev/null +++ b/logs/openhis.log @@ -0,0 +1,516 @@ + _ _ ______ _ _______ _ _ _ _____ _ _ _ __ _ _ _____ _____ + | | | | ____| /\ | | |__ __| | | | | |_ _| \ | | |/ / | | | |_ _|/ ____| + | |__| | |__ / \ | | | | | |__| | | | | | \| | ' /_____| |__| | | | | (___ + | __ | __| / /\ \ | | | | | __ | | | | | . ` | <______| __ | | | \___ \ + | | | |____ / ____ \| |____| | | | | | |____ _| |_| |\ | . \ | | | |_| |_ ____) | + |_| |_|______/_/ \_\______|_| |_| |_|______|_____|_| \_|_\ \ |_| |_|_____|_____/ + +Application Version: 0.0.1 + +11:34:57.082 [background-preinit] INFO o.h.v.i.util.Version - [,21] - HV000001: Hibernate Validator 6.2.5.Final +11:34:57.080 [main] INFO c.o.OpenHisApplication - [logStarting,55] - Starting OpenHisApplication v0.0.1-SNAPSHOT using Java 17.0.18 on jchl254 with PID 36365 (/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar started by root in /root/.openclaw/workspace/his-repo) +11:34:57.084 [main] INFO c.o.OpenHisApplication - [logStartupProfileInfo,686] - The following 1 profile is active: "dev" +11:35:03.065 [main] INFO o.a.c.h.Http11NioProtocol - [log,173] - Initializing ProtocolHandler ["http-nio-18082"] +11:35:03.070 [main] INFO o.a.c.c.StandardService - [log,173] - Starting service [Tomcat] +11:35:03.070 [main] INFO o.a.c.c.StandardEngine - [log,173] - Starting Servlet engine: [Apache Tomcat/9.0.96] +11:35:03.148 [main] INFO o.a.c.c.C.[.[.[/openhis] - [log,173] - Initializing Spring embedded WebApplicationContext +11:35:04.994 [main] INFO c.a.d.p.DruidDataSource - [init,865] - {dataSource-1} inited +11:35:05.463 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Registered plugin: 'com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor@536da29c' +11:35:05.537 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/PharmacyWarehousemanage/PharmacyWarehouseStocktakingOrderMapper.xml]' +11:35:05.557 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/PharmacyWarehousemanage/PharmacyWarehouseStockOutOrderMapper.xml]' +11:35:05.564 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/PharmacyWarehousemanage/PharmacyWarehouseStockInOrderMapper.xml]' +11:35:05.570 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/PharmacyWarehousemanage/PharmacyWarehousePurchaseOrderMapper.xml]' +11:35:05.576 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/PharmacyWarehousemanage/PharmacyWarehouseDocumentManagementMapper.xml]' +11:35:05.581 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/PharmacyWarehousemanage/PharmacyWarehouseReturnToWarehouseOrderMapper.xml]' +11:35:05.598 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/PharmacyWarehousemanage/PharmacyWarehouseReturnOrderMapper.xml]' +11:35:05.706 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/PharmacyWarehousemanage/PharmacyWarehouseCommonMapper.xml]' +11:35:05.715 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/inpatientmanage/DepositMapper.xml]' +11:35:05.721 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/basicservice/HealthcareServiceBizMapper.xml]' +11:35:05.726 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/PharmacyWarehousemanage/PharmacyWarehouseProfitLossOrderMapper.xml]' +11:35:05.831 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/consultation/ConsultationRequestMapper.xml]' +11:35:05.839 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/tencentJH/TencentAppMapper.xml]' +11:35:05.878 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/clinical/SurgeryMapper.xml]' +11:35:05.885 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/inpatientmanage/VitalSignsAppMapper.xml]' +11:35:05.893 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/inpatientmanage/PatientHomeAppMapper.xml]' +11:35:05.899 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/externalintegration/FoodborneAcquisitionAppMapper.xml]' +11:35:05.908 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/inpatientmanage/NursingRecordAppMapper.xml]' +11:35:05.913 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/paymentmanage/ChargeBillMapper.xml]' +11:35:05.918 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/datadictionary/ItemDefinitionAppMapper.xml]' +11:35:05.936 [main] ERROR c.b.m.c.MybatisConfiguration - [addMappedStatement,110] - mapper[com.openhis.web.common.mapper.CommonAppMapper.getPractitionerSignature] is ignored, because it exists, maybe from xml file +11:35:05.937 [main] ERROR c.b.m.c.MybatisConfiguration - [addMappedStatement,110] - mapper[com.openhis.web.common.mapper.CommonAppMapper.getActivityDefinition] is ignored, because it exists, maybe from xml file +11:35:05.939 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/common/CommonAppMapper.xml]' +11:35:05.978 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/datadictionary/MedicationManageSearchMapper.xml]' +11:35:05.987 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/paymentmanage/EleInvoiceMapper.xml]' +11:35:05.992 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/jlau/ReviewPrescriptionRecordsAppMapper.xml]' +11:35:05.995 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/chargemanage/OutpatientPricingAppMapper.xml]' +11:35:06.002 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/datadictionary/ActivityDefinitionManageMapper.xml]' +11:35:06.007 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/paymentmanage/ThreePartPayMapper.xml]' +11:35:06.015 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/paymentmanage/PaymentMapper.xml]' +11:35:06.021 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/datadictionary/DeviceManageMapper.xml]' +11:35:06.026 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/departmentmanage/DepartmentRequisitionOrderMapper.xml]' +11:35:06.032 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/datadictionary/LabActivityDefinitionManageMapper.xml]' +11:35:06.037 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/paymentmanage/ChangePriceMapper.xml]' +11:35:06.061 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/datadictionary/ChargeItemDefSearchMapper.xml]' +11:35:06.064 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/departmentmanage/DepartmentProfitLossOrderMapper.xml]' +11:35:06.073 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/ybmanage/YbMapper.xml]' +11:35:06.081 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/departmentmanage/DepartmentCommonMapper.xml]' +11:35:06.088 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/ybmanage/YbElepMapper.xml]' +11:35:06.091 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/departmentmanage/DepartmentReturnToWarehouseOrderMapper.xml]' +11:35:06.094 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/departmentmanage/DepartmentStocktakingOrderMapper.xml]' +11:35:06.102 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/ybmanage/MedicalInsuranceMapper.xml]' +11:35:06.106 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/departmentmanage/DepartmentTransferInOrderMapper.xml]' +11:35:06.109 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/departmentmanage/DepartmentTransferOutOrderMapper.xml]' +11:35:06.119 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/inhospitalnursestation/ATDManageAppMapper.xml]' +11:35:06.124 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/inhospitalnursestation/OrgDeviceStockTakeAppMapper.xml]' +11:35:06.140 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/inhospitalnursestation/MedicineSummaryAppMapper.xml]' +11:35:06.144 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/departmentmanage/DepartmentIssuanceOrderMapper.xml]' +11:35:06.148 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml]' +11:35:06.153 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/adjustprice/AdjustPriceMapper.xml]' +11:35:06.159 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/chargemanage/OutpatientRegistrationAppMapper.xml]' +11:35:06.163 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/inhospitalnursestation/NurseBillingAppMapper.xml]' +11:35:06.166 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/departmentmanage/DepartmentStockInOrderMapper.xml]' +11:35:06.172 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/inhospitalnursestation/EncounterAutoRollAppMapper.xml]' +11:35:06.178 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/outpatientmanage/OutpatientInfusionAppMapper.xml]' +11:35:06.187 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/chargemanage/OutpatientRefundAppMapper.xml]' +11:35:06.195 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/Inventorymanage/ProductStocktakingMapper.xml]' +11:35:06.199 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/doctorstation/DoctorStationLabApplyMapper.xml]' +11:35:06.204 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/outpatientmanage/OutpatientTreatmentAppMapper.xml]' +11:35:06.208 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/outpatientmanage/OutpatientSkinTestAppMapper.xml]' +11:35:06.211 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml]' +11:35:06.217 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/chargemanage/OutpatientChargeAppMapper.xml]' +11:35:06.225 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml]' +11:35:06.234 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/regdoctorstation/RequestFormManageAppMapper.xml]' +11:35:06.240 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/Inventorymanage/InventorySettlementAppMapper.xml]' +11:35:06.246 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/pharmacymanage/ReturnMedicineMapper.xml]' +11:35:06.252 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/regdoctorstation/AdviceManageAppMapper.xml]' +11:35:06.256 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/document/DocDefinitionAppMapper.xml]' +11:35:06.259 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/pharmacymanage/MedicalDeviceDispenseMapper.xml]' +11:35:06.263 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/regdoctorstation/SpecialAdviceAppMapper.xml]' +11:35:06.266 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/pharmacymanage/SummaryDispenseMedicineMapper.xml]' +11:35:06.269 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/chargemanage/InpatientChargeAppMapper.xml]' +11:35:06.275 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/Inventorymanage/RequisitionIssueMapper.xml]' +11:35:06.279 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/pharmacymanage/InHospitalReturnMedicineAppMapper.xml]' +11:35:06.283 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/Inventorymanage/InventoryAdjustPriceMapper.xml]' +11:35:06.287 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/pharmacymanage/MedicationDetailsMapper.xml]' +11:35:06.293 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/Inventorymanage/ProductDetailAppMapper.xml]' +11:35:06.297 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/catalogmanage/CatalogMapper.xml]' +11:35:06.304 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/Inventorymanage/ProductTransferMapper.xml]' +11:35:06.307 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/doctorstation/DoctorStationEmrAppMapper.xml]' +11:35:06.311 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/reportmanage/MonthlySettlementReportMapper.xml]' +11:35:06.315 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/reportmanage/DepartmentRevenueStatisticsMapper.xml]' +11:35:06.318 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/Inventorymanage/PurchaseInventoryMapper.xml]' +11:35:06.323 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/reportmanage/AmbAdviceStatisticsAppMapper.xml]' +11:35:06.331 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/reportmanage/PrintReportMapper.xml]' +11:35:06.335 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/reportmanage/LossReportMapper.xml]' +11:35:06.342 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/Inventorymanage/LossReportFormMapper.xml]' +11:35:06.346 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/reportmanage/DrugDosageSettlementMapper.xml]' +11:35:06.351 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/Inventorymanage/InventoryDetailsMapper.xml]' +11:35:06.355 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/reportmanage/StocktakingReportMapper.xml]' +11:35:06.358 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/Inventorymanage/TraceNoAppMapper.xml]' +11:35:06.365 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/reportmanage/ChargeReportMapper.xml]' +11:35:06.370 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/Inventorymanage/PurchaseReturnMapper.xml]' +11:35:06.375 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/doctorstation/DoctorStationChineseMedicalAppMapper.xml]' +11:35:06.380 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/reportmanage/ReportStatisticsMapper.xml]' +11:35:06.383 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/Inventorymanage/ReturnIssueMapper.xml]' +11:35:06.389 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/doctorstation/DoctorStationMainAppMapper.xml]' +11:35:06.391 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/inspection/GroupRecMapper.xml]' +11:35:06.394 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/personalization/ActivityDeviceAppMapper.xml]' +11:35:06.398 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/reportmanage/OutboundReportMapper.xml]' +11:35:06.426 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/Inventorymanage/ReceiptApprovalMapper.xml]' +11:35:06.432 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/reportmanage/PharmacySettlementReportAppMapper.xml]' +11:35:06.447 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/reportmanage/InventoryProductReportMapper.xml]' +11:35:06.450 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/document/DocStatisticsDefinitionAppMapper.xml]' +11:35:06.454 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/reportmanage/MedicationDeviceReportMapper.xml]' +11:35:06.459 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml]' +11:35:06.464 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/reportmanage/MedicationInboundReportMapper.xml]' +11:35:06.470 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/document/DocRecordAppMapper.xml]' +11:35:06.477 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/reportmanage/InpatientMedicalRecordHomePageCollectionMapper.xml]' +11:35:06.493 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/doctorstation/DoctorStationAdviceAppMapper.xml]' +11:35:06.499 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/reportmanage/InboundReportMapper.xml]' +11:35:06.505 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/reportmanage/ReturnIssueReportMapper.xml]' +11:35:06.511 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/reportmanage/PurchaseReturnReportMapper.xml]' +11:35:06.516 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/reportmanage/RegisterReportMapper.xml]' +11:35:06.524 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/doctorstation/DoctorStationElepPrescriptionMapper.xml]' +11:35:06.533 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/reportmanage/ReportMapper.xml]' +11:35:06.537 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/doctorstation/ReservationRecordAppMapper.xml]' +11:35:06.544 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/reportmanage/TransferReportMapper.xml]' +11:35:06.552 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/basedatamanage/PractitionerAppMapper.xml]' +11:35:06.558 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/doctorstation/DoctorStationPtDetailsAppMapper.xml]' +11:35:06.566 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/clinicalmanage/SurgicalScheduleAppMapper.xml]' +11:35:06.569 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/inspection/SampleCollectMapper.xml]' +11:35:06.600 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/clinicalmanage/SurgeryMapper.xml]' +11:35:06.605 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/personalization/OrderGroupAppMapper.xml]' +11:35:06.610 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/materialmanage/MaterialReturnOrderMapper.xml]' +11:35:06.615 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/inspection/LisReportMapper.xml]' +11:35:06.619 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/materialmanage/MaterialStockOutOrderMapper.xml]' +11:35:06.623 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/materialmanage/MaterialTransferOutOrderMapper.xml]' +11:35:06.628 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/materialmanage/MaterialStockInOrderMapper.xml]' +11:35:06.634 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/personalization/OrdersGroupPackageAppMapper.xml]' +11:35:06.639 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/materialmanage/MaterialProfitLossOrderMapper.xml]' +11:35:06.671 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/patientmanage/PatientManageMapper.xml]' +11:35:06.675 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/materialmanage/MaterialPurchaseOrderMapper.xml]' +11:35:06.682 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/inhospitalcharge/InHospitalRegisterAppMapper.xml]' +11:35:06.686 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/materialmanage/MaterialTransferInOrderMapper.xml]' +11:35:06.692 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/inhospitalcharge/AdvancePaymentManageAppMapper.xml]' +11:35:06.696 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/materialmanage/MaterialStocktakingOrderMapper.xml]' +11:35:06.724 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/appointmentmanage/DoctorScheduleMapper.xml]' +11:35:06.729 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/materialmanage/MaterialReturnToWarehouseOrderMapper.xml]' +11:35:06.756 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/appointmentmanage/ClinicRoomMapper.xml]' +11:35:06.765 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/materialmanage/MaterialCommonMapper.xml]' +11:35:06.771 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/nenu/GfStudentListAppMapper.xml]' +11:35:06.777 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/nenu/GfRatioApplicationRecordAppMapper.xml]' +11:35:06.781 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/nenu/GfRatioManageAppMapper.xml]' +11:35:06.789 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/reportManagement/InfectiousCardMapper.xml]' +11:35:06.793 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/PharmacyDispensarymanage/PharmacyDispensaryStockInOrderMapper.xml]' +11:35:06.797 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/PharmacyDispensarymanage/PharmacyDispensaryReturnToWarehouseOrderMapper.xml]' +11:35:06.806 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/PharmacyDispensarymanage/PharmacyDispensaryCommonMapper.xml]' +11:35:06.810 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/PharmacyDispensarymanage/PharmacyDispensaryStocktakingOrderMapper.xml]' +11:35:06.815 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/PharmacyDispensarymanage/PharmacyDispensaryDispensingOrderMapper.xml]' +11:35:06.819 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/PharmacyDispensarymanage/PharmacyDispensaryRequisitionOrderMapper.xml]' +11:35:06.823 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/PharmacyDispensarymanage/PharmacyDispensaryTransferOutOrderMapper.xml]' +11:35:06.827 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/PharmacyDispensarymanage/PharmacyDispensaryTransferInOrderMapper.xml]' +11:35:06.832 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/classes!/mapper/PharmacyDispensarymanage/PharmacyDispensaryProfitLossOrderMapper.xml]' +11:35:06.861 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/yb/InventorySaleRecordMapper.xml]' +11:35:06.889 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/workflow/InventoryItemMapper.xml]' +11:35:06.922 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/workflow/SupplyRequestMapper.xml]' +11:35:06.950 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/workflow/SupplyRequestAutoMapper.xml]' +11:35:06.975 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/lab/SpecimenMapper.xml]' +11:35:06.999 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybcatalog/CatalogSpecialDiseaseMapper.xml]' +11:35:07.021 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/yb/InventoryPurchaseRecordMapper.xml]' +11:35:07.037 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/yb/ClinicPreSettleMapper.xml]' +11:35:07.054 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/workflow/ActivityDefinitionMapper.xml]' +11:35:07.077 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/clinical/DiagnosisBelongBindingMapper.xml]' +11:35:07.102 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/financial/PaymentRecDetailMapper.xml]' +11:35:07.129 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybcatalog/CatalogZyDiseaseDiagnosisMapper.xml]' +11:35:07.160 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/yb/InpatientPreSettleMapper.xml]' +11:35:07.183 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/sys/OperationRecordMapper.xml]' +11:35:07.221 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/clinical/OrderMapper.xml]' +11:35:07.245 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/financial/ClaimMapper.xml]' +11:35:07.267 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybcatalog/CatalogZySyndromeMapper.xml]' +11:35:07.287 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/yb/InventoryDelRecordMapper.xml]' +11:35:07.309 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/workflow/ServiceRequestDetailMapper.xml]' +11:35:07.332 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/document/EmrDictMapper.xml]' +11:35:07.358 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/document/DocInventoryItemStaticMapper.xml]' +11:35:07.390 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybcatalog/CatalogDrugInfoUsualMapper.xml]' +11:35:07.416 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/workflow/ServiceRequestMapper.xml]' +11:35:07.439 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/clinical/ProcedurePerformerMapper.xml]' +11:35:07.462 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/financial/ClaimResponseMapper.xml]' +11:35:07.488 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/financial/ThreePartPayCallBackMapper.xml]' +11:35:07.512 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybcatalog/CatalogMedicalHerbInfoMapper.xml]' +11:35:07.537 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/workflow/DeviceDispenseMapper.xml]' +11:35:07.558 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/lab/ActivityDefDeviceDefMapper.xml]' +11:35:07.587 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybcatalog/CatalogMedicalConsumablesMapper.xml]' +11:35:07.613 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/workflow/DeviceRequestMapper.xml]' +11:35:07.635 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/sys/OptionMapper.xml]' +11:35:07.658 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/document/VitalSignsMapper.xml]' +11:35:07.681 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybcatalog/CatalogMedicalServiceMapper.xml]' +11:35:07.710 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/workflow/ElepMedicationRequestMapper.xml]' +11:35:07.724 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/document/DocStatisticsDefinitionMapper.xml]' +11:35:07.739 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybcatalog/CatalogSurgeryStandardDirectoryMapper.xml]' +11:35:07.754 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/clinical/ConditionMapper.xml]' +11:35:07.772 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/clinical/TicketMapper.xml]' +11:35:07.786 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/financial/PaymentNoticeMapper.xml]' +11:35:07.806 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybcatalog/CatalogDrugInfoMapper.xml]' +11:35:07.823 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/clinical/ProcedureMapper.xml]' +11:35:07.838 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/document/RequestFormMapper.xml]' +11:35:07.852 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybcatalog/CatalogWesternDiseaseMapper.xml]' +11:35:07.866 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/clinical/AllergyIntoleranceMapper.xml]' +11:35:07.883 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/financial/PaymentReconciliationMapper.xml]' +11:35:07.901 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/SupplierMapper.xml]' +11:35:07.915 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/clinical/ReservationRecordMapper.xml]' +11:35:07.931 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/lab/InspectionPackageDetailMapper.xml]' +11:35:07.947 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/lab/LabActivityDefinitionMapper.xml]' +11:35:07.962 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/TraceNoManageMapper.xml]' +11:35:07.977 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/jlau/ReviewPrescriptionRecordsMapper.xml]' +11:35:07.991 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/OrgContrastMapper.xml]' +11:35:08.004 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/lab/ActivityDefObservationDefMapper.xml]' +11:35:08.018 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/lab/ActivityDefSpecimenDefMapper.xml]' +11:35:08.033 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/document/EmrTemplateMapper.xml]' +11:35:08.049 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/PractitionerPatientMapper.xml]' +11:35:08.063 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/document/DocTemplateMapper.xml]' +11:35:08.082 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/OrganizationMapper.xml]' +11:35:08.096 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/lab/ObservationMapper.xml]' +11:35:08.111 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/PatientMapper.xml]' +11:35:08.125 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/document/EmrDetailMapper.xml]' +11:35:08.139 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/ChargeItemDefDetailAppMapper.xml]' +11:35:08.153 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/document/DocStatisticsDefinitionOptionMapper.xml]' +11:35:08.168 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/FrequencyMapper.xml]' +11:35:08.183 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/document/DocRecordMapper.xml]' +11:35:08.197 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/document/EmrMapper.xml]' +11:35:08.211 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/document/DocDefinitionMapper.xml]' +11:35:08.226 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/ChargeItemDefinitionMapper.xml]' +11:35:08.241 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/document/DocStatisticsMapper.xml]' +11:35:08.255 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/template/OrdersGroupPackageMapper.xml]' +11:35:08.269 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/EncounterParticipantMapper.xml]' +11:35:08.283 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/document/DocDefinitionOrganizationMapper.xml]' +11:35:08.297 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/AccountMapper.xml]' +11:35:08.312 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/document/OrderProcessMapper.xml]' +11:35:08.329 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/EncounterMapper.xml]' +11:35:08.343 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/template/EncounterAutoRollMapper.xml]' +11:35:08.362 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/ChargeItemMapper.xml]' +11:35:08.376 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/template/OrderGroupMapper.xml]' +11:35:08.388 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/BizUserRoleMapper.xml]' +11:35:08.402 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/template/ActivityDeviceMapper.xml]' +11:35:08.417 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/PatientStudentMapper.xml]' +11:35:08.431 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/template/OrdersGroupPackageDetailMapper.xml]' +11:35:08.446 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/InvoiceMapper.xml]' +11:35:08.461 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/financial/ContractMapper.xml]' +11:35:08.476 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/HealthcareServiceMapper.xml]' +11:35:08.499 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/LocationMapper.xml]' +11:35:08.513 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/EncounterReasonMapper.xml]' +11:35:08.527 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/EncounterLocationMapper.xml]' +11:35:08.543 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/ChangePriceRecordMapper.xml]' +11:35:08.559 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/ScheduleSlotMapper.xml]' +11:35:08.575 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/DeviceDefinitionMapper.xml]' +11:35:08.590 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/InstrumentMapper.xml]' +11:35:08.604 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/OrganizationLocationMapper.xml]' +11:35:08.619 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/SpecimenDefinitionMapper.xml]' +11:35:08.634 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/DeviceMapper.xml]' +11:35:08.649 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/PractitionerRoleMapper.xml]' +11:35:08.664 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/EncounterDiagnosisMapper.xml]' +11:35:08.677 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/ObservationDefinitionMapper.xml]' +11:35:08.692 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/PractitionerMapper.xml]' +11:35:08.706 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/BizUserMapper.xml]' +11:35:08.720 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/administration/PatientIdentifierMapper.xml]' +11:35:08.735 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/medication/MedicationDefinitionMapper.xml]' +11:35:08.753 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/medication/MedicationRequestMapper.xml]' +11:35:08.767 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/medication/MedicationMapper.xml]' +11:35:08.782 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/medication/MedicationDispenseMapper.xml]' +11:35:08.796 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/nenu/GfRatioApplicationMapper.xml]' +11:35:08.809 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/nenu/GfRatioMapper.xml]' +11:35:08.822 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybelep/ElepRevokeOutputMapper.xml]' +11:35:08.835 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybelep/ElepQuerDiagnosisInfoMapper.xml]' +11:35:08.848 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybelep/ElepVeriPrescriptionOutputMapper.xml]' +11:35:08.862 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybelep/ElepQuerPrescriptionDetailMapper.xml]' +11:35:08.877 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybelep/ElepUploadInputMapper.xml]' +11:35:08.890 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybelep/ElepMedresultInfoMapper.xml]' +11:35:08.905 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybelep/ElepVeriPrescriptionDetailMapper.xml]' +11:35:08.919 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybelep/ElepRevokeInputMapper.xml]' +11:35:08.932 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybelep/ElepMedresultDetailMapper.xml]' +11:35:08.945 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybelep/ElepSignatureInputMapper.xml]' +11:35:08.958 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybelep/ElepQuerPrescriptionInputMapper.xml]' +11:35:08.971 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybelep/ElepSignatureOutputMapper.xml]' +11:35:08.986 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybelep/ElepVeriPrescriptionInfoMapper.xml]' +11:35:09.000 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybelep/ElepQuerVisitInfoMapper.xml]' +11:35:09.014 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybelep/ElepQuerPrescriptionInfoMapper.xml]' +11:35:09.027 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybelep/ElepUploadOutputMapper.xml]' +11:35:09.040 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybelep/ElepVeriDiagnosisInfoMapper.xml]' +11:35:09.053 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybelep/ElepMedresultInputMapper.xml]' +11:35:09.068 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/ybelep/ElepVeriVisitInfoMapper.xml]' +11:35:09.081 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/yb/InventoryChangeRecordMapper.xml]' +11:35:09.095 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/yb/PerinfoMapper.xml]' +11:35:09.107 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/yb/ClinicUnRegMapper.xml]' +11:35:09.120 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/yb/DirectoryCheckRecordMapper.xml]' +11:35:09.135 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/yb/ClincUnSettleMapper.xml]' +11:35:09.151 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/yb/InpatientDischargeMapper.xml]' +11:35:09.165 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/yb/InventorySaleReturnRecordMapper.xml]' +11:35:09.179 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/yb/ClincSettleMapper.xml]' +11:35:09.194 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/yb/InpatientRegMapper.xml]' +11:35:09.208 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/yb/SignMapper.xml]' +11:35:09.220 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/yb/FinancialApplyRecordMapper.xml]' +11:35:09.245 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/yb/InpatientRegInfoUpdateRecordeMapper.xml]' +11:35:09.259 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/yb/FinancialReconcileRecordMapper.xml]' +11:35:09.274 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/yb/InpatientFeeDetailMapper.xml]' +11:35:09.290 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/yb/RegMapper.xml]' +11:35:09.302 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/yb/InventoryCheckRecordMapper.xml]' +11:35:09.316 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/yb/InventoryPurchaseReturnRecordMapper.xml]' +11:35:09.331 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/yb/InpatientSettleMapper.xml]' +11:35:09.336 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/yb/MedicalInsuranceMapper.xml]' +11:35:09.351 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/workflow/SupplyDeliveryMapper.xml]' +11:35:09.364 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/clinical/ConditionDefinitionMapper.xml]' +11:35:09.378 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/openhis-domain-0.0.1-SNAPSHOT.jar!/mapper/clinical/ConditionNoDefinitionMapper.xml]' +11:35:09.392 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/system/SysUserConfigMapper.xml]' +11:35:09.396 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/system/SysPostMapper.xml]' +11:35:09.400 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/system/SysNoticeMapper.xml]' +11:35:09.406 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/system/SysMenuMapper.xml]' +11:35:09.410 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/system/SysConfigMapper.xml]' +11:35:09.414 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/system/SysDictTypeMapper.xml]' +11:35:09.417 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/system/SysOperLogMapper.xml]' +11:35:09.420 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/system/SysUserPostMapper.xml]' +11:35:09.422 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/system/SysTenantMapper.xml]' +11:35:09.446 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/system/SysUserMapper.xml]' +11:35:09.448 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/system/SysUserTenantMapper.xml]' +11:35:09.452 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/system/SysListenerMapper.xml]' +11:35:09.457 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/system/SysDictDataMapper.xml]' +11:35:09.460 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/system/SysNoticeReadMapper.xml]' +11:35:09.463 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/system/SysRoleMenuMapper.xml]' +11:35:09.467 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/system/SysDeptMapper.xml]' +11:35:09.470 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/system/SysRoleDeptMapper.xml]' +11:35:09.474 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/system/SysRoleMapper.xml]' +11:35:09.478 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/system/SysExpressionMapper.xml]' +11:35:09.482 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/system/SysDeployFormMapper.xml]' +11:35:09.485 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/system/SysFormMapper.xml]' +11:35:09.497 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/system/SysTenantOptionMapper.xml]' +11:35:09.501 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/system/SysLogininforMapper.xml]' +11:35:09.504 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/system/SysUserRoleMapper.xml]' +11:35:09.506 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/flowable/FlowDeployMapper.xml]' +11:35:09.509 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-system-0.0.1-SNAPSHOT.jar!/mapper/flowable/SysTaskFormMapper.xml]' +11:35:09.513 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-quartz-0.0.1-SNAPSHOT.jar!/mapper/quartz/SysJobMapper.xml]' +11:35:09.517 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-quartz-0.0.1-SNAPSHOT.jar!/mapper/quartz/SysJobLogMapper.xml]' +11:35:09.522 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-generator-0.0.1-SNAPSHOT.jar!/mapper/generator/GenTableMapper.xml]' +11:35:09.526 [main] DEBUG c.b.m.e.s.MybatisSqlSessionFactoryBean - [debug,49] - Parsed mapper file: 'URL [jar:file:/root/.openclaw/workspace/his-repo/openhis-server-new/openhis-application/target/openhis-application.jar!/BOOT-INF/lib/core-generator-0.0.1-SNAPSHOT.jar!/mapper/generator/GenTableColumnMapper.xml]' +11:35:09.531 [main] DEBUG c.b.m.c.t.Sequence - [initLog,88] - Initialization Sequence datacenterId:1 workerId:30 + _ _ |_ _ _|_. ___ _ | _ +| | |\/|_)(_| | |_\ |_)||_|_\ + / | + 3.5.5 +11:35:09.774 [main] DEBUG c.b.m.e.p.i.TenantLineInnerInterceptor - [parserSingle,45] - original SQL: select dict_code, + dict_sort, + dict_label, + dict_value, + dict_type, + css_class, + list_class, + is_default, + status, + py_str, + create_by, + create_time, + remark + from sys_dict_data + + WHERE status = ? + order by dict_sort asc +11:35:09.855 [main] DEBUG c.b.m.e.p.i.TenantLineInnerInterceptor - [processParser,85] - SQL to parse, SQL: select dict_code, + dict_sort, + dict_label, + dict_value, + dict_type, + css_class, + list_class, + is_default, + status, + py_str, + create_by, + create_time, + remark + from sys_dict_data + + WHERE status = ? + order by dict_sort asc +11:35:09.861 [main] DEBUG c.b.m.e.p.i.TenantLineInnerInterceptor - [processParser,98] - parse the finished SQL: SELECT dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, py_str, create_by, create_time, remark FROM sys_dict_data WHERE status = ? ORDER BY dict_sort ASC +11:35:11.983 [main] DEBUG c.b.m.e.p.i.TenantLineInnerInterceptor - [parserSingle,45] - original SQL: select config_id, + config_name, + config_key, + config_value, + config_type, + create_by, + create_time, + update_by, + update_time, + remark + from sys_config +11:35:11.989 [main] DEBUG c.b.m.e.p.i.TenantLineInnerInterceptor - [processParser,85] - SQL to parse, SQL: select config_id, + config_name, + config_key, + config_value, + config_type, + create_by, + create_time, + update_by, + update_time, + remark + from sys_config +11:35:11.990 [main] DEBUG c.b.m.e.p.i.TenantLineInnerInterceptor - [processParser,98] - parse the finished SQL: SELECT config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark FROM sys_config +11:35:13.166 [main] INFO o.f.s.b.ProcessEngineAutoConfiguration - [discoverDeploymentResources,104] - No deployment resources were found for autodeployment +11:35:13.711 [main] INFO o.f.s.b.c.CmmnEngineAutoConfiguration - [discoverDeploymentResources,104] - No deployment resources were found for autodeployment +11:35:13.958 [main] INFO o.f.s.b.d.DmnEngineAutoConfiguration - [discoverDeploymentResources,104] - No deployment resources were found for autodeployment +11:35:14.064 [main] INFO o.f.s.b.f.FormEngineAutoConfiguration - [discoverDeploymentResources,104] - No deployment resources were found for autodeployment +11:35:14.139 [main] INFO o.f.s.b.e.EventRegistryAutoConfiguration - [discoverDeploymentResources,104] - No deployment resources were found for autodeployment +11:35:14.207 [main] INFO o.f.s.b.a.AppEngineAutoConfiguration - [discoverDeploymentResources,104] - No deployment resources were found for autodeployment +11:35:14.242 [main] INFO o.f.a.s.SpringAppEngineConfiguration - [initConfigurators,1084] - Found 7 Engine Configurators in total: +11:35:14.244 [main] INFO o.f.a.s.SpringAppEngineConfiguration - [initConfigurators,1086] - class org.flowable.engine.spring.configurator.SpringProcessEngineConfigurator (priority:50000) +11:35:14.244 [main] INFO o.f.a.s.SpringAppEngineConfiguration - [initConfigurators,1086] - class org.flowable.eventregistry.spring.configurator.SpringEventRegistryConfigurator (priority:100000) +11:35:14.244 [main] INFO o.f.a.s.SpringAppEngineConfiguration - [initConfigurators,1086] - class org.flowable.idm.spring.configurator.SpringIdmEngineConfigurator (priority:150000) +11:35:14.244 [main] INFO o.f.a.s.SpringAppEngineConfiguration - [initConfigurators,1086] - class org.flowable.dmn.spring.configurator.SpringDmnEngineConfigurator (priority:200000) +11:35:14.244 [main] INFO o.f.a.s.SpringAppEngineConfiguration - [initConfigurators,1086] - class org.flowable.form.spring.configurator.SpringFormEngineConfigurator (priority:300000) +11:35:14.244 [main] INFO o.f.a.s.SpringAppEngineConfiguration - [initConfigurators,1086] - class org.flowable.content.spring.configurator.SpringContentEngineConfigurator (priority:400000) +11:35:14.245 [main] INFO o.f.a.s.SpringAppEngineConfiguration - [initConfigurators,1086] - class org.flowable.cmmn.spring.configurator.SpringCmmnEngineConfigurator (priority:500000) +11:35:14.245 [main] INFO o.f.a.s.SpringAppEngineConfiguration - [configuratorsBeforeInit,1112] - Executing beforeInit() of class org.flowable.engine.spring.configurator.SpringProcessEngineConfigurator (priority:50000) +11:35:14.249 [main] INFO o.f.a.s.SpringAppEngineConfiguration - [configuratorsBeforeInit,1112] - Executing beforeInit() of class org.flowable.eventregistry.spring.configurator.SpringEventRegistryConfigurator (priority:100000) +11:35:14.252 [main] INFO o.f.a.s.SpringAppEngineConfiguration - [configuratorsBeforeInit,1112] - Executing beforeInit() of class org.flowable.idm.spring.configurator.SpringIdmEngineConfigurator (priority:150000) +11:35:14.254 [main] INFO o.f.a.s.SpringAppEngineConfiguration - [configuratorsBeforeInit,1112] - Executing beforeInit() of class org.flowable.dmn.spring.configurator.SpringDmnEngineConfigurator (priority:200000) +11:35:14.256 [main] INFO o.f.a.s.SpringAppEngineConfiguration - [configuratorsBeforeInit,1112] - Executing beforeInit() of class org.flowable.form.spring.configurator.SpringFormEngineConfigurator (priority:300000) +11:35:14.258 [main] INFO o.f.a.s.SpringAppEngineConfiguration - [configuratorsBeforeInit,1112] - Executing beforeInit() of class org.flowable.content.spring.configurator.SpringContentEngineConfigurator (priority:400000) +11:35:14.260 [main] INFO o.f.a.s.SpringAppEngineConfiguration - [configuratorsBeforeInit,1112] - Executing beforeInit() of class org.flowable.cmmn.spring.configurator.SpringCmmnEngineConfigurator (priority:500000) +11:35:15.170 [main] INFO o.f.a.s.SpringAppEngineConfiguration - [configuratorsAfterInit,1119] - Executing configure() of class org.flowable.engine.spring.configurator.SpringProcessEngineConfigurator (priority:50000) +11:35:15.613 [main] INFO o.f.e.i.ProcessEngineImpl - [,89] - ProcessEngine default created +11:35:15.636 [main] INFO o.f.e.i.c.ValidateV5EntitiesCmd - [execute,43] - Total of v5 deployments found: 0 +11:35:15.647 [main] INFO o.f.a.s.SpringAppEngineConfiguration - [configuratorsAfterInit,1119] - Executing configure() of class org.flowable.eventregistry.spring.configurator.SpringEventRegistryConfigurator (priority:100000) +11:35:16.587 [main] INFO liquibase.changelog - [log,23] - Reading from hisdev.flw_ev_databasechangelog +11:35:16.634 [main] INFO o.f.e.i.EventRegistryEngineImpl - [,53] - EventRegistryEngine default created +11:35:16.635 [main] INFO o.f.a.s.SpringAppEngineConfiguration - [configuratorsAfterInit,1119] - Executing configure() of class org.flowable.idm.spring.configurator.SpringIdmEngineConfigurator (priority:150000) +11:35:16.663 [main] INFO o.f.i.e.i.IdmEngineImpl - [,52] - IdmEngine default created +11:35:16.664 [main] INFO o.f.a.s.SpringAppEngineConfiguration - [configuratorsAfterInit,1119] - Executing configure() of class org.flowable.dmn.spring.configurator.SpringDmnEngineConfigurator (priority:200000) +11:35:16.764 [main] INFO liquibase.changelog - [log,23] - Reading from hisdev.act_dmn_databasechangelog +11:35:16.793 [main] INFO o.f.d.e.i.DmnEngineImpl - [,55] - DmnEngine default created +11:35:16.794 [main] INFO o.f.a.s.SpringAppEngineConfiguration - [configuratorsAfterInit,1119] - Executing configure() of class org.flowable.form.spring.configurator.SpringFormEngineConfigurator (priority:300000) +11:35:16.885 [main] INFO liquibase.changelog - [log,23] - Reading from hisdev.act_fo_databasechangelog +11:35:16.896 [main] INFO o.f.f.e.i.FormEngineImpl - [,52] - FormEngine default created +11:35:16.897 [main] INFO o.f.a.s.SpringAppEngineConfiguration - [configuratorsAfterInit,1119] - Executing configure() of class org.flowable.content.spring.configurator.SpringContentEngineConfigurator (priority:400000) +11:35:16.901 [main] INFO o.f.c.s.SpringContentEngineConfiguration - [initContentStorage,196] - Content file system root : /root/content +11:35:16.969 [main] INFO liquibase.changelog - [log,23] - Reading from hisdev.act_co_databasechangelog +11:35:16.978 [main] INFO o.f.c.e.i.ContentEngineImpl - [,48] - ContentEngine default created +11:35:16.979 [main] INFO o.f.a.s.SpringAppEngineConfiguration - [configuratorsAfterInit,1119] - Executing configure() of class org.flowable.cmmn.spring.configurator.SpringCmmnEngineConfigurator (priority:500000) +11:35:17.165 [main] INFO liquibase.changelog - [log,23] - Reading from hisdev.act_cmmn_databasechangelog +11:35:17.191 [main] INFO o.f.c.e.i.CmmnEngineImpl - [,72] - CmmnEngine default created +11:35:17.254 [main] INFO liquibase.changelog - [log,23] - Reading from hisdev.act_app_databasechangelog +11:35:17.262 [main] INFO o.f.a.e.i.AppEngineImpl - [,48] - AppEngine default created +11:35:17.431 [main] INFO c.y.l.p.i.CmpAroundAspectBeanProcess - [postProcessAfterInitialization,33] - component[b] has been found +11:35:26.072 [main] INFO c.y.l.p.i.CmpAroundAspectBeanProcess - [postProcessAfterInitialization,33] - component[a] has been found +11:35:26.175 [main] INFO c.y.l.p.i.CmpAroundAspectBeanProcess - [postProcessAfterInitialization,33] - component[c] has been found +11:35:27.908 [main] WARN o.a.v.deprecation - [warnDeprecated,62] - configuration key 'classpath.resource.loader.class' has been deprecated in favor of 'resource.loader.classpath.class' +11:35:27.909 [main] WARN o.a.v.deprecation - [warnDeprecated,62] - configuration key 'resource.loader' has been deprecated in favor of 'resource.loaders' +11:35:35.163 [main] INFO o.q.i.StdSchedulerFactory - [instantiate,1220] - Using default implementation for ThreadExecutor +11:35:35.181 [main] INFO o.q.c.SchedulerSignalerImpl - [,61] - Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl +11:35:35.181 [main] INFO o.q.c.QuartzScheduler - [,229] - Quartz Scheduler v.2.3.2 created. +11:35:35.182 [main] INFO o.q.s.RAMJobStore - [initialize,155] - RAMJobStore initialized. +11:35:35.182 [main] INFO o.q.c.QuartzScheduler - [initialize,294] - Scheduler meta-data: Quartz Scheduler (v2.3.2) 'quartzScheduler' with instanceId 'NON_CLUSTERED' + Scheduler class: 'org.quartz.core.QuartzScheduler' - running locally. + NOT STARTED. + Currently in standby mode. + Number of jobs executed: 0 + Using thread pool 'org.quartz.simpl.SimpleThreadPool' - with 10 threads. + Using job-store 'org.quartz.simpl.RAMJobStore' - which does not support persistence. and is not clustered. + +11:35:35.183 [main] INFO o.q.i.StdSchedulerFactory - [instantiate,1374] - Quartz scheduler 'quartzScheduler' initialized from an externally provided properties instance. +11:35:35.183 [main] INFO o.q.i.StdSchedulerFactory - [instantiate,1378] - Quartz scheduler version: 2.3.2 +11:35:35.183 [main] INFO o.q.c.QuartzScheduler - [setJobFactory,2293] - JobFactory set to: org.springframework.scheduling.quartz.SpringBeanJobFactory@2fedae96 +11:35:35.207 [main] DEBUG c.b.m.e.p.i.TenantLineInnerInterceptor - [parserSingle,45] - original SQL: select job_id, + job_name, + job_group, + invoke_target, + cron_expression, + misfire_policy, + concurrent, + status, + create_by, + create_time, + remark + from sys_job +11:35:35.212 [main] DEBUG c.b.m.e.p.i.TenantLineInnerInterceptor - [processParser,85] - SQL to parse, SQL: select job_id, + job_name, + job_group, + invoke_target, + cron_expression, + misfire_policy, + concurrent, + status, + create_by, + create_time, + remark + from sys_job +11:35:35.213 [main] DEBUG c.b.m.e.p.i.TenantLineInnerInterceptor - [processParser,98] - parse the finished SQL: SELECT job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark FROM sys_job +11:35:39.574 [main] INFO c.y.l.p.f.FlowParserProvider - [info,193] - flow info loaded from local file,path=config/flow.el.xml +11:35:39.789 [main] INFO o.a.c.h.Http11NioProtocol - [log,173] - Starting ProtocolHandler ["http-nio-18082"] +11:35:40.681 [main] INFO o.q.c.QuartzScheduler - [start,547] - Scheduler quartzScheduler_$_NON_CLUSTERED started. +11:35:40.704 [main] INFO c.o.OpenHisApplication - [logStarted,61] - Started OpenHisApplication in 44.188 seconds (JVM running for 44.893) +11:35:40.712 [main] DEBUG c.b.m.a.DdlApplicationRunner - [run,44] - ... DDL start create ... +11:35:40.713 [main] DEBUG c.b.m.a.DdlApplicationRunner - [run,53] - ... DDL end create ... + +---------------------------------------------------------- + Application OpenHis is running! Access URLs: + Local: http://localhost:18082/openhis/ + External: http://127.0.1.1:18082/openhis/ +---------------------------------------------------------- +11:35:46.054 [http-nio-18082-exec-1] INFO o.a.c.c.C.[.[.[/openhis] - [log,173] - Initializing Spring DispatcherServlet 'dispatcherServlet' diff --git a/openhis-server-new/core-admin/pom.xml b/openhis-server-new/core-admin/pom.xml index fbd1d11fa..466e7e436 100755 --- a/openhis-server-new/core-admin/pom.xml +++ b/openhis-server-new/core-admin/pom.xml @@ -34,7 +34,7 @@ org.springdoc - springdoc-openapi-ui + springdoc-openapi-starter-webmvc-ui @@ -72,6 +72,12 @@ core-common compile + + + io.swagger.core.v3 + swagger-annotations-jakarta + 2.2.30 + \ No newline at end of file diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/CaptchaController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/CaptchaController.java index 390591495..3dc84cab5 100755 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/CaptchaController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/CaptchaController.java @@ -14,9 +14,9 @@ import org.springframework.util.FastByteArrayOutputStream; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.imageio.ImageIO; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.awt.image.BufferedImage; import java.io.IOException; import java.util.concurrent.TimeUnit; diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/CommonController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/CommonController.java index a6afbc9b8..0792450eb 100755 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/CommonController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/CommonController.java @@ -17,8 +17,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysLogininforController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysLogininforController.java index 3df917fa7..bdae1348f 100755 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysLogininforController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysLogininforController.java @@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysOperlogController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysOperlogController.java index 9cff4ec60..770d6646f 100755 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysOperlogController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysOperlogController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysConfigController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysConfigController.java index 378d4e1c6..33317039f 100755 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysConfigController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysConfigController.java @@ -13,7 +13,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDictDataController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDictDataController.java index def59ab96..f22873128 100755 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDictDataController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDictDataController.java @@ -15,7 +15,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDictTypeController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDictTypeController.java index e26b5f0c2..bd1f9a21d 100755 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDictTypeController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDictTypeController.java @@ -13,7 +13,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysPostController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysPostController.java index a2628c33d..99c3d755f 100755 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysPostController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysPostController.java @@ -13,7 +13,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysRoleController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysRoleController.java index 7138d6389..f80d9962a 100755 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysRoleController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysRoleController.java @@ -22,7 +22,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysUserController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysUserController.java index 87592da0c..e5e3ad08b 100755 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysUserController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysUserController.java @@ -22,7 +22,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; import java.util.stream.Collectors; diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/tool/TestController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/tool/TestController.java index 959ee1d7a..31056c269 100755 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/tool/TestController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/tool/TestController.java @@ -3,7 +3,11 @@ package com.core.web.controller.tool; import com.core.common.core.controller.BaseController; import com.core.common.core.domain.R; import com.core.common.utils.StringUtils; -import io.swagger.annotations.*; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -16,7 +20,7 @@ import java.util.Map; * * @author system */ -@Api("用户信息管理") +@Tag(name = "用户信息管理") @RestController @RequestMapping("/test/user") public class TestController extends BaseController { @@ -26,16 +30,15 @@ public class TestController extends BaseController { users.put(2, new UserEntity(2, "ry", "admin123", "15666666666")); } - @ApiOperation("获取用户列表") + @Operation(summary = "获取用户列表") @GetMapping("/list") public R> userList() { List userList = new ArrayList(users.values()); return R.ok(userList); } - @ApiOperation("获取用户详细") - @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", - dataTypeClass = Integer.class) + @Operation(summary = "获取用户详细") + @Parameter(name = "userId", description = "用户ID") @GetMapping("/{userId}") public R getUser(@PathVariable Integer userId) { if (!users.isEmpty() && users.containsKey(userId)) { @@ -45,12 +48,12 @@ public class TestController extends BaseController { } } - @ApiOperation("新增用户") - @ApiImplicitParams({ - @ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer", dataTypeClass = Integer.class), - @ApiImplicitParam(name = "username", value = "用户名称", dataType = "String", dataTypeClass = String.class), - @ApiImplicitParam(name = "password", value = "用户密码", dataType = "String", dataTypeClass = String.class), - @ApiImplicitParam(name = "mobile", value = "用户手机", dataType = "String", dataTypeClass = String.class)}) + @Operation(summary = "新增用户") + @Parameters({ + @Parameter(name = "userId", description = "用户id"), + @Parameter(name = "username", description = "用户名称"), + @Parameter(name = "password", description = "用户密码"), + @Parameter(name = "mobile", description = "用户手机")}) @PostMapping("/save") public R save(UserEntity user) { if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId())) { @@ -60,7 +63,7 @@ public class TestController extends BaseController { return R.ok(); } - @ApiOperation("更新用户") + @Operation(summary = "更新用户") @PutMapping("/update") public R update(@RequestBody UserEntity user) { if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId())) { @@ -74,9 +77,8 @@ public class TestController extends BaseController { return R.ok(); } - @ApiOperation("删除用户信息") - @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", - dataTypeClass = Integer.class) + @Operation(summary = "删除用户信息") + @Parameter(name = "userId", description = "用户ID") @DeleteMapping("/{userId}") public R delete(@PathVariable Integer userId) { if (!users.isEmpty() && users.containsKey(userId)) { @@ -88,18 +90,18 @@ public class TestController extends BaseController { } } -@ApiModel(value = "UserEntity", description = "用户实体") +@Schema(description = "用户实体") class UserEntity { - @ApiModelProperty("用户ID") + @Schema(description = "用户ID") private Integer userId; - @ApiModelProperty("用户名称") + @Schema(description = "用户名称") private String username; - @ApiModelProperty("用户密码") + @Schema(description = "用户密码") private String password; - @ApiModelProperty("用户手机") + @Schema(description = "用户手机") private String mobile; public UserEntity() { diff --git a/openhis-server-new/core-common/pom.xml b/openhis-server-new/core-common/pom.xml index a74a717eb..baf4d8166 100755 --- a/openhis-server-new/core-common/pom.xml +++ b/openhis-server-new/core-common/pom.xml @@ -48,7 +48,17 @@ com.baomidou - mybatis-plus-boot-starter + mybatis-plus-spring-boot3-starter + + + com.baomidou + mybatis-plus-boot-starter + + + org.jetbrains.kotlin + kotlin-reflect + + @@ -83,8 +93,8 @@ - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api @@ -137,8 +147,8 @@ - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api @@ -161,8 +171,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDept.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDept.java index 13967749c..a6bd5b7a0 100755 --- a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDept.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDept.java @@ -4,10 +4,10 @@ import com.core.common.core.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.util.ArrayList; import java.util.List; diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDictData.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDictData.java index 286a92632..79eaa3625 100755 --- a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDictData.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDictData.java @@ -7,8 +7,8 @@ import com.core.common.core.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; /** * 字典数据表 sys_dict_data diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDictType.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDictType.java index 1e5c5878c..70ba11abb 100755 --- a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDictType.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDictType.java @@ -6,9 +6,9 @@ import com.core.common.core.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; /** * 字典类型表 sys_dict_type diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysMenu.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysMenu.java index 1cc555941..3dc0b00d6 100755 --- a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysMenu.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysMenu.java @@ -4,9 +4,9 @@ import com.core.common.core.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.util.ArrayList; import java.util.List; diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysRole.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysRole.java index e50c62b85..42eb9c8f2 100755 --- a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysRole.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysRole.java @@ -6,9 +6,9 @@ import com.core.common.core.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.util.Set; /** diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysUser.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysUser.java index b168386d1..8bf54358d 100755 --- a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysUser.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysUser.java @@ -15,9 +15,9 @@ import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/filter/RepeatableFilter.java b/openhis-server-new/core-common/src/main/java/com/core/common/filter/RepeatableFilter.java index 2986b5c92..9ac60ee14 100755 --- a/openhis-server-new/core-common/src/main/java/com/core/common/filter/RepeatableFilter.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/filter/RepeatableFilter.java @@ -3,8 +3,8 @@ package com.core.common.filter; import com.core.common.utils.StringUtils; import org.springframework.http.MediaType; -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.*; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; /** diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/filter/RepeatedlyRequestWrapper.java b/openhis-server-new/core-common/src/main/java/com/core/common/filter/RepeatedlyRequestWrapper.java index 5f08270a2..46ecbfdca 100755 --- a/openhis-server-new/core-common/src/main/java/com/core/common/filter/RepeatedlyRequestWrapper.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/filter/RepeatedlyRequestWrapper.java @@ -3,11 +3,11 @@ package com.core.common.filter; import com.core.common.constant.Constants; import com.core.common.utils.http.HttpHelper; -import javax.servlet.ReadListener; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.ReadListener; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/filter/XssFilter.java b/openhis-server-new/core-common/src/main/java/com/core/common/filter/XssFilter.java index 36aac9c4e..22e589dca 100755 --- a/openhis-server-new/core-common/src/main/java/com/core/common/filter/XssFilter.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/filter/XssFilter.java @@ -3,9 +3,9 @@ package com.core.common.filter; import com.core.common.enums.HttpMethod; import com.core.common.utils.StringUtils; -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.*; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/filter/XssHttpServletRequestWrapper.java b/openhis-server-new/core-common/src/main/java/com/core/common/filter/XssHttpServletRequestWrapper.java index 3afb53a05..363fb84ca 100755 --- a/openhis-server-new/core-common/src/main/java/com/core/common/filter/XssHttpServletRequestWrapper.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/filter/XssHttpServletRequestWrapper.java @@ -6,10 +6,10 @@ import org.apache.commons.io.IOUtils; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; -import javax.servlet.ReadListener; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.ReadListener; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/NewExcelUtil.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/NewExcelUtil.java index ba57a5614..c914a0134 100755 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/NewExcelUtil.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/NewExcelUtil.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.RegExUtils; diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/ServletUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/ServletUtils.java index 40bfbed46..3e17693f2 100755 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/ServletUtils.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/ServletUtils.java @@ -8,10 +8,10 @@ import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/SpringContextUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/SpringContextUtils.java index acfa683e5..716547c27 100755 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/SpringContextUtils.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/SpringContextUtils.java @@ -8,8 +8,8 @@ import org.springframework.stereotype.Component; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @Component public class SpringContextUtils implements ApplicationContextAware { diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/bean/BeanValidators.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/bean/BeanValidators.java index 48d44f8dc..8838fb52b 100755 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/bean/BeanValidators.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/bean/BeanValidators.java @@ -1,8 +1,8 @@ package com.core.common.utils.bean; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.Validator; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.Validator; import java.util.Set; /** diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/file/FileUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/file/FileUtils.java index 38ffcccaa..0f7c5f80d 100755 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/file/FileUtils.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/file/FileUtils.java @@ -8,8 +8,8 @@ import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ArrayUtils; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.*; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/http/HttpHelper.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/http/HttpHelper.java index 2508c8a3e..fb742ea9b 100755 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/http/HttpHelper.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/http/HttpHelper.java @@ -4,7 +4,7 @@ import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.ServletRequest; +import jakarta.servlet.ServletRequest; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/ip/IpUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/ip/IpUtils.java index 40c04eb9b..6906a4687 100755 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/ip/IpUtils.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/ip/IpUtils.java @@ -3,7 +3,7 @@ package com.core.common.utils.ip; import com.core.common.utils.ServletUtils; import com.core.common.utils.StringUtils; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/poi/ExcelUtil.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/poi/ExcelUtil.java index 37d11183b..fe6040bbf 100755 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/poi/ExcelUtil.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/poi/ExcelUtil.java @@ -30,7 +30,7 @@ import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.*; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/xss/Xss.java b/openhis-server-new/core-common/src/main/java/com/core/common/xss/Xss.java index 1fb646b84..c91b5c83b 100755 --- a/openhis-server-new/core-common/src/main/java/com/core/common/xss/Xss.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/xss/Xss.java @@ -1,7 +1,7 @@ package com.core.common.xss; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/xss/XssValidator.java b/openhis-server-new/core-common/src/main/java/com/core/common/xss/XssValidator.java index 759e95b04..a3ca3a3ff 100755 --- a/openhis-server-new/core-common/src/main/java/com/core/common/xss/XssValidator.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/xss/XssValidator.java @@ -2,8 +2,8 @@ package com.core.common.xss; import com.core.common.utils.StringUtils; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/openhis-server-new/core-flowable/pom.xml b/openhis-server-new/core-flowable/pom.xml index 2c0477695..ee48a2b6a 100755 --- a/openhis-server-new/core-flowable/pom.xml +++ b/openhis-server-new/core-flowable/pom.xml @@ -49,11 +49,7 @@ lombok true - - io.swagger - swagger-annotations - compile - + org.flowable flowable-spring-boot-starter @@ -67,7 +63,17 @@ com.baomidou - mybatis-plus-boot-starter + mybatis-plus-spring-boot3-starter + + + com.baomidou + mybatis-plus-boot-starter + + + org.jetbrains.kotlin + kotlin-reflect + + @@ -83,6 +89,12 @@ 5.3.3 + + + io.swagger.core.v3 + swagger-annotations-jakarta + 2.2.30 + diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/common/expand/el/FlowEl.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/common/expand/el/FlowEl.java index e40066829..a133ab6bb 100755 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/common/expand/el/FlowEl.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/common/expand/el/FlowEl.java @@ -4,7 +4,7 @@ import com.core.system.service.ISysDeptService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * 扩展表达式 diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowDefinitionController.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowDefinitionController.java index 4e6ecb1ad..d8386cf01 100755 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowDefinitionController.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowDefinitionController.java @@ -13,17 +13,18 @@ import com.core.system.domain.SysExpression; import com.core.system.service.ISysExpressionService; import com.core.system.service.ISysRoleService; import com.core.system.service.ISysUserService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.Parameter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.imageio.ImageIO; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -42,7 +43,7 @@ import java.util.Map; * @date 2021-04-03 */ @Slf4j -@Api(tags = "流程定义") +@Tag(name = "流程定义") @RestController @RequestMapping("/flowable/definition") public class FlowDefinitionController extends BaseController { @@ -59,14 +60,14 @@ public class FlowDefinitionController extends BaseController { private ISysExpressionService sysExpressionService; @GetMapping(value = "/list") - @ApiOperation(value = "流程定义列表", response = FlowProcDefDto.class) - public AjaxResult list(@ApiParam(value = "当前页码", required = true) @RequestParam Integer pageNum, - @ApiParam(value = "每页条数", required = true) @RequestParam Integer pageSize, - @ApiParam(value = "流程名称", required = false) @RequestParam(required = false) String name) { + @Operation(summary = "流程定义列表") + public AjaxResult list(@Parameter(description = "当前页码", required = true) @RequestParam Integer pageNum, + @Parameter(description = "每页条数", required = true) @RequestParam Integer pageSize, + @Parameter(description = "流程名称", required = false) @RequestParam(required = false) String name) { return AjaxResult.success(flowDefinitionService.list(name, pageNum, pageSize)); } - @ApiOperation(value = "导入流程文件", notes = "上传bpmn20的xml文件") + @Operation(summary = "导入流程文件") @PostMapping("/import") public AjaxResult importFile(@RequestParam(required = false) String name, @RequestParam(required = false) String category, MultipartFile file) { @@ -90,9 +91,9 @@ public class FlowDefinitionController extends BaseController { return AjaxResult.success("导入成功"); } - @ApiOperation(value = "读取xml文件") + @Operation(summary = "读取xml文件") @GetMapping("/readXml/{deployId}") - public AjaxResult readXml(@ApiParam(value = "流程定义id") @PathVariable(value = "deployId") String deployId) { + public AjaxResult readXml(@Parameter(description = "流程定义id") @PathVariable(value = "deployId") String deployId) { try { return flowDefinitionService.readXml(deployId); } catch (Exception e) { @@ -101,9 +102,9 @@ public class FlowDefinitionController extends BaseController { } - @ApiOperation(value = "读取图片文件") + @Operation(summary = "读取图片文件") @GetMapping("/readImage/{deployId}") - public void readImage(@ApiParam(value = "流程定义id") @PathVariable(value = "deployId") String deployId, + public void readImage(@Parameter(description = "流程定义id") @PathVariable(value = "deployId") String deployId, HttpServletResponse response) { OutputStream os = null; BufferedImage image = null; @@ -129,7 +130,7 @@ public class FlowDefinitionController extends BaseController { } - @ApiOperation(value = "保存流程设计器内的xml文件") + @Operation(summary = "保存流程设计器内的xml文件") @Log(title = "流程定义", businessType = BusinessType.INSERT) @PostMapping("/save") public AjaxResult save(@RequestBody FlowSaveXmlVo vo) { @@ -153,24 +154,24 @@ public class FlowDefinitionController extends BaseController { return AjaxResult.success("导入成功"); } - @ApiOperation(value = "发起流程") + @Operation(summary = "发起流程") @Log(title = "发起流程", businessType = BusinessType.INSERT) @PostMapping("/start/{procDefId}") - public AjaxResult start(@ApiParam(value = "流程定义id") @PathVariable(value = "procDefId") String procDefId, - @ApiParam(value = "变量集合,json对象") @RequestBody Map variables) { + public AjaxResult start(@Parameter(description = "流程定义id") @PathVariable(value = "procDefId") String procDefId, + @Parameter(description = "变量集合,json对象") @RequestBody Map variables) { return flowDefinitionService.startProcessInstanceById(procDefId, variables); } - @ApiOperation(value = "激活或挂起流程定义") + @Operation(summary = "激活或挂起流程定义") @Log(title = "激活/挂起流程", businessType = BusinessType.UPDATE) @PutMapping(value = "/updateState") - public AjaxResult updateState(@ApiParam(value = "1:激活,2:挂起", required = true) @RequestParam Integer state, - @ApiParam(value = "流程部署ID", required = true) @RequestParam String deployId) { + public AjaxResult updateState(@Parameter(description = "1:激活,2:挂起", required = true) @RequestParam Integer state, + @Parameter(description = "流程部署ID", required = true) @RequestParam String deployId) { flowDefinitionService.updateState(state, deployId); return AjaxResult.success(); } - @ApiOperation(value = "删除流程") + @Operation(summary = "删除流程") @Log(title = "删除流程", businessType = BusinessType.DELETE) @DeleteMapping(value = "/{deployIds}") public AjaxResult delete(@PathVariable String[] deployIds) { @@ -180,21 +181,21 @@ public class FlowDefinitionController extends BaseController { return AjaxResult.success(); } - @ApiOperation(value = "指定流程办理人员列表") + @Operation(summary = "指定流程办理人员列表") @GetMapping("/userList") public AjaxResult userList(SysUser user) { List list = userService.selectUserList(user); return AjaxResult.success(list); } - @ApiOperation(value = "指定流程办理组列表") + @Operation(summary = "指定流程办理组列表") @GetMapping("/roleList") public AjaxResult roleList(SysRole role) { List list = sysRoleService.selectRoleList(role); return AjaxResult.success(list); } - @ApiOperation(value = "指定流程达式列表") + @Operation(summary = "指定流程达式列表") @GetMapping("/expList") public AjaxResult expList(SysExpression sysExpression) { List list = sysExpressionService.selectSysExpressionList(sysExpression); diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowInstanceController.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowInstanceController.java index a5bd0a7b8..3b49c35bf 100755 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowInstanceController.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowInstanceController.java @@ -6,9 +6,10 @@ import com.core.common.core.domain.AjaxResult; import com.core.common.enums.BusinessType; import com.core.flowable.domain.vo.FlowTaskVo; import com.core.flowable.service.IFlowInstanceService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.Parameter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -24,7 +25,7 @@ import java.util.Map; * @date 2021-04-03 */ @Slf4j -@Api(tags = "工作流流程实例管理") +@Tag(name = "工作流流程实例管理") @RestController @RequestMapping("/flowable/instance") public class FlowInstanceController extends BaseController { @@ -32,34 +33,34 @@ public class FlowInstanceController extends BaseController { @Autowired private IFlowInstanceService flowInstanceService; - @ApiOperation(value = "根据流程定义id启动流程实例") + @Operation(summary = "根据流程定义id启动流程实例") @PostMapping("/startBy/{procDefId}") - public AjaxResult startById(@ApiParam(value = "流程定义id") @PathVariable(value = "procDefId") String procDefId, - @ApiParam(value = "变量集合,json对象") @RequestBody Map variables) { + public AjaxResult startById(@Parameter(description = "流程定义id") @PathVariable(value = "procDefId") String procDefId, + @Parameter(description = "变量集合,json对象") @RequestBody Map variables) { return flowInstanceService.startProcessInstanceById(procDefId, variables); } - @ApiOperation(value = "激活或挂起流程实例") + @Operation(summary = "激活或挂起流程实例") @PostMapping(value = "/updateState") - public AjaxResult updateState(@ApiParam(value = "1:激活,2:挂起", required = true) @RequestParam Integer state, - @ApiParam(value = "流程实例ID", required = true) @RequestParam String instanceId) { + public AjaxResult updateState(@Parameter(description = "1:激活,2:挂起", required = true) @RequestParam Integer state, + @Parameter(description = "流程实例ID", required = true) @RequestParam String instanceId) { flowInstanceService.updateState(state, instanceId); return AjaxResult.success(); } - @ApiOperation("结束流程实例") + @Operation(summary = "结束流程实例") @PostMapping(value = "/stopProcessInstance") public AjaxResult stopProcessInstance(@RequestBody FlowTaskVo flowTaskVo) { flowInstanceService.stopProcessInstance(flowTaskVo); return AjaxResult.success(); } - @ApiOperation(value = "删除流程实例") + @Operation(summary = "删除流程实例") @Log(title = "删除任务", businessType = BusinessType.DELETE) @DeleteMapping(value = "/delete/{instanceIds}") - public AjaxResult delete(@ApiParam(value = "流程实例ID", required = true) @PathVariable String[] instanceIds, - @ApiParam(value = "删除原因") @RequestParam(required = false) String deleteReason) { + public AjaxResult delete(@Parameter(description = "流程实例ID", required = true) @PathVariable String[] instanceIds, + @Parameter(description = "删除原因") @RequestParam(required = false) String deleteReason) { for (String instanceId : instanceIds) { flowInstanceService.delete(instanceId, deleteReason); } diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowTaskController.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowTaskController.java index f6f4cdcae..bedb27ff5 100755 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowTaskController.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowTaskController.java @@ -8,15 +8,16 @@ import com.core.flowable.domain.dto.FlowTaskDto; import com.core.flowable.domain.vo.FlowQueryVo; import com.core.flowable.domain.vo.FlowTaskVo; import com.core.flowable.service.IFlowTaskService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.Parameter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.imageio.ImageIO; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.awt.image.BufferedImage; import java.io.IOException; import java.io.InputStream; @@ -31,7 +32,7 @@ import java.io.OutputStream; * @date 2021-04-03 */ @Slf4j -@Api(tags = "工作流流程任务管理") +@Tag(name = "工作流流程任务管理") @RestController @RequestMapping("/flowable/task") public class FlowTaskController extends BaseController { @@ -39,70 +40,70 @@ public class FlowTaskController extends BaseController { @Autowired private IFlowTaskService flowTaskService; - @ApiOperation(value = "我发起的流程", response = FlowTaskDto.class) + @Operation(summary = "我发起的流程") @GetMapping(value = "/myProcess") public AjaxResult myProcess(FlowQueryVo queryVo) { return flowTaskService.myProcess(queryVo); } - @ApiOperation(value = "取消申请", response = FlowTaskDto.class) + @Operation(summary = "取消申请") @Log(title = "取消申请", businessType = BusinessType.UPDATE) @PostMapping(value = "/stopProcess") public AjaxResult stopProcess(@RequestBody FlowTaskVo flowTaskVo) { return flowTaskService.stopProcess(flowTaskVo); } - @ApiOperation(value = "撤回流程", response = FlowTaskDto.class) + @Operation(summary = "撤回流程") @Log(title = "撤回流程", businessType = BusinessType.UPDATE) @PostMapping(value = "/revokeProcess") public AjaxResult revokeProcess(@RequestBody FlowTaskVo flowTaskVo) { return flowTaskService.revokeProcess(flowTaskVo); } - @ApiOperation(value = "获取待办列表", response = FlowTaskDto.class) + @Operation(summary = "获取待办列表") @GetMapping(value = "/todoList") public AjaxResult todoList(FlowQueryVo queryVo) { return flowTaskService.todoList(queryVo); } - @ApiOperation(value = "获取已办任务", response = FlowTaskDto.class) + @Operation(summary = "获取已办任务") @GetMapping(value = "/finishedList") public AjaxResult finishedList(FlowQueryVo queryVo) { return flowTaskService.finishedList(queryVo); } - @ApiOperation(value = "流程历史流转记录", response = FlowTaskDto.class) + @Operation(summary = "流程历史流转记录") @GetMapping(value = "/flowRecord") public AjaxResult flowRecord(String procInsId, String deployId) { return flowTaskService.flowRecord(procInsId, deployId); } - @ApiOperation(value = "根据任务ID查询挂载的表单信息") + @Operation(summary = "根据任务ID查询挂载的表单信息") @GetMapping(value = "/getTaskForm") public AjaxResult getTaskForm(String taskId) { return flowTaskService.getTaskForm(taskId); } - @ApiOperation(value = "流程初始化表单", response = FlowTaskDto.class) + @Operation(summary = "流程初始化表单") @GetMapping(value = "/flowFormData") public AjaxResult flowFormData(String deployId) { return flowTaskService.flowFormData(deployId); } - @ApiOperation(value = "获取流程变量", response = FlowTaskDto.class) + @Operation(summary = "获取流程变量") @GetMapping(value = "/processVariables/{taskId}") - public AjaxResult processVariables(@ApiParam(value = "流程任务Id") @PathVariable(value = "taskId") String taskId) { + public AjaxResult processVariables(@Parameter(description = "流程任务Id") @PathVariable(value = "taskId") String taskId) { return flowTaskService.processVariables(taskId); } - @ApiOperation(value = "审批任务") + @Operation(summary = "审批任务") @Log(title = "审批任务", businessType = BusinessType.UPDATE) @PostMapping(value = "/complete") public AjaxResult complete(@RequestBody FlowTaskVo flowTaskVo) { return flowTaskService.complete(flowTaskVo); } - @ApiOperation(value = "驳回任务") + @Operation(summary = "驳回任务") @Log(title = "驳回任务", businessType = BusinessType.UPDATE) @PostMapping(value = "/reject") public AjaxResult taskReject(@RequestBody FlowTaskVo flowTaskVo) { @@ -110,7 +111,7 @@ public class FlowTaskController extends BaseController { return AjaxResult.success(); } - @ApiOperation(value = "退回任务") + @Operation(summary = "退回任务") @Log(title = "退回任务", businessType = BusinessType.UPDATE) @PostMapping(value = "/return") public AjaxResult taskReturn(@RequestBody FlowTaskVo flowTaskVo) { @@ -118,13 +119,13 @@ public class FlowTaskController extends BaseController { return AjaxResult.success(); } - @ApiOperation(value = "获取所有可回退的节点") + @Operation(summary = "获取所有可回退的节点") @PostMapping(value = "/returnList") public AjaxResult findReturnTaskList(@RequestBody FlowTaskVo flowTaskVo) { return flowTaskService.findReturnTaskList(flowTaskVo); } - @ApiOperation(value = "删除任务") + @Operation(summary = "删除任务") @Log(title = "删除任务", businessType = BusinessType.DELETE) @DeleteMapping(value = "/delete") public AjaxResult delete(@RequestBody FlowTaskVo flowTaskVo) { @@ -132,35 +133,35 @@ public class FlowTaskController extends BaseController { return AjaxResult.success(); } - @ApiOperation(value = "认领/签收任务") + @Operation(summary = "认领/签收任务") @PostMapping(value = "/claim") public AjaxResult claim(@RequestBody FlowTaskVo flowTaskVo) { flowTaskService.claim(flowTaskVo); return AjaxResult.success(); } - @ApiOperation(value = "取消认领/签收任务") + @Operation(summary = "取消认领/签收任务") @PostMapping(value = "/unClaim") public AjaxResult unClaim(@RequestBody FlowTaskVo flowTaskVo) { flowTaskService.unClaim(flowTaskVo); return AjaxResult.success(); } - @ApiOperation(value = "委派任务") + @Operation(summary = "委派任务") @PostMapping(value = "/delegateTask") public AjaxResult delegate(@RequestBody FlowTaskVo flowTaskVo) { flowTaskService.delegateTask(flowTaskVo); return AjaxResult.success(); } - @ApiOperation(value = "任务归还") + @Operation(summary = "任务归还") @PostMapping(value = "/resolveTask") public AjaxResult resolveTask(@RequestBody FlowTaskVo flowTaskVo) { flowTaskService.resolveTask(flowTaskVo); return AjaxResult.success(); } - @ApiOperation(value = "转办任务") + @Operation(summary = "转办任务") @PostMapping(value = "/assignTask") public AjaxResult assign(@RequestBody FlowTaskVo flowTaskVo) { flowTaskService.assignTask(flowTaskVo); @@ -168,26 +169,26 @@ public class FlowTaskController extends BaseController { } @PostMapping(value = "/addMultiInstanceExecution") - @ApiOperation(value = "多实例加签") + @Operation(summary = "多实例加签") public AjaxResult addMultiInstanceExecution(@RequestBody FlowTaskVo flowTaskVo) { flowTaskService.addMultiInstanceExecution(flowTaskVo); return AjaxResult.success("加签成功"); } @PostMapping(value = "/deleteMultiInstanceExecution") - @ApiOperation(value = "多实例减签") + @Operation(summary = "多实例减签") public AjaxResult deleteMultiInstanceExecution(@RequestBody FlowTaskVo flowTaskVo) { flowTaskService.deleteMultiInstanceExecution(flowTaskVo); return AjaxResult.success("减签成功"); } - @ApiOperation(value = "获取下一节点") + @Operation(summary = "获取下一节点") @PostMapping(value = "/nextFlowNode") public AjaxResult getNextFlowNode(@RequestBody FlowTaskVo flowTaskVo) { return flowTaskService.getNextFlowNode(flowTaskVo); } - @ApiOperation(value = "流程发起时获取下一节点") + @Operation(summary = "流程发起时获取下一节点") @PostMapping(value = "/nextFlowNodeByStart") public AjaxResult getNextFlowNodeByStart(@RequestBody FlowTaskVo flowTaskVo) { return flowTaskService.getNextFlowNodeByStart(flowTaskVo); diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysExpressionController.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysExpressionController.java index cbb493798..5cd39a538 100755 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysExpressionController.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysExpressionController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysListenerController.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysListenerController.java index 435307ee6..22a1d41a2 100755 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysListenerController.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysListenerController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowTaskDto.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowTaskDto.java index cb25f878a..6cca231aa 100755 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowTaskDto.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowTaskDto.java @@ -1,8 +1,7 @@ package com.core.flowable.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; @@ -19,85 +18,85 @@ import java.util.Date; */ @Getter @Setter -@ApiModel("工作流任务相关-返回参数") +@Schema(description = "工作流任务相关-返回参数") public class FlowTaskDto implements Serializable { - @ApiModelProperty("任务编号") + @Schema(description = "任务编号") private String taskId; - @ApiModelProperty("任务执行编号") + @Schema(description = "任务执行编号") private String executionId; - @ApiModelProperty("任务名称") + @Schema(description = "任务名称") private String taskName; - @ApiModelProperty("任务Key") + @Schema(description = "任务Key") private String taskDefKey; - @ApiModelProperty("任务执行人Id") + @Schema(description = "任务执行人Id") private Long assigneeId; - @ApiModelProperty("部门名称") + @Schema(description = "部门名称") private String deptName; - @ApiModelProperty("流程发起人部门名称") + @Schema(description = "流程发起人部门名称") private String startDeptName; - @ApiModelProperty("任务执行人名称") + @Schema(description = "任务执行人名称") private String assigneeName; - @ApiModelProperty("任务执行人部门") + @Schema(description = "任务执行人部门") private String assigneeDeptName;; - @ApiModelProperty("流程发起人Id") + @Schema(description = "流程发起人Id") private String startUserId; - @ApiModelProperty("流程发起人名称") + @Schema(description = "流程发起人名称") private String startUserName; - @ApiModelProperty("流程类型") + @Schema(description = "流程类型") private String category; - @ApiModelProperty("流程变量信息") + @Schema(description = "流程变量信息") private Object variables; - @ApiModelProperty("局部变量信息") + @Schema(description = "局部变量信息") private Object taskLocalVars; - @ApiModelProperty("流程部署编号") + @Schema(description = "流程部署编号") private String deployId; - @ApiModelProperty("流程ID") + @Schema(description = "流程ID") private String procDefId; - @ApiModelProperty("流程key") + @Schema(description = "流程key") private String procDefKey; - @ApiModelProperty("流程定义名称") + @Schema(description = "流程定义名称") private String procDefName; - @ApiModelProperty("流程定义内置使用版本") + @Schema(description = "流程定义内置使用版本") private int procDefVersion; - @ApiModelProperty("流程实例ID") + @Schema(description = "流程实例ID") private String procInsId; - @ApiModelProperty("历史流程实例ID") + @Schema(description = "历史流程实例ID") private String hisProcInsId; - @ApiModelProperty("任务耗时") + @Schema(description = "任务耗时") private String duration; - @ApiModelProperty("任务意见") + @Schema(description = "任务意见") private FlowCommentDto comment; - @ApiModelProperty("候选执行人") + @Schema(description = "候选执行人") private String candidate; - @ApiModelProperty("任务创建时间") + @Schema(description = "任务创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; - @ApiModelProperty("任务完成时间") + @Schema(description = "任务完成时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date finishTime; diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/FlowQueryVo.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/FlowQueryVo.java index 384649b70..41d9012bc 100755 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/FlowQueryVo.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/FlowQueryVo.java @@ -1,7 +1,6 @@ package com.core.flowable.domain.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** @@ -13,22 +12,22 @@ import lombok.Data; * @date 2021-04-03 */ @Data -@ApiModel("工作流任务相关--请求参数") +@Schema(description = "工作流任务相关--请求参数") public class FlowQueryVo { - @ApiModelProperty("流程名称") + @Schema(description = "流程名称") private String name; - @ApiModelProperty("开始时间") + @Schema(description = "开始时间") private String startTime; - @ApiModelProperty("结束时间") + @Schema(description = "结束时间") private String endTime; - @ApiModelProperty("当前页码") + @Schema(description = "当前页码") private Integer pageNum; - @ApiModelProperty("每页条数") + @Schema(description = "每页条数") private Integer pageSize; } diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/FlowTaskVo.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/FlowTaskVo.java index fb9a52956..ce329dd5a 100755 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/FlowTaskVo.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/FlowTaskVo.java @@ -1,7 +1,6 @@ package com.core.flowable.domain.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @@ -16,44 +15,44 @@ import java.util.Map; * @date 2021-04-03 */ @Data -@ApiModel("工作流任务相关--请求参数") +@Schema(description = "工作流任务相关--请求参数") public class FlowTaskVo { - @ApiModelProperty("任务Id") + @Schema(description = "任务Id") private String taskId; - @ApiModelProperty("用户Id") + @Schema(description = "用户Id") private String userId; - @ApiModelProperty("任务意见") + @Schema(description = "任务意见") private String comment; - @ApiModelProperty("流程实例Id") + @Schema(description = "流程实例Id") private String instanceId; - @ApiModelProperty("节点") + @Schema(description = "节点") private String targetKey; private String deploymentId; - @ApiModelProperty("流程环节定义ID") + @Schema(description = "流程环节定义ID") private String defId; - @ApiModelProperty("子执行流ID") + @Schema(description = "子执行流ID") private String currentChildExecutionId; - @ApiModelProperty("子执行流是否已执行") + @Schema(description = "子执行流是否已执行") private Boolean flag; - @ApiModelProperty("流程变量信息") + @Schema(description = "流程变量信息") private Map variables; - @ApiModelProperty("审批人") + @Schema(description = "审批人") private String assignee; - @ApiModelProperty("候选人") + @Schema(description = "候选人") private List candidateUsers; - @ApiModelProperty("审批组") + @Schema(description = "审批组") private List candidateGroups; private String requestIdStr; diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/ReturnTaskNodeVo.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/ReturnTaskNodeVo.java index 8e61b8796..ca7fa4c8d 100755 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/ReturnTaskNodeVo.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/ReturnTaskNodeVo.java @@ -1,7 +1,6 @@ package com.core.flowable.domain.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** @@ -13,13 +12,13 @@ import lombok.Data; * @date 2022-04-23 11:01:52 */ @Data -@ApiModel("可退回节点") +@Schema(description = "可退回节点") public class ReturnTaskNodeVo { - @ApiModelProperty("任务Id") + @Schema(description = "任务Id") private String id; - @ApiModelProperty("用户Id") + @Schema(description = "用户Id") private String name; } diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/factory/FlowServiceFactory.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/factory/FlowServiceFactory.java index 19d4cbf9d..e1ca6847c 100755 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/factory/FlowServiceFactory.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/factory/FlowServiceFactory.java @@ -5,7 +5,7 @@ import org.flowable.engine.*; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * flowable 引擎注入封装 diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramCanvas.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramCanvas.java index 085e5fb30..31031bde1 100755 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramCanvas.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramCanvas.java @@ -158,8 +158,9 @@ public class CustomProcessDiagramCanvas extends DefaultProcessDiagramCanvas { ImageIO.read(ReflectUtil.getResource("org/flowable/icons/dmnTask.png", this.customClassLoader)); CAMEL_TASK_IMAGE = ImageIO.read(ReflectUtil.getResource("org/flowable/icons/camelTask.png", this.customClassLoader)); - MULE_TASK_IMAGE = - ImageIO.read(ReflectUtil.getResource("org/flowable/icons/muleTask.png", this.customClassLoader)); + // MULE_TASK_IMAGE removed in Flowable 7.x + // MULE_TASK_IMAGE = + // ImageIO.read(ReflectUtil.getResource("org/flowable/icons/muleTask.png", this.customClassLoader)); HTTP_TASK_IMAGE = ImageIO.read(ReflectUtil.getResource("org/flowable/icons/httpTask.png", this.customClassLoader)); TIMER_IMAGE = ImageIO.read(ReflectUtil.getResource("org/flowable/icons/timer.png", this.customClassLoader)); diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowDefinitionServiceImpl.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowDefinitionServiceImpl.java index 5ca73c9b2..bb85b028f 100755 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowDefinitionServiceImpl.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowDefinitionServiceImpl.java @@ -28,7 +28,7 @@ import org.flowable.image.impl.DefaultProcessDiagramGenerator; import org.flowable.task.api.Task; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowTaskServiceImpl.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowTaskServiceImpl.java index 3dce91c06..4aee48286 100755 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowTaskServiceImpl.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowTaskServiceImpl.java @@ -55,7 +55,7 @@ import org.flowable.task.api.history.HistoricTaskInstanceQuery; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.InputStream; import java.lang.reflect.Field; import java.nio.charset.StandardCharsets; diff --git a/openhis-server-new/core-framework/pom.xml b/openhis-server-new/core-framework/pom.xml index 5edf7728f..cd63ca7be 100755 --- a/openhis-server-new/core-framework/pom.xml +++ b/openhis-server-new/core-framework/pom.xml @@ -34,7 +34,7 @@ com.alibaba - druid-spring-boot-starter + druid-spring-boot-3-starter @@ -44,7 +44,7 @@ servlet-api - javax.servlet + jakarta.servlet @@ -75,7 +75,17 @@ com.baomidou - mybatis-plus-boot-starter + mybatis-plus-spring-boot3-starter + + + com.baomidou + mybatis-plus-boot-starter + + + org.jetbrains.kotlin + kotlin-reflect + + diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/LogAspect.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/LogAspect.java index 1afd25dfe..29f5240e1 100755 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/LogAspect.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/LogAspect.java @@ -27,8 +27,8 @@ import org.springframework.stereotype.Component; import org.springframework.validation.BindingResult; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Collection; import java.util.Map; diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/DruidConfig.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/DruidConfig.java index 3eb029ca4..c8685d999 100755 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/DruidConfig.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/DruidConfig.java @@ -1,8 +1,8 @@ package com.core.framework.config; import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder; -import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties; +import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceBuilder; +import com.alibaba.druid.spring.boot3.autoconfigure.properties.DruidStatProperties; import com.alibaba.druid.util.Utils; import com.core.common.enums.DataSourceType; import com.core.common.utils.spring.SpringUtils; @@ -15,7 +15,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; -import javax.servlet.*; +import jakarta.servlet.*; import javax.sql.DataSource; import java.io.IOException; import java.util.HashMap; @@ -83,7 +83,7 @@ public class DruidConfig { // 创建filter进行过滤 Filter filter = new Filter() { @Override - public void init(javax.servlet.FilterConfig filterConfig) throws ServletException {} + public void init(jakarta.servlet.FilterConfig filterConfig) throws ServletException {} @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/FilterConfig.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/FilterConfig.java index d085ff9eb..728c7de02 100755 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/FilterConfig.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/FilterConfig.java @@ -9,7 +9,7 @@ import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import javax.servlet.DispatcherType; +import jakarta.servlet.DispatcherType; import java.util.HashMap; import java.util.Map; diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java index 2cb0bbf75..5cbdf05fb 100755 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java @@ -25,7 +25,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.sql.DataSource; import java.util.Arrays; import java.util.HashSet; diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/SecurityConfig.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/SecurityConfig.java index 85d9ebca0..89f8275bd 100755 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/SecurityConfig.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/SecurityConfig.java @@ -11,7 +11,7 @@ import org.springframework.http.HttpMethod; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.ProviderManager; import org.springframework.security.authentication.dao.DaoAuthenticationProvider; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.core.userdetails.UserDetailsService; @@ -26,7 +26,7 @@ import org.springframework.web.filter.CorsFilter; * * @author system */ -@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) +@EnableMethodSecurity @Configuration public class SecurityConfig { /** @@ -97,18 +97,18 @@ public class SecurityConfig { .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) // 注解标记允许匿名访问的url .authorizeHttpRequests((requests) -> { - permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll()); + permitAllUrl.getUrls().forEach(url -> requests.requestMatchers(url).permitAll()); // 对于登录login 注册register 验证码captchaImage 允许匿名访问 - requests.antMatchers("/login", "/register", "/captchaImage").permitAll() + requests.requestMatchers("/login", "/register", "/captchaImage").permitAll() // 静态资源,可匿名访问 - .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**") + .requestMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**") .permitAll() - .antMatchers("/swagger-ui/**", "/swagger-ui.html", "/v3/api-docs/**", "/druid/**") + .requestMatchers("/swagger-ui/**", "/swagger-ui.html", "/v3/api-docs/**", "/druid/**") .permitAll() - .antMatchers("/patientmanage/information/**") + .requestMatchers("/patientmanage/information/**") .permitAll() // 登录页展示用的系统版本信息,允许匿名访问 - .antMatchers("/system/version") + .requestMatchers("/system/version") .permitAll() // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated(); diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ServerConfig.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ServerConfig.java index 6e460cf5c..5ec310a3a 100755 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ServerConfig.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ServerConfig.java @@ -3,7 +3,7 @@ package com.core.framework.config; import com.core.common.utils.ServletUtils; import org.springframework.stereotype.Component; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 服务相关配置 diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/handler/MybastisColumnsHandler.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/handler/MybastisColumnsHandler.java index f2e5d02fd..f35970df4 100755 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/handler/MybastisColumnsHandler.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/handler/MybastisColumnsHandler.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Date; @Component diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/interceptor/RepeatSubmitInterceptor.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/interceptor/RepeatSubmitInterceptor.java index e2204b7a6..b0adcf467 100755 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/interceptor/RepeatSubmitInterceptor.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/interceptor/RepeatSubmitInterceptor.java @@ -8,8 +8,8 @@ import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerInterceptor; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.lang.reflect.Method; /** diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/interceptor/impl/SameUrlDataInterceptor.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/interceptor/impl/SameUrlDataInterceptor.java index f38cd20e9..c8d2da896 100755 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/interceptor/impl/SameUrlDataInterceptor.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/interceptor/impl/SameUrlDataInterceptor.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/manager/ShutdownManager.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/manager/ShutdownManager.java index 8d4058fe3..c3b1a082a 100755 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/manager/ShutdownManager.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/manager/ShutdownManager.java @@ -4,7 +4,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import javax.annotation.PreDestroy; +import jakarta.annotation.PreDestroy; /** * 确保应用退出时能关闭后台线程 diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/security/filter/JwtAuthenticationTokenFilter.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/security/filter/JwtAuthenticationTokenFilter.java index a33174afc..79b9937e1 100755 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/security/filter/JwtAuthenticationTokenFilter.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/security/filter/JwtAuthenticationTokenFilter.java @@ -11,10 +11,10 @@ import org.springframework.security.web.authentication.WebAuthenticationDetailsS import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/security/handle/AuthenticationEntryPointImpl.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/security/handle/AuthenticationEntryPointImpl.java index 5cffae16b..47a49827a 100755 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/security/handle/AuthenticationEntryPointImpl.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/security/handle/AuthenticationEntryPointImpl.java @@ -9,8 +9,8 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.stereotype.Component; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.Serializable; diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/security/handle/LogoutSuccessHandlerImpl.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/security/handle/LogoutSuccessHandlerImpl.java index 63f5db581..a09d71a6f 100755 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/security/handle/LogoutSuccessHandlerImpl.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/security/handle/LogoutSuccessHandlerImpl.java @@ -15,9 +15,9 @@ import org.springframework.context.annotation.Configuration; import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/web/exception/GlobalExceptionHandler.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/exception/GlobalExceptionHandler.java index e43a30f87..a09760a7f 100755 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/web/exception/GlobalExceptionHandler.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/exception/GlobalExceptionHandler.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 全局异常处理器 diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java index 1499126ea..31541b7a5 100755 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java @@ -33,7 +33,7 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio import org.springframework.security.core.Authentication; import org.springframework.stereotype.Component; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/TokenService.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/TokenService.java index f728e45c0..f2d4ae845 100755 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/TokenService.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/TokenService.java @@ -19,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; diff --git a/openhis-server-new/core-generator/pom.xml b/openhis-server-new/core-generator/pom.xml index cf40a84e8..4d4c581f9 100755 --- a/openhis-server-new/core-generator/pom.xml +++ b/openhis-server-new/core-generator/pom.xml @@ -21,7 +21,17 @@ com.baomidou - mybatis-plus-boot-starter + mybatis-plus-spring-boot3-starter + + + com.baomidou + mybatis-plus-boot-starter + + + org.jetbrains.kotlin + kotlin-reflect + + @@ -39,7 +49,7 @@ com.alibaba - druid-spring-boot-starter + druid-spring-boot-3-starter diff --git a/openhis-server-new/core-generator/src/main/java/com/core/generator/controller/GenController.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/controller/GenController.java index 42e8f203b..be935042b 100755 --- a/openhis-server-new/core-generator/src/main/java/com/core/generator/controller/GenController.java +++ b/openhis-server-new/core-generator/src/main/java/com/core/generator/controller/GenController.java @@ -27,7 +27,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.BufferedWriter; import java.io.FileWriter; import java.io.IOException; diff --git a/openhis-server-new/core-generator/src/main/java/com/core/generator/domain/GenTable.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/domain/GenTable.java index c474ea237..3666fce19 100755 --- a/openhis-server-new/core-generator/src/main/java/com/core/generator/domain/GenTable.java +++ b/openhis-server-new/core-generator/src/main/java/com/core/generator/domain/GenTable.java @@ -5,8 +5,8 @@ import com.core.common.core.domain.BaseEntity; import com.core.common.utils.StringUtils; import org.apache.commons.lang3.ArrayUtils; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; import java.util.List; /** diff --git a/openhis-server-new/core-generator/src/main/java/com/core/generator/domain/GenTableColumn.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/domain/GenTableColumn.java index d004c489c..1af8629e2 100755 --- a/openhis-server-new/core-generator/src/main/java/com/core/generator/domain/GenTableColumn.java +++ b/openhis-server-new/core-generator/src/main/java/com/core/generator/domain/GenTableColumn.java @@ -3,7 +3,7 @@ package com.core.generator.domain; import com.core.common.core.domain.BaseEntity; import com.core.common.utils.StringUtils; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; /** * 代码生成业务字段表 gen_table_column diff --git a/openhis-server-new/core-quartz/src/main/java/com/core/quartz/domain/SysJob.java b/openhis-server-new/core-quartz/src/main/java/com/core/quartz/domain/SysJob.java index 61fb3e15d..bac926368 100755 --- a/openhis-server-new/core-quartz/src/main/java/com/core/quartz/domain/SysJob.java +++ b/openhis-server-new/core-quartz/src/main/java/com/core/quartz/domain/SysJob.java @@ -10,8 +10,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; import java.util.Date; /** diff --git a/openhis-server-new/core-system/pom.xml b/openhis-server-new/core-system/pom.xml index 8c4a79f22..a04910bbd 100755 --- a/openhis-server-new/core-system/pom.xml +++ b/openhis-server-new/core-system/pom.xml @@ -26,7 +26,17 @@ com.baomidou - mybatis-plus-boot-starter + mybatis-plus-spring-boot3-starter + + + com.baomidou + mybatis-plus-boot-starter + + + org.jetbrains.kotlin + kotlin-reflect + + @@ -61,12 +71,6 @@ ${pinyin4j.version} - - - io.swagger - swagger-annotations - compile - @@ -74,6 +78,18 @@ postgresql + + + io.swagger.core.v3 + swagger-annotations-jakarta + 2.2.30 + + + + io.swagger.core.v3 + swagger-annotations-jakarta + 2.2.30 + \ No newline at end of file diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/controller/SysUserConfigController.java b/openhis-server-new/core-system/src/main/java/com/core/system/controller/SysUserConfigController.java index 957f84e54..841581839 100755 --- a/openhis-server-new/core-system/src/main/java/com/core/system/controller/SysUserConfigController.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/controller/SysUserConfigController.java @@ -8,8 +8,9 @@ import com.core.common.enums.BusinessType; import com.core.system.domain.SysUserConfig; import com.core.system.service.ISysUserConfigService; import com.core.common.utils.SecurityUtils; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameters; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -22,7 +23,7 @@ import java.util.List; * @author * @date 2026-01-30 */ -@Api(tags = "用户配置") +@Tag(name = "用户配置") @RestController @RequestMapping("/system/userConfig") public class SysUserConfigController extends BaseController @@ -88,7 +89,7 @@ public class SysUserConfigController extends BaseController /** * 获取当前用户的指定配置 */ - @ApiOperation("获取当前用户的指定配置") + @Operation(summary = "获取当前用户的指定配置") @GetMapping("/currentUserConfig") public AjaxResult getCurrentUserConfig(@RequestParam String configKey) { @@ -101,7 +102,7 @@ public class SysUserConfigController extends BaseController /** * 保存当前用户的配置 */ - @ApiOperation("保存当前用户的配置") + @Operation(summary = "保存当前用户的配置") @Log(title = "用户配置", businessType = BusinessType.UPDATE) @PostMapping("/saveCurrentUserConfig") public AjaxResult saveCurrentUserConfig(@RequestParam String configKey, @RequestParam String configValue) diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/domain/FlowProcDefDto.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/FlowProcDefDto.java index 18b9b0bb1..590545a39 100755 --- a/openhis-server-new/core-system/src/main/java/com/core/system/domain/FlowProcDefDto.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/domain/FlowProcDefDto.java @@ -1,8 +1,7 @@ package com.core.system.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,37 +20,37 @@ import java.util.Date; @Data @AllArgsConstructor @NoArgsConstructor -@ApiModel("流程定义") +@Schema(description = "流程定义") public class FlowProcDefDto implements Serializable { - @ApiModelProperty("流程id") + @Schema(description = "流程id") private String id; - @ApiModelProperty("流程名称") + @Schema(description = "流程名称") private String name; - @ApiModelProperty("流程key") + @Schema(description = "流程key") private String flowKey; - @ApiModelProperty("流程分类") + @Schema(description = "流程分类") private String category; - @ApiModelProperty("配置表单名称") + @Schema(description = "配置表单名称") private String formName; - @ApiModelProperty("配置表单id") + @Schema(description = "配置表单id") private Long formId; - @ApiModelProperty("版本") + @Schema(description = "版本") private int version; - @ApiModelProperty("部署ID") + @Schema(description = "部署ID") private String deploymentId; - @ApiModelProperty("流程定义状态: 1:激活 , 2:中止") + @Schema(description = "流程定义状态: 1:激活 , 2:中止") private int suspensionState; - @ApiModelProperty("部署时间") + @Schema(description = "部署时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date deploymentTime; diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysConfig.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysConfig.java index 8ff0ee4e8..2d5374f53 100755 --- a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysConfig.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysConfig.java @@ -6,8 +6,8 @@ import com.core.common.core.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; /** * 参数配置表 sys_config diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysNotice.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysNotice.java index 1ad622076..cca117a29 100755 --- a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysNotice.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysNotice.java @@ -5,8 +5,8 @@ import com.core.common.xss.Xss; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; /** * 通知公告表 sys_notice diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysPost.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysPost.java index c56113c15..208a1729a 100755 --- a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysPost.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysPost.java @@ -6,9 +6,9 @@ import com.core.common.core.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; /** * 岗位表 sys_post diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysConfigServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysConfigServiceImpl.java index 354a2d30e..660b172c2 100755 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysConfigServiceImpl.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysConfigServiceImpl.java @@ -14,7 +14,7 @@ import com.core.system.service.ISysConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.util.Collection; import java.util.List; diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysDictTypeServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysDictTypeServiceImpl.java index ab0ba7846..2a2492bda 100755 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysDictTypeServiceImpl.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysDictTypeServiceImpl.java @@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.util.Comparator; import java.util.List; import java.util.Map; diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysUserServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysUserServiceImpl.java index 9da8b47e6..0a4e7013e 100755 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysUserServiceImpl.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysUserServiceImpl.java @@ -25,7 +25,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import javax.validation.Validator; +import jakarta.validation.Validator; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/openhis-server-new/openhis-application/pom.xml b/openhis-server-new/openhis-application/pom.xml index 6141cfe83..ff9307701 100755 --- a/openhis-server-new/openhis-application/pom.xml +++ b/openhis-server-new/openhis-application/pom.xml @@ -27,6 +27,10 @@ org.flywaydb flyway-core + + org.flywaydb + flyway-database-postgresql + org.projectlombok @@ -89,10 +93,6 @@ org.springframework.boot spring-boot-maven-plugin - 2.5.15 - - true - diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobController.java index 407bc2965..d7347d9c3 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobController.java @@ -18,7 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobLogController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobLogController.java index b66571756..18111e029 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobLogController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/controller/SysJobLogController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobServiceImpl.java index 6b19a1099..b38d462eb 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobServiceImpl.java @@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/AutoRollTask.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/AutoRollTask.java index 9503dfca7..47e4b477b 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/AutoRollTask.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/AutoRollTask.java @@ -8,7 +8,7 @@ import com.openhis.web.inhospitalnursestation.appservice.IEncounterAutoRollAppSe import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * 自动滚方定时任务(每日执行) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/InventoryBackupTask.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/InventoryBackupTask.java index 0dbee9b07..28f5ba4f9 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/InventoryBackupTask.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/InventoryBackupTask.java @@ -20,7 +20,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/RyTask.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/RyTask.java index a1963e57d..5202723b5 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/RyTask.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/RyTask.java @@ -6,7 +6,7 @@ import com.openhis.administration.domain.Location; import com.openhis.administration.service.ILocationService; import org.springframework.stereotype.Component; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/IInstrumentManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/IInstrumentManageAppService.java index fbec9a981..a945aefe5 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/IInstrumentManageAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/IInstrumentManageAppService.java @@ -4,7 +4,7 @@ import com.core.common.core.domain.R; import com.openhis.administration.domain.Instrument; import com.openhis.web.Inspection.dto.InstrumentSelParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ILaboratoryManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ILaboratoryManageAppService.java index 7b4074fba..faf49d073 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ILaboratoryManageAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ILaboratoryManageAppService.java @@ -3,7 +3,7 @@ package com.openhis.web.Inspection.appservice; import com.core.common.core.domain.R; import com.openhis.web.Inspection.dto.ReportResultManageDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * @Description TODO diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ILisConfigManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ILisConfigManageAppService.java index dbbaf398a..99fe6f7a7 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ILisConfigManageAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ILisConfigManageAppService.java @@ -4,7 +4,7 @@ import com.core.common.core.domain.R; import com.openhis.web.Inspection.dto.LisConfigManageDto; import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * @Description TODO diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/IObservationManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/IObservationManageAppService.java index 6feb54b73..4aaf442de 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/IObservationManageAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/IObservationManageAppService.java @@ -4,7 +4,7 @@ import com.core.common.core.domain.R; import com.openhis.administration.domain.ObservationDefinition; import com.openhis.web.Inspection.dto.ObservationDefSelParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ISampleCollectAppManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ISampleCollectAppManageAppService.java index 08320e7c8..cd29e30e9 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ISampleCollectAppManageAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ISampleCollectAppManageAppService.java @@ -4,7 +4,7 @@ import com.core.common.core.domain.R; import com.openhis.web.Inspection.dto.SampleCollectManageDto; import com.openhis.web.Inspection.dto.SampleCollectStatusRequest; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * @Description TODO diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ISpecimenManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ISpecimenManageAppService.java index 627fe83cd..4aba69779 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ISpecimenManageAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/ISpecimenManageAppService.java @@ -4,7 +4,7 @@ import com.core.common.core.domain.R; import com.openhis.administration.domain.SpecimenDefinition; import com.openhis.web.Inspection.dto.SpecimenDefSelParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/InstrumentManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/InstrumentManageAppServiceImpl.java index b35db096d..0b1317e67 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/InstrumentManageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/InstrumentManageAppServiceImpl.java @@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.HashSet; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/LaboratoryManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/LaboratoryManageAppService.java index b0a89987d..300698f08 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/LaboratoryManageAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/LaboratoryManageAppService.java @@ -13,7 +13,7 @@ import com.openhis.web.Inspection.mapper.LisReportMapper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.HashSet; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/LisConfigManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/LisConfigManageAppServiceImpl.java index 26e555cb2..889fac85a 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/LisConfigManageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/LisConfigManageAppServiceImpl.java @@ -33,8 +33,8 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.HashSet; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/ObservationManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/ObservationManageAppServiceImpl.java index b8f00040f..cedf7c615 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/ObservationManageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/ObservationManageAppServiceImpl.java @@ -26,7 +26,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.HashSet; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/SampleCollectManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/SampleCollectManageAppService.java index adff9b371..360919ac8 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/SampleCollectManageAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/SampleCollectManageAppService.java @@ -18,7 +18,7 @@ import com.openhis.web.Inspection.mapper.SampleCollectMapper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.Date; import java.util.HashSet; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/SpecimenManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/SpecimenManageAppServiceImpl.java index 281ffa93d..0fefdfb8d 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/SpecimenManageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/appservice/impl/SpecimenManageAppServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.web.Inspection.dto.SpecimenDefSelParam; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.HashSet; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/InstrumentController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/InstrumentController.java index f78009ec5..f90bef333 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/InstrumentController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/InstrumentController.java @@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * @Description 仪器器材信息 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/LaboratoryController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/LaboratoryController.java index 11294e9d0..eb2f2f724 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/LaboratoryController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/LaboratoryController.java @@ -7,7 +7,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * @Description 检测中心相关 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/LisConfigController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/LisConfigController.java index 19733304b..bdfbc9008 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/LisConfigController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/LisConfigController.java @@ -8,7 +8,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * @Description 检验定义配置 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/ObservationDefController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/ObservationDefController.java index 92dc6890f..a75e8daa2 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/ObservationDefController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/ObservationDefController.java @@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * @Description 仪器器材信息 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/SampleCollectController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/SampleCollectController.java index 51185cc79..61199d1da 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/SampleCollectController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/SampleCollectController.java @@ -8,7 +8,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * @Description 样本采集 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/SpecimenDefController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/SpecimenDefController.java index c676bebc4..63d5ee3e3 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/SpecimenDefController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/controller/SpecimenDefController.java @@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * @Description 样本定义相关 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/IAdjustPriceService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/IAdjustPriceService.java index 660d6b1c7..0f5abe6ac 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/IAdjustPriceService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/IAdjustPriceService.java @@ -4,7 +4,7 @@ import com.core.common.core.domain.R; import com.openhis.web.adjustprice.dto.AdjustPriceDataVo; import com.openhis.web.adjustprice.dto.AdjustPriceManagerSearchParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/impl/AdjustPriceServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/impl/AdjustPriceServiceImpl.java index 35d4f4886..75c3fcb85 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/impl/AdjustPriceServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/impl/AdjustPriceServiceImpl.java @@ -36,8 +36,8 @@ import com.openhis.workflow.service.IInventoryItemService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.*; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/controller/ChangePriceController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/controller/ChangePriceController.java index 55ef8cb02..899f6018e 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/controller/ChangePriceController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/controller/ChangePriceController.java @@ -8,7 +8,7 @@ import com.openhis.web.adjustprice.appservice.IAdjustPriceService; import com.openhis.web.adjustprice.dto.AdjustPriceDataVo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/controller/ChangePriceDataListPageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/controller/ChangePriceDataListPageController.java index 8b61442b3..c27e20b18 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/controller/ChangePriceDataListPageController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/controller/ChangePriceDataListPageController.java @@ -7,8 +7,8 @@ import com.openhis.web.adjustprice.dto.AdjustPriceDataVo; import com.openhis.web.adjustprice.dto.AdjustPriceManagerSearchParam; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/administration/controller/PractitionerPatientController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/administration/controller/PractitionerPatientController.java index 95c989245..43bab66ab 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/administration/controller/PractitionerPatientController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/administration/controller/PractitionerPatientController.java @@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/AppointmentConfigAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/AppointmentConfigAppServiceImpl.java index dc5a4c993..8467b74f4 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/AppointmentConfigAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/AppointmentConfigAppServiceImpl.java @@ -7,7 +7,7 @@ import com.openhis.appointmentmanage.service.IAppointmentConfigService; import com.openhis.web.appointmentmanage.appservice.IAppointmentConfigAppService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * 预约配置AppService实现类 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/ClinicRoomAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/ClinicRoomAppServiceImpl.java index a35199cc6..2492c17d5 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/ClinicRoomAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/ClinicRoomAppServiceImpl.java @@ -8,7 +8,7 @@ import com.openhis.appointmentmanage.service.IClinicRoomService; import com.openhis.web.appointmentmanage.appservice.IClinicRoomAppService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; @Service public class ClinicRoomAppServiceImpl implements IClinicRoomAppService { diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DeptAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DeptAppServiceImpl.java index 6177e8e47..fbca6ad03 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DeptAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DeptAppServiceImpl.java @@ -8,7 +8,7 @@ import com.openhis.appointmentmanage.service.IDeptService; import com.openhis.web.appointmentmanage.appservice.IDeptAppService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.List; @Service diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DeptAppointmentHoursAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DeptAppointmentHoursAppServiceImpl.java index d48caeb01..14e499499 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DeptAppointmentHoursAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DeptAppointmentHoursAppServiceImpl.java @@ -11,7 +11,7 @@ import com.openhis.appointmentmanage.service.IDeptAppointmentHoursService; import com.openhis.web.appointmentmanage.appservice.IDeptAppointmentHoursAppService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.time.LocalDateTime; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java index da46a87fa..535de419c 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java @@ -17,7 +17,7 @@ import com.openhis.web.appointmentmanage.appservice.IDoctorScheduleAppService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.time.LocalDate; import java.time.LocalTime; import java.util.ArrayList; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/SchedulePoolAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/SchedulePoolAppServiceImpl.java index a25cea2e0..564fffaee 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/SchedulePoolAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/SchedulePoolAppServiceImpl.java @@ -8,7 +8,7 @@ import com.openhis.web.appointmentmanage.appservice.ISchedulePoolAppService; import com.openhis.web.appointmentmanage.dto.SchedulePoolDto; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; @Service public class SchedulePoolAppServiceImpl implements ISchedulePoolAppService { diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java index 41a83e2ac..ae58eb11e 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java @@ -13,7 +13,7 @@ import com.openhis.common.enums.SlotStatus; import com.openhis.common.enums.OrderStatus; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/ClinicRoomController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/ClinicRoomController.java index 2041b963a..b66bd165d 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/ClinicRoomController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/ClinicRoomController.java @@ -5,7 +5,7 @@ import com.openhis.appointmentmanage.domain.ClinicRoom; import com.openhis.web.appointmentmanage.appservice.IClinicRoomAppService; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; @RestController @RequestMapping("/appoinment/clinic-room") diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DeptAppthoursController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DeptAppthoursController.java index 6dfc503c6..1c32af324 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DeptAppthoursController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DeptAppthoursController.java @@ -5,7 +5,7 @@ import com.openhis.appointmentmanage.domain.DeptAppointmentHours; import com.openhis.web.appointmentmanage.appservice.IDeptAppointmentHoursAppService; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * 科室预约工作时间维护 Controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DeptController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DeptController.java index 9f37d04ec..162e617f6 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DeptController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DeptController.java @@ -6,7 +6,7 @@ import com.openhis.web.appointmentmanage.appservice.IAppointmentConfigAppService import com.openhis.web.appointmentmanage.appservice.IDeptAppService; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; @RestController @RequestMapping("/dept") diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DoctorScheduleController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DoctorScheduleController.java index 57d102d87..cd1548560 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DoctorScheduleController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/DoctorScheduleController.java @@ -5,7 +5,7 @@ import com.openhis.appointmentmanage.domain.DoctorSchedule; import com.openhis.web.appointmentmanage.appservice.IDoctorScheduleAppService; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; @RestController @RequestMapping("/doctor-schedule") diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/SchedulePoolController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/SchedulePoolController.java index ed440447a..19335a237 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/SchedulePoolController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/SchedulePoolController.java @@ -6,7 +6,7 @@ import com.openhis.web.appointmentmanage.appservice.ISchedulePoolAppService; import com.openhis.web.appointmentmanage.dto.SchedulePoolDto; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; @RestController @RequestMapping("/schedule-pool") diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/TicketController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/TicketController.java index df64f9855..d089345ff 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/TicketController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/controller/TicketController.java @@ -11,7 +11,7 @@ import com.openhis.web.appointmentmanage.dto.TicketDto; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.Map; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IBodyStructureAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IBodyStructureAppService.java index 760d853b7..6dd8dad34 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IBodyStructureAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IBodyStructureAppService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.openhis.web.basedatamanage.dto.BodyStructureDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * BodyStructure 应该服务类 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/ILocationAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/ILocationAppService.java index 010a1b3a6..a2e1bb21c 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/ILocationAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/ILocationAppService.java @@ -4,7 +4,7 @@ import com.core.common.core.domain.R; import com.openhis.web.basedatamanage.dto.LocationAddOrEditDto; import com.openhis.web.basedatamanage.dto.LocationPageParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOperatingRoomAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOperatingRoomAppService.java index 067cb5590..317bf1dd5 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOperatingRoomAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOperatingRoomAppService.java @@ -5,7 +5,7 @@ import com.core.common.core.domain.R; import com.openhis.web.basedatamanage.dto.OperatingRoomDto; import org.springframework.validation.annotation.Validated; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 手术室应用Service接口 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationAppService.java index 4027d38e4..c64bd27a1 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationAppService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.openhis.web.basedatamanage.dto.OrganizationDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationLocationAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationLocationAppService.java index c493a6430..cf5786d17 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationLocationAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IOrganizationLocationAppService.java @@ -4,7 +4,7 @@ import com.core.common.core.domain.R; import com.openhis.web.basedatamanage.dto.OrgLocQueryDto; import com.openhis.web.basedatamanage.dto.OrgLocQueryParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Organization 应该服务类 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerRoleAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerRoleAppService.java index 0e16e8cb6..b6a67bcef 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerRoleAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/IPractitionerRoleAppService.java @@ -4,7 +4,7 @@ import com.core.common.core.domain.R; import com.openhis.web.basedatamanage.dto.PractRoleSearchParam; import com.openhis.web.basedatamanage.dto.PractitionerRoleDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * PractitionerRole 应该服务类 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/BodyStructureAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/BodyStructureAppServiceImpl.java index f80828dfe..1d0dcaa11 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/BodyStructureAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/BodyStructureAppServiceImpl.java @@ -18,8 +18,8 @@ import com.openhis.web.basedatamanage.dto.BodyStructureDto; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.*; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/LocationAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/LocationAppServiceImpl.java index 039b0849a..1d580a511 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/LocationAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/LocationAppServiceImpl.java @@ -24,8 +24,8 @@ import com.openhis.web.common.appservice.ICommonService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.*; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OperatingRoomAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OperatingRoomAppServiceImpl.java index 36cb8fb89..e67e472de 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OperatingRoomAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OperatingRoomAppServiceImpl.java @@ -21,8 +21,8 @@ import com.openhis.web.basedatamanage.dto.OperatingRoomDto; import com.openhis.web.common.appservice.ICommonService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationAppServiceImpl.java index a2f6e6be9..35bdb0b6f 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationAppServiceImpl.java @@ -22,8 +22,8 @@ import com.openhis.web.basedatamanage.dto.OrganizationDto; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.lang.reflect.Field; import java.util.*; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java index ecf5b762d..5d702232d 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java @@ -28,7 +28,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java index 3db6edb1b..f84509ae3 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java @@ -36,7 +36,7 @@ import com.openhis.web.basedatamanage.dto.UserAndPractitionerDto; import com.openhis.web.basedatamanage.mapper.PractitionerAppAppMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.Arrays; import java.util.HashSet; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerRoleAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerRoleAppServiceImpl.java index 01966e0be..d5cdc31e7 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerRoleAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerRoleAppServiceImpl.java @@ -17,7 +17,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.HashSet; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/BodyStructureController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/BodyStructureController.java index d308b062d..38ec7cd13 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/BodyStructureController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/BodyStructureController.java @@ -14,7 +14,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 身体部位管理controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/FrequencyController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/FrequencyController.java index 9115a85d7..1c961d6a3 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/FrequencyController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/FrequencyController.java @@ -17,7 +17,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Collections; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/LocationController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/LocationController.java index 81fbe45c6..7e25c5385 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/LocationController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/LocationController.java @@ -12,8 +12,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OperatingRoomController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OperatingRoomController.java index 164ae94d2..dbbc6ff63 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OperatingRoomController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OperatingRoomController.java @@ -8,8 +8,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java index 3fc8f573f..3c66a53cc 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java @@ -16,7 +16,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationLocationController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationLocationController.java index e1329d051..ae88a4e1a 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationLocationController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationLocationController.java @@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 机构位置关系controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerRoleController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerRoleController.java index 14b63c5d0..9440fb966 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerRoleController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerRoleController.java @@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 岗位管理Controller业务层处理 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationAddOrEditDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationAddOrEditDto.java index 50448acd7..64cef00c3 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationAddOrEditDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationAddOrEditDto.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; /** * 位置信息新增编辑dto diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationDto.java index c08c8101f..7305d7695 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationDto.java @@ -8,8 +8,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationPageParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationPageParam.java index 150065e32..148100d42 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationPageParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationPageParam.java @@ -6,7 +6,7 @@ package com.openhis.web.basedatamanage.dto; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerDto.java index 356c8f450..f89b43440 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerDto.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import java.util.Date; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRoleDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRoleDto.java index ae71044e3..a245534c4 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRoleDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRoleDto.java @@ -8,8 +8,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; /** * @author diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/controller/InvoiceController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/controller/InvoiceController.java index 34614bcc1..ab19b311b 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/controller/InvoiceController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/controller/InvoiceController.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 发票管理控制器 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/controller/InvoiceSegmentController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/controller/InvoiceSegmentController.java index 2d0231e00..421b1e9aa 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/controller/InvoiceSegmentController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/controller/InvoiceSegmentController.java @@ -9,7 +9,7 @@ import com.openhis.web.basicmanage.domain.InvoiceSegmentDeleteRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 发票段管理控制器 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java index 54f419946..8a8aa5ac1 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java @@ -32,7 +32,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/ChargeItemDefinitionFormData.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/ChargeItemDefinitionFormData.java index eeb195740..d6fa42819 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/ChargeItemDefinitionFormData.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/ChargeItemDefinitionFormData.java @@ -2,7 +2,7 @@ package com.openhis.web.basicservice.dto; import lombok.Data; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import java.math.BigDecimal; import java.util.Date; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceFormData.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceFormData.java index 682a880d1..c1f08db5e 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceFormData.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceFormData.java @@ -2,7 +2,7 @@ package com.openhis.web.basicservice.dto; import lombok.Data; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; /** * 服务项目管理表单数据 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/appservice/ICardManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/appservice/ICardManageAppService.java index 7232c1b8b..b9b5e0b69 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/appservice/ICardManageAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/appservice/ICardManageAppService.java @@ -5,7 +5,7 @@ package com.openhis.web.cardmanagement.appservice; import com.core.common.core.domain.R; import com.openhis.web.cardmanagement.dto.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/appservice/impl/CardManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/appservice/impl/CardManageAppServiceImpl.java index b026ccb78..affeff02d 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/appservice/impl/CardManageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/appservice/impl/CardManageAppServiceImpl.java @@ -27,7 +27,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/controller/CardManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/controller/CardManageController.java index 063143653..37d16f0cf 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/controller/CardManageController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/controller/CardManageController.java @@ -10,7 +10,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/DoctorCardUpdateDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/DoctorCardUpdateDto.java index 9332947ba..582984da3 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/DoctorCardUpdateDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/DoctorCardUpdateDto.java @@ -1,8 +1,8 @@ package com.openhis.web.cardmanagement.dto; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/appservice/ICatalogService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/appservice/ICatalogService.java index 6c40f2699..5e0395fde 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/appservice/ICatalogService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/appservice/ICatalogService.java @@ -5,7 +5,7 @@ package com.openhis.web.catalogmanage.appservice; import com.core.common.core.domain.R; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 医保目录服务层 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/appservice/impl/CatalogServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/appservice/impl/CatalogServiceImpl.java index 93b40bbfe..b9657528d 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/appservice/impl/CatalogServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/appservice/impl/CatalogServiceImpl.java @@ -19,7 +19,7 @@ import com.openhis.ybcatalog.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.HashSet; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/controller/CatalogController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/controller/CatalogController.java index 060033e4e..bea4a27fc 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/controller/CatalogController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/catalogmanage/controller/CatalogController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 医保目录 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IInpatientChargeAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IInpatientChargeAppService.java index 830f7735d..5ea8478ab 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IInpatientChargeAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IInpatientChargeAppService.java @@ -7,7 +7,7 @@ import com.core.common.core.domain.R; import com.openhis.web.chargemanage.dto.EncounterPatientPageParam; import com.openhis.web.chargemanage.dto.EncounterPatientPrescriptionDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientChargeAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientChargeAppService.java index 5d9c9eeb3..0fa95a6aa 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientChargeAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientChargeAppService.java @@ -7,7 +7,7 @@ import com.core.common.core.domain.R; import com.openhis.web.chargemanage.dto.EncounterPatientPageParam; import com.openhis.web.chargemanage.dto.EncounterPatientPrescriptionDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientPricingAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientPricingAppService.java index f5c80ec2c..489b341a0 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientPricingAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientPricingAppService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.openhis.web.doctorstation.dto.AdviceBaseDto; import com.openhis.web.doctorstation.dto.PatientInfoDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 门诊划价 service diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRefundAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRefundAppService.java index e9c081dce..25294e180 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRefundAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRefundAppService.java @@ -7,7 +7,7 @@ import com.core.common.core.domain.R; import com.openhis.web.chargemanage.dto.EncounterPatientPageParam; import com.openhis.web.chargemanage.dto.RefundItemParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java index 8b5de03b9..96ecae170 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java @@ -11,7 +11,7 @@ import com.openhis.web.chargemanage.dto.PractitionerMetadata; import com.openhis.web.chargemanage.dto.ReprintRegistrationDto; import com.openhis.web.paymentmanage.dto.CancelRegPaymentDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/InpatientChargeAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/InpatientChargeAppServiceImpl.java index d7e61b220..a6c82d9e6 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/InpatientChargeAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/InpatientChargeAppServiceImpl.java @@ -24,7 +24,7 @@ import com.openhis.web.chargemanage.mapper.InpatientChargeAppMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientChargeAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientChargeAppServiceImpl.java index a65b99229..0ef327942 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientChargeAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientChargeAppServiceImpl.java @@ -28,7 +28,7 @@ import com.openhis.web.chargemanage.mapper.OutpatientChargeAppMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.math.RoundingMode; import java.text.DecimalFormat; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java index 90c4d1164..52a0540e3 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java @@ -13,8 +13,8 @@ import com.openhis.web.doctorstation.dto.AdviceBaseDto; import com.openhis.web.doctorstation.dto.PatientInfoDto; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRefundAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRefundAppServiceImpl.java index e04e185fa..b4300ee31 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRefundAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRefundAppServiceImpl.java @@ -36,8 +36,8 @@ import com.openhis.workflow.service.IDeviceRequestService; import com.openhis.workflow.service.IServiceRequestService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java index a707111e6..d9a834d3c 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java @@ -53,8 +53,8 @@ import com.openhis.yb.model.CancelRegPaymentModel; import com.openhis.yb.service.YbManager; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/InpatientChargeController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/InpatientChargeController.java index aa0d3e385..e86fc5098 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/InpatientChargeController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/InpatientChargeController.java @@ -10,8 +10,8 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; /** * 住院收费 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientChargeController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientChargeController.java index 9bc34b653..fc5d1fd70 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientChargeController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientChargeController.java @@ -10,8 +10,8 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; /** * 门诊收费 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientPricingController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientPricingController.java index 0980154e2..57ef07f6b 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientPricingController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientPricingController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 门诊划价 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRefundController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRefundController.java index 796cd5b4e..43766d255 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRefundController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRefundController.java @@ -11,8 +11,8 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java index 43fee617d..a4a145a7f 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java @@ -16,7 +16,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/AccountFormData.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/AccountFormData.java index c33d75d18..a149c44a2 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/AccountFormData.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/AccountFormData.java @@ -8,7 +8,7 @@ import com.openhis.common.enums.AccountStatus; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ChargeItemFormData.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ChargeItemFormData.java index 1d2e9c6f1..6b4ba0c03 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ChargeItemFormData.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ChargeItemFormData.java @@ -9,7 +9,7 @@ import com.openhis.common.enums.ChargeItemStatus; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.Date; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterDiagnosisFormData.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterDiagnosisFormData.java index 211666174..a513694ce 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterDiagnosisFormData.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterDiagnosisFormData.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; /** * 就诊诊断 表单数据 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterFormData.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterFormData.java index 4910a375d..0f22e6231 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterFormData.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterFormData.java @@ -6,7 +6,7 @@ import com.openhis.common.enums.*; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; /** * 就诊 表单数据 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationAddParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationAddParam.java index 56850ac51..c3858b76e 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationAddParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationAddParam.java @@ -4,7 +4,7 @@ import com.openhis.yb.dto.Info5301SpecialConditionResult; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.Valid; +import jakarta.validation.Valid; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckMethodAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckMethodAppService.java index 8c5cd7822..316704a9f 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckMethodAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckMethodAppService.java @@ -4,7 +4,7 @@ package com.openhis.web.check.appservice; import com.core.common.core.domain.R; import com.openhis.check.domain.CheckMethod; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; /** * 检查方法Service接口 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckPartAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckPartAppService.java index ce58cad80..6b92e4c2b 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckPartAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckPartAppService.java @@ -3,7 +3,7 @@ package com.openhis.web.check.appservice; import com.core.common.core.domain.R; import com.openhis.check.domain.CheckPart; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; public interface ICheckPartAppService { R getCheckPartList(); diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckMethodAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckMethodAppServiceImpl.java index cf60f32ea..7cea43018 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckMethodAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckMethodAppServiceImpl.java @@ -13,8 +13,8 @@ import com.openhis.web.reportmanage.utils.ExcelFillerUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.LinkedHashMap; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckPartAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckPartAppServiceImpl.java index b0686a578..b5fbcee8b 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckPartAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckPartAppServiceImpl.java @@ -10,8 +10,8 @@ import com.openhis.web.reportmanage.utils.ExcelFillerUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.LinkedHashMap; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/LisGroupInfoAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/LisGroupInfoAppServiceImpl.java index 74e110c95..515e521f7 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/LisGroupInfoAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/LisGroupInfoAppServiceImpl.java @@ -9,7 +9,7 @@ import com.openhis.web.check.appservice.ILisGroupInfoAppService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.List; @Service diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckMethodController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckMethodController.java index a7dae1222..c61f0e48e 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckMethodController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckMethodController.java @@ -6,8 +6,8 @@ import com.openhis.web.check.appservice.ICheckMethodAppService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; @RestController diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckPartController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckPartController.java index cffd99e65..8b29be1a4 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckPartController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckPartController.java @@ -6,8 +6,8 @@ import com.openhis.web.check.appservice.ICheckPartAppService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; @RestController @Slf4j diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckTypeController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckTypeController.java index cd6c55ae9..f37d8b316 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckTypeController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckTypeController.java @@ -23,7 +23,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; +import jakarta.validation.Valid; import java.time.LocalDate; import java.util.*; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/LisGroupInfoController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/LisGroupInfoController.java index 4d235ef15..f2faa0bc4 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/LisGroupInfoController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/LisGroupInfoController.java @@ -5,7 +5,7 @@ import com.openhis.check.domain.LisGroupInfo; import com.openhis.web.check.appservice.ILisGroupInfoAppService; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; @RestController @RequestMapping("/check/lisGroupInfo") diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckPackageDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckPackageDetailDto.java index 1047b6431..2d21cf4ad 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckPackageDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckPackageDetailDto.java @@ -3,8 +3,8 @@ package com.openhis.web.check.dto; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckPackageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckPackageDto.java index a3017bab0..fa5746ea7 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckPackageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckPackageDto.java @@ -3,8 +3,8 @@ package com.openhis.web.check.dto; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; import java.time.LocalDate; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/ISurgicalScheduleAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/ISurgicalScheduleAppService.java index 21052d9cf..31c8b69a5 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/ISurgicalScheduleAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/ISurgicalScheduleAppService.java @@ -5,7 +5,7 @@ import com.core.common.core.domain.R; import com.openhis.web.clinicalmanage.dto.OpCreateScheduleDto; import com.openhis.web.clinicalmanage.dto.OpScheduleDto; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java index 6db4dcee5..db440ffc7 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java @@ -46,7 +46,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgicalScheduleAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgicalScheduleAppServiceImpl.java index c97a750d3..0387d9eea 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgicalScheduleAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgicalScheduleAppServiceImpl.java @@ -24,8 +24,8 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/controller/SurgicalScheduleController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/controller/SurgicalScheduleController.java index 4341e6b8f..77d2e13c1 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/controller/SurgicalScheduleController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/controller/SurgicalScheduleController.java @@ -13,7 +13,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/impl/CommonServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/impl/CommonServiceImpl.java index 62c2bbff4..c238a28b4 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/impl/CommonServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/impl/CommonServiceImpl.java @@ -46,7 +46,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.*; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/controller/CommonAppController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/controller/CommonAppController.java index d3a0dfd1a..32221d1c0 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/controller/CommonAppController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/controller/CommonAppController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/impl/ConsultationAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/impl/ConsultationAppServiceImpl.java index 5ec3ccf32..73d75dd0f 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/impl/ConsultationAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/impl/ConsultationAppServiceImpl.java @@ -54,7 +54,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.*; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/controller/ConsultationController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/controller/ConsultationController.java index 5e8672d07..51ce74659 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/controller/ConsultationController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/controller/ConsultationController.java @@ -7,13 +7,14 @@ import com.openhis.web.consultation.dto.ConsultationConfirmationDto; import com.openhis.web.consultation.dto.ConsultationOpinionDto; import com.openhis.web.consultation.dto.ConsultationRequestDto; import com.openhis.web.consultation.dto.DepartmentTreeDto; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.Parameter; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.List; import java.util.Map; @@ -24,7 +25,7 @@ import java.util.Map; * @date 2026-01-29 */ @Slf4j -@Api(tags = "会诊管理") +@Tag(name = "会诊管理") @RestController @RequestMapping("/consultation") public class ConsultationController { @@ -35,10 +36,10 @@ public class ConsultationController { /** * 获取会诊列表 */ - @ApiOperation("获取会诊列表") + @Operation(summary = "获取会诊列表") @GetMapping("/list") public R> getConsultationList( - @ApiParam("就诊ID(可选,不传则查询当前医生的所有会诊申请)") + @Parameter(description = "就诊ID(可选,不传则查询当前医生的所有会诊申请)") @RequestParam(required = false) Long encounterId) { try { List list = consultationAppService.getConsultationList(encounterId); @@ -52,7 +53,7 @@ public class ConsultationController { /** * 查询会诊申请列表(支持多条件查询) */ - @ApiOperation("查询会诊申请列表") + @Operation(summary = "查询会诊申请列表") @PostMapping("/query") public R> queryConsultationList(@RequestBody ConsultationRequestDto dto) { try { @@ -67,12 +68,12 @@ public class ConsultationController { /** * 分页查询会诊申请列表(支持多条件查询) */ - @ApiOperation("分页查询会诊申请列表") + @Operation(summary = "分页查询会诊申请列表") @PostMapping("/queryPage") public R> queryConsultationListPage( @RequestBody ConsultationRequestDto dto, - @ApiParam("页码") @RequestParam(required = false, defaultValue = "1") Integer pageNum, - @ApiParam("每页大小") @RequestParam(required = false, defaultValue = "10") Integer pageSize) { + @Parameter(description = "页码") @RequestParam(required = false, defaultValue = "1") Integer pageNum, + @Parameter(description = "每页大小") @RequestParam(required = false, defaultValue = "10") Integer pageSize) { try { log.info("分页查询会诊申请列表,pageNum: {}, pageSize: {}", pageNum, pageSize); com.baomidou.mybatisplus.extension.plugins.pagination.Page page = @@ -87,7 +88,7 @@ public class ConsultationController { /** * 保存会诊申请 */ - @ApiOperation("保存会诊申请") + @Operation(summary = "保存会诊申请") @PostMapping("/save") public R saveConsultation(@RequestBody ConsultationRequestDto dto) { try { @@ -102,10 +103,10 @@ public class ConsultationController { /** * 提交会诊申请 */ - @ApiOperation("提交会诊申请") + @Operation(summary = "提交会诊申请") @PostMapping("/submit") public R submitConsultation( - @ApiParam("会诊申请单号") @RequestParam String consultationId) { + @Parameter(description = "会诊申请单号") @RequestParam String consultationId) { try { Boolean result = consultationAppService.submitConsultation(consultationId); return result ? R.ok("提交成功") : R.fail("提交失败"); @@ -118,11 +119,11 @@ public class ConsultationController { /** * 作废会诊申请 */ - @ApiOperation("作废会诊申请") + @Operation(summary = "作废会诊申请") @PostMapping("/cancel") public R cancelConsultation( - @ApiParam("会诊申请单号") @RequestParam String consultationId, - @ApiParam("作废原因") @RequestParam(required = false) String cancelReason) { + @Parameter(description = "会诊申请单号") @RequestParam String consultationId, + @Parameter(description = "作废原因") @RequestParam(required = false) String cancelReason) { try { Boolean result = consultationAppService.cancelConsultation(consultationId, cancelReason); return result ? R.ok("作废成功") : R.fail("作废失败"); @@ -135,10 +136,10 @@ public class ConsultationController { /** * 结束会诊申请 */ - @ApiOperation("结束会诊申请") + @Operation(summary = "结束会诊申请") @PostMapping("/complete") public R completeConsultation( - @ApiParam("会诊申请单号") @RequestParam String consultationId) { + @Parameter(description = "会诊申请单号") @RequestParam String consultationId) { try { Boolean result = consultationAppService.completeConsultation(consultationId); return result ? R.ok("结束成功") : R.fail("结束失败"); @@ -151,7 +152,7 @@ public class ConsultationController { /** * 获取科室医生树 */ - @ApiOperation("获取科室医生树") + @Operation(summary = "获取科室医生树") @GetMapping("/departmentTree") public R> getDepartmentTree() { try { @@ -166,10 +167,10 @@ public class ConsultationController { /** * 获取主诊断 */ - @ApiOperation("获取主诊断") + @Operation(summary = "获取主诊断") @GetMapping("/mainDiagnosis") public R> getMainDiagnosis( - @ApiParam("就诊ID") @RequestParam Long encounterId) { + @Parameter(description = "就诊ID") @RequestParam Long encounterId) { try { Map diagnosis = consultationAppService.getMainDiagnosis(encounterId); return R.ok(diagnosis); @@ -182,7 +183,7 @@ public class ConsultationController { /** * 获取我的会诊邀请列表 */ - @ApiOperation("获取我的会诊邀请列表") + @Operation(summary = "获取我的会诊邀请列表") @GetMapping("/myInvitations") public R> getMyInvitations() { try { @@ -197,7 +198,7 @@ public class ConsultationController { /** * 获取所有会诊项目及价格 */ - @ApiOperation("获取所有会诊项目及价格") + @Operation(summary = "获取所有会诊项目及价格") @GetMapping("/activities") public R> getConsultationActivities() { try { @@ -214,7 +215,7 @@ public class ConsultationController { /** * 获取待确认的会诊列表(当前医生被邀请的会诊) */ - @ApiOperation("获取待确认的会诊列表") + @Operation(summary = "获取待确认的会诊列表") @GetMapping("/confirmation/pending") public R> getPendingConfirmationList() { try { @@ -229,7 +230,7 @@ public class ConsultationController { /** * 确认会诊 */ - @ApiOperation("确认会诊") + @Operation(summary = "确认会诊") @PostMapping("/confirmation/confirm") public R confirmConsultation(@RequestBody ConsultationConfirmationDto dto) { try { @@ -244,9 +245,9 @@ public class ConsultationController { /** * 取消确认会诊 */ - @ApiOperation("取消确认会诊") + @Operation(summary = "取消确认会诊") @PostMapping("/confirmation/cancelConfirm") - public R cancelConfirmation(@ApiParam("会诊申请单号") @RequestParam String consultationId) { + public R cancelConfirmation(@Parameter(description = "会诊申请单号") @RequestParam String consultationId) { try { Boolean result = consultationAppService.cancelConfirmation(consultationId); return result ? R.ok("取消确认成功") : R.fail("取消确认失败"); @@ -259,9 +260,9 @@ public class ConsultationController { /** * 签名会诊 */ - @ApiOperation("签名会诊") + @Operation(summary = "签名会诊") @PostMapping("/confirmation/sign") - public R signConsultation(@ApiParam("会诊申请单号") @RequestParam String consultationId) { + public R signConsultation(@Parameter(description = "会诊申请单号") @RequestParam String consultationId) { try { Boolean result = consultationAppService.signConsultation(consultationId); return result ? R.ok("签名成功") : R.fail("签名失败"); @@ -274,10 +275,10 @@ public class ConsultationController { /** * 获取会诊确认详情 */ - @ApiOperation("获取会诊确认详情") + @Operation(summary = "获取会诊确认详情") @GetMapping("/confirmation/detail") public R getConfirmationDetail( - @ApiParam("会诊申请单号") @RequestParam String consultationId) { + @Parameter(description = "会诊申请单号") @RequestParam String consultationId) { try { ConsultationConfirmationDto detail = consultationAppService.getConfirmationDetail(consultationId); return R.ok(detail); @@ -290,10 +291,10 @@ public class ConsultationController { /** * 获取会诊意见列表 */ - @ApiOperation("获取会诊意见列表") + @Operation(summary = "获取会诊意见列表") @GetMapping("/confirmation/opinions") public R> getConsultationOpinions( - @ApiParam("会诊申请单号") @RequestParam String consultationId) { + @Parameter(description = "会诊申请单号") @RequestParam String consultationId) { try { List opinions = consultationAppService.getConsultationOpinions(consultationId); return R.ok(opinions); @@ -306,10 +307,10 @@ public class ConsultationController { /** * 根据ID查询会诊申请详情 */ - @ApiOperation("根据ID查询会诊申请详情") + @Operation(summary = "根据ID查询会诊申请详情") @GetMapping("/detail/{id}") public R getConsultationById( - @ApiParam("会诊申请ID") @PathVariable Long id) { + @Parameter(description = "会诊申请ID") @PathVariable Long id) { try { ConsultationRequestDto detail = consultationAppService.getConsultationById(id); return R.ok(detail); diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/ConsultationConfirmationDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/ConsultationConfirmationDto.java index 1550db044..c3289978c 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/ConsultationConfirmationDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/ConsultationConfirmationDto.java @@ -1,8 +1,7 @@ package com.openhis.web.consultation.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @@ -15,115 +14,115 @@ import java.util.Date; * @date 2026-02-06 */ @Data -@ApiModel("会诊确认DTO") +@Schema(description = "会诊确认DTO") public class ConsultationConfirmationDto implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty("主键ID") + @Schema(description = "主键ID") private Long id; - @ApiModelProperty("会诊申请ID") + @Schema(description = "会诊申请ID") private Long consultationRequestId; - @ApiModelProperty("会诊申请单号") + @Schema(description = "会诊申请单号") private String consultationId; - @ApiModelProperty("确认医生ID") + @Schema(description = "确认医生ID") private Long confirmingPhysicianId; - @ApiModelProperty("确认医生姓名") + @Schema(description = "确认医生姓名") private String confirmingPhysicianName; - @ApiModelProperty("代表科室ID") + @Schema(description = "代表科室ID") private Long confirmingDeptId; - @ApiModelProperty("代表科室名称") + @Schema(description = "代表科室名称") private String confirmingDeptName; - @ApiModelProperty("确认日期") + @Schema(description = "确认日期") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date confirmingDate; - @ApiModelProperty("会诊状态:0-取消确认,20-已确认,30-已签名,40-已完成") + @Schema(description = "会诊状态:0-取消确认,20-已确认,30-已签名,40-已完成") private Integer consultationStatus; - @ApiModelProperty("会诊意见") + @Schema(description = "会诊意见") private String consultationOpinion; - @ApiModelProperty("会诊确认参加医师") + @Schema(description = "会诊确认参加医师") private String confirmingPhysician; - @ApiModelProperty("签名医生姓名") + @Schema(description = "签名医生姓名") private String signature; - @ApiModelProperty("签名医生ID") + @Schema(description = "签名医生ID") private Long signaturePhysicianId; - @ApiModelProperty("签名时间") + @Schema(description = "签名时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date signatureDate; - @ApiModelProperty("备注") + @Schema(description = "备注") private String remark; // ========== 扩展字段(用于前端显示) ========== - @ApiModelProperty("患者姓名") + @Schema(description = "患者姓名") private String patientName; - @ApiModelProperty("性别") + @Schema(description = "性别") private String genderText; - @ApiModelProperty("年龄") + @Schema(description = "年龄") private Integer age; - @ApiModelProperty("就诊卡号") + @Schema(description = "就诊卡号") private String patientIdentifierNo; - @ApiModelProperty("申请科室") + @Schema(description = "申请科室") private String applyDept; - @ApiModelProperty("申请医师") + @Schema(description = "申请医师") private String applyDoctor; - @ApiModelProperty("申请时间") + @Schema(description = "申请时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date applyTime; - @ApiModelProperty("会诊时间") + @Schema(description = "会诊时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date consultationDate; - @ApiModelProperty("紧急标志") + @Schema(description = "紧急标志") private Boolean urgent; - @ApiModelProperty("会诊邀请对象") + @Schema(description = "会诊邀请对象") private String invitedObject; - @ApiModelProperty("病史及目的") + @Schema(description = "病史及目的") private String consultationPurpose; - @ApiModelProperty("门诊诊断") + @Schema(description = "门诊诊断") private String provisionalDiagnosis; - @ApiModelProperty("提交医生") + @Schema(description = "提交医生") private String submittingPhysician; - @ApiModelProperty("提交时间") + @Schema(description = "提交时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date submittingTime; // ========== 当前医生的个人状态 ========== - @ApiModelProperty("当前医生的邀请状态:0-待确认,1-已确认,2-已拒绝,3-已签名") + @Schema(description = "当前医生的邀请状态:0-待确认,1-已确认,2-已拒绝,3-已签名") private Integer myInvitedStatus; - @ApiModelProperty("当前医生的确认时间") + @Schema(description = "当前医生的确认时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date myConfirmTime; - @ApiModelProperty("当前医生的签名时间") + @Schema(description = "当前医生的签名时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date mySignatureTime; } diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/ConsultationOpinionDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/ConsultationOpinionDto.java index 6c41c980d..d9cabd852 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/ConsultationOpinionDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/dto/ConsultationOpinionDto.java @@ -1,8 +1,7 @@ package com.openhis.web.consultation.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @@ -15,38 +14,38 @@ import java.util.Date; * @date 2026-02-09 */ @Data -@ApiModel("会诊意见DTO") +@Schema(description = "会诊意见DTO") public class ConsultationOpinionDto implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty("医生ID") + @Schema(description = "医生ID") private Long physicianId; - @ApiModelProperty("医生姓名") + @Schema(description = "医生姓名") private String physicianName; - @ApiModelProperty("科室ID") + @Schema(description = "科室ID") private Long deptId; - @ApiModelProperty("科室名称") + @Schema(description = "科室名称") private String deptName; - @ApiModelProperty("会诊意见(已包含科室-医生前缀)") + @Schema(description = "会诊意见(已包含科室-医生前缀)") private String opinion; - @ApiModelProperty("确认时间") + @Schema(description = "确认时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date confirmTime; - @ApiModelProperty("签名时间") + @Schema(description = "签名时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date signatureTime; - @ApiModelProperty("状态:0-待确认,1-已确认,2-已拒绝,3-已签名") + @Schema(description = "状态:0-待确认,1-已确认,2-已拒绝,3-已签名") private Integer status; - @ApiModelProperty("是否已签名") + @Schema(description = "是否已签名") private Boolean isSigned; } diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDeviceManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDeviceManageAppService.java index 1406c0994..b1ef7781b 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDeviceManageAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDeviceManageAppService.java @@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiagTreatMAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiagTreatMAppService.java index 6e04b9c3f..8a2c63ad1 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiagTreatMAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiagTreatMAppService.java @@ -5,8 +5,8 @@ import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam; import com.openhis.web.datadictionary.dto.DiagnosisTreatmentUpDto; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiseaseManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiseaseManageAppService.java index 6ce30f172..e34fc5b7d 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiseaseManageAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiseaseManageAppService.java @@ -4,7 +4,7 @@ import com.core.common.core.domain.R; import com.openhis.web.datadictionary.dto.DiseaseManageSelParam; import com.openhis.web.datadictionary.dto.DiseaseManageUpDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IMedicationManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IMedicationManageAppService.java index 9ceb08496..21f271492 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IMedicationManageAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IMedicationManageAppService.java @@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ISupplierManagementAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ISupplierManagementAppService.java index e6c9e114b..9a0c03e8a 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ISupplierManagementAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ISupplierManagementAppService.java @@ -9,7 +9,7 @@ import com.openhis.web.datadictionary.dto.SupplierUpDto; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestBody; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java index 656afcf58..d00bf96f6 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java @@ -43,9 +43,9 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.*; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java index 2dc94b6c3..c9ca457e9 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java @@ -35,9 +35,9 @@ import com.openhis.yb.service.YbManager; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiseaseManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiseaseManageAppServiceImpl.java index 2f2f62a3c..a5863d37c 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiseaseManageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiseaseManageAppServiceImpl.java @@ -26,7 +26,7 @@ import com.openhis.web.datadictionary.dto.DiseaseManageUpDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.HashSet; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ICDCodeServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ICDCodeServiceImpl.java index 0e17df302..9f1cf3fa1 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ICDCodeServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ICDCodeServiceImpl.java @@ -17,7 +17,7 @@ import com.openhis.web.datadictionary.dto.ICDCodeDto; import com.openhis.web.datadictionary.dto.ICDCodeUpdateDto; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.Arrays; import java.util.HashSet; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionAppServiceImpl.java index 158bee113..0c77b8062 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionAppServiceImpl.java @@ -22,7 +22,7 @@ import com.openhis.web.datadictionary.dto.ItemDefinitionDto; import com.openhis.web.datadictionary.mapper.ItemDefinitionAppMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.util.Arrays; import java.util.HashSet; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java index 4b569ac05..8362ea5e8 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java @@ -16,7 +16,7 @@ import com.openhis.web.datadictionary.appservice.IItemDefinitionService; import com.openhis.web.datadictionary.dto.ItemUpFromDirectoryDto; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java index 89c06f18e..c40165419 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java @@ -46,9 +46,9 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/SupplierManagementAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/SupplierManagementAppServiceImpl.java index 8e8977123..3cced248c 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/SupplierManagementAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/SupplierManagementAppServiceImpl.java @@ -32,7 +32,7 @@ import com.openhis.web.datadictionary.dto.SupplierUpDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.HashSet; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DeviceManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DeviceManageController.java index d2dd38aa0..43d67b91f 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DeviceManageController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DeviceManageController.java @@ -10,9 +10,9 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java index e18af6783..5b9be0b28 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java @@ -13,9 +13,9 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java index 638e9788a..dcced5d7c 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java @@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ICDCodeController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ICDCodeController.java index 5ad23187d..40c5cb553 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ICDCodeController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ICDCodeController.java @@ -9,7 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; @RestController @RequestMapping("/base-data-manage/ICD10") diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/MedicationManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/MedicationManageController.java index 21ba07aed..71d0e40f9 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/MedicationManageController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/MedicationManageController.java @@ -10,9 +10,9 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java index 5b63c97be..7f4b26293 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java @@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java index 402654cc9..88fc7f471 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java @@ -6,7 +6,7 @@ import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import java.math.BigDecimal; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java index 7151dd3af..37da0e640 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java @@ -7,7 +7,7 @@ import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import java.math.BigDecimal; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageUpDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageUpDto.java index 842b73181..255c7bc4e 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageUpDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageUpDto.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; /** * 疾病目录更新Dto diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeAddDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeAddDto.java index 7b80d298a..f17ed68d3 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeAddDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeAddDto.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Data @Accessors(chain = true) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeUpdateDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeUpdateDto.java index 5db209019..7f0fdd4e0 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeUpdateDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeUpdateDto.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; @Data @Accessors(chain = true) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java index 2041e192a..2311b3764 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java @@ -7,7 +7,7 @@ import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import java.math.BigDecimal; import java.util.Date; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierUpDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierUpDto.java index 504cf2c5f..723b959f9 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierUpDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierUpDto.java @@ -8,8 +8,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; /** * 供应商保存dto diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/debug/DebugController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/debug/DebugController.java index 5837769b6..4d57ec8eb 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/debug/DebugController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/debug/DebugController.java @@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * 调试控制器 - 用于检查API返回数据 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentCommonService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentCommonService.java index 6522449a6..799b8012c 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentCommonService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentCommonService.java @@ -4,7 +4,7 @@ import com.core.common.core.domain.R; import com.openhis.web.departmentmanage.dto.DepartmentInitDto; import com.openhis.web.departmentmanage.dto.DepartmentSearchParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 科室材料共通方法 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentCommonServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentCommonServiceImpl.java index f80c77533..a421778f2 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentCommonServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentCommonServiceImpl.java @@ -27,8 +27,8 @@ import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentIssuanceOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentIssuanceOrderServiceImpl.java index a6fe86d23..216b996d2 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentIssuanceOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentIssuanceOrderServiceImpl.java @@ -18,7 +18,7 @@ import com.openhis.workflow.service.ISupplyDeliveryService; import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentProfitLossOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentProfitLossOrderServiceImpl.java index b92a8177c..214c4c5db 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentProfitLossOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentProfitLossOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentReceiptApprovalServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentReceiptApprovalServiceImpl.java index c09057010..fd3ed04b4 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentReceiptApprovalServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentReceiptApprovalServiceImpl.java @@ -39,7 +39,7 @@ import com.openhis.yb.service.YbManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.*; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentRequisitionOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentRequisitionOrderServiceImpl.java index 80d26a1bd..a2ff43bcf 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentRequisitionOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentRequisitionOrderServiceImpl.java @@ -19,7 +19,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentReturnToWarehouseOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentReturnToWarehouseOrderServiceImpl.java index 4aa3f3209..5b047251b 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentReturnToWarehouseOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentReturnToWarehouseOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentStockInOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentStockInOrderServiceImpl.java index d91ab622f..56eb89da5 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentStockInOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentStockInOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentStocktakingOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentStocktakingOrderServiceImpl.java index 4ac7dbeeb..d0e6d3558 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentStocktakingOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentStocktakingOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentTransferInOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentTransferInOrderServiceImpl.java index 5dede95fa..7dde76e18 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentTransferInOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentTransferInOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentTransferOutOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentTransferOutOrderServiceImpl.java index e4af52266..1ac3c6ce2 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentTransferOutOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentTransferOutOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentIssuanceOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentIssuanceOrderController.java index fa4ca9fce..a3e4807ba 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentIssuanceOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentIssuanceOrderController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 科室材料发出单 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentProfitLossOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentProfitLossOrderController.java index 815650aec..051861888 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentProfitLossOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentProfitLossOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentRequisitionOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentRequisitionOrderController.java index e1399bfb1..4138ab1d2 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentRequisitionOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentRequisitionOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentReturnToWarehouseOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentReturnToWarehouseOrderController.java index 1a254aea8..b09977f0f 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentReturnToWarehouseOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentReturnToWarehouseOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentStockInOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentStockInOrderController.java index 880503a30..024e90b3d 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentStockInOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentStockInOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentStocktakingOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentStocktakingOrderController.java index c69284ca4..c88275eb6 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentStocktakingOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentStocktakingOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentTransferInOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentTransferInOrderController.java index 74aa01b9e..82218f908 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentTransferInOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentTransferInOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentTransferOutOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentTransferOutOrderController.java index 30573d607..a018e6bf7 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentTransferOutOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/controller/DepartmentTransferOutOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationDiagnosisAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationDiagnosisAppService.java index e93827243..a770f8bda 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationDiagnosisAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationDiagnosisAppService.java @@ -7,7 +7,7 @@ import com.openhis.web.doctorstation.dto.DiagnosisBelongBindingDto; import com.openhis.web.doctorstation.dto.InfectiousDiseaseReportDto; import com.openhis.web.doctorstation.dto.SaveDiagnosisParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 医生站-诊断 应用Service diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationMainAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationMainAppService.java index 907c11c36..1f12b2c13 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationMainAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationMainAppService.java @@ -7,7 +7,7 @@ import com.openhis.web.doctorstation.dto.PrescriptionInfoBaseDto; import com.openhis.web.doctorstation.dto.PrescriptionInfoDetailDto; import com.openhis.web.doctorstation.dto.ReceptionStatisticsDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IReservationRecordAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IReservationRecordAppService.java index b6b57efdc..f138619fa 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IReservationRecordAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IReservationRecordAppService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.core.common.core.domain.R; import com.openhis.web.doctorstation.dto.ReservationRecordDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 医生站-预约记录 应用Service diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/ITodayOutpatientService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/ITodayOutpatientService.java index 69d656284..149ad5418 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/ITodayOutpatientService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/ITodayOutpatientService.java @@ -6,7 +6,7 @@ import com.openhis.web.doctorstation.dto.TodayOutpatientPatientDto; import com.openhis.web.doctorstation.dto.TodayOutpatientQueryParam; import com.openhis.web.doctorstation.dto.TodayOutpatientStatsDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorPhraseAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorPhraseAppServiceImpl.java index ff763be57..b0a0d5917 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorPhraseAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorPhraseAppServiceImpl.java @@ -10,7 +10,7 @@ import com.openhis.web.doctorstation.appservice.IDoctorPhraseAppService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.List; @Slf4j diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java index 06fb95b75..abba50cf7 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java @@ -60,7 +60,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.openhis.document.domain.RequestForm; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.util.*; import java.util.regex.Matcher; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationChineseMedicalAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationChineseMedicalAppServiceImpl.java index e620735e0..60a5b2b82 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationChineseMedicalAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationChineseMedicalAppServiceImpl.java @@ -37,7 +37,7 @@ import com.openhis.web.doctorstation.utils.AdviceUtils; import com.openhis.workflow.service.IActivityDefinitionService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.*; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java index 2a1fd9356..45e25323a 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java @@ -34,8 +34,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.ZoneId; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationElepPrescriptionServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationElepPrescriptionServiceImpl.java index 49d37315a..fd5aa71ba 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationElepPrescriptionServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationElepPrescriptionServiceImpl.java @@ -33,7 +33,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationEmrAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationEmrAppServiceImpl.java index 386f4bb91..6cf654327 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationEmrAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationEmrAppServiceImpl.java @@ -33,7 +33,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java index 8fcd33f83..6cc046967 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java @@ -37,8 +37,8 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/ReservationRecordAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/ReservationRecordAppServiceImpl.java index 0e080bf9e..a57dc78f8 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/ReservationRecordAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/ReservationRecordAppServiceImpl.java @@ -15,8 +15,8 @@ import com.openhis.web.doctorstation.dto.ReservationRecordDto; import com.openhis.web.doctorstation.mapper.ReservationRecordAppMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.HashSet; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/TodayOutpatientServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/TodayOutpatientServiceImpl.java index 0357e03b0..246b02595 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/TodayOutpatientServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/TodayOutpatientServiceImpl.java @@ -19,8 +19,8 @@ import com.openhis.web.doctorstation.dto.TodayOutpatientStatsDto; import com.openhis.web.doctorstation.mapper.TodayOutpatientMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorPhraseController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorPhraseController.java index a1d959d68..cd4d4f14d 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorPhraseController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorPhraseController.java @@ -7,7 +7,7 @@ import com.openhis.web.doctorstation.appservice.IDoctorPhraseAppService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; @RestController @Slf4j diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationDiagnosisController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationDiagnosisController.java index 65943bbbc..990a002c0 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationDiagnosisController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationDiagnosisController.java @@ -16,7 +16,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationInspectionLabApplyController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationInspectionLabApplyController.java index 6677e0c84..806548fb4 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationInspectionLabApplyController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationInspectionLabApplyController.java @@ -7,7 +7,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.validation.annotation.Validated; import java.util.HashMap; import java.util.Map; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationMainController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationMainController.java index 7c3b28dac..c6c34051f 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationMainController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationMainController.java @@ -14,7 +14,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Map; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/ReservationRecordController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/ReservationRecordController.java index 6045bf871..4d3fe2e57 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/ReservationRecordController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/ReservationRecordController.java @@ -10,7 +10,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 医生站-预约记录 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/TodayOutpatientController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/TodayOutpatientController.java index 282c9204d..54eb405d4 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/TodayOutpatientController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/TodayOutpatientController.java @@ -9,8 +9,8 @@ import com.openhis.web.doctorstation.dto.TodayOutpatientQueryParam; import com.openhis.web.doctorstation.dto.TodayOutpatientStatsDto; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationLabApplyDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationLabApplyDto.java index fbbb07093..cc87999ee 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationLabApplyDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationLabApplyDto.java @@ -5,8 +5,8 @@ import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; import java.math.BigDecimal; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationLabApplyItemDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationLabApplyItemDto.java index e0e9401a9..85129bdb0 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationLabApplyItemDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationLabApplyItemDto.java @@ -5,9 +5,9 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.math.BigDecimal; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/EmrTemplateDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/EmrTemplateDto.java index a38375314..9d4e0cdbd 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/EmrTemplateDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/EmrTemplateDto.java @@ -7,7 +7,7 @@ import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import java.io.Serializable; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/InfectiousDiseaseReportDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/InfectiousDiseaseReportDto.java index bf50eb72d..0634c8f90 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/InfectiousDiseaseReportDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/InfectiousDiseaseReportDto.java @@ -6,8 +6,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Date; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientEmrDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientEmrDto.java index 56cc15007..e0de291a0 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientEmrDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientEmrDto.java @@ -7,7 +7,7 @@ import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/AdviceUtils.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/AdviceUtils.java index 776f345c3..07bed3b53 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/AdviceUtils.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/AdviceUtils.java @@ -31,7 +31,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; import java.text.SimpleDateFormat; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/PrescriptionUtils.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/PrescriptionUtils.java index 484b32657..594ecafd9 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/PrescriptionUtils.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/PrescriptionUtils.java @@ -5,7 +5,7 @@ import com.openhis.common.enums.AssignSeqEnum; import com.openhis.web.doctorstation.dto.AdviceSaveDto; import org.springframework.stereotype.Component; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collections; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocRecordAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocRecordAppService.java index 8fed9276e..ee4bc0dfb 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocRecordAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocRecordAppService.java @@ -5,7 +5,7 @@ import com.openhis.web.document.dto.DocRecordDto; import com.openhis.web.document.dto.DocRecordPatientQueryParam; import com.openhis.web.document.dto.DocRecordQueryParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsAppService.java index 87124b44e..caad502ce 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsAppService.java @@ -4,7 +4,7 @@ import com.core.common.core.domain.R; import com.openhis.web.document.dto.DocStatisticsDto; import com.openhis.web.document.dto.DocStatisticsQueryParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsDefinitionAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsDefinitionAppService.java index 9a987dd3a..f4e31a85e 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsDefinitionAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsDefinitionAppService.java @@ -3,7 +3,7 @@ package com.openhis.web.document.appservice; import com.core.common.core.domain.R; import com.openhis.web.document.dto.DocStatisticsDefinitionDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocTemplateAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocTemplateAppService.java index 7edbb6b89..0ef4357ab 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocTemplateAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocTemplateAppService.java @@ -3,7 +3,7 @@ package com.openhis.web.document.appservice; import com.core.common.core.domain.R; import com.openhis.web.document.dto.DocTemplateDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 文书模板-一 业务接口 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocDefinitionAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocDefinitionAppServiceImpl.java index 821027c72..a51d2d868 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocDefinitionAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocDefinitionAppServiceImpl.java @@ -23,7 +23,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocDefinitionOrganizationAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocDefinitionOrganizationAppServiceImpl.java index f27a2b336..60e40607d 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocDefinitionOrganizationAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocDefinitionOrganizationAppServiceImpl.java @@ -9,7 +9,7 @@ import com.openhis.web.document.dto.DocDefinitionOrganizationDto; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocRecordAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocRecordAppServiceImpl.java index cb8a22d9c..c0a010dc1 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocRecordAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocRecordAppServiceImpl.java @@ -32,8 +32,8 @@ import org.springframework.jdbc.core.BatchPreparedStatementSetter; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsAppServiceImpl.java index 9f0edd3dc..079331b05 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsAppServiceImpl.java @@ -19,8 +19,8 @@ import com.openhis.web.document.dto.DocStatisticsQueryParam; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsDefinitionAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsDefinitionAppServiceImpl.java index 21f7f552a..40f0e389a 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsDefinitionAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsDefinitionAppServiceImpl.java @@ -21,8 +21,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.*; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocTemplateAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocTemplateAppServiceImpl.java index d2344a986..e20b8a2e4 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocTemplateAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocTemplateAppServiceImpl.java @@ -17,8 +17,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocRecordController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocRecordController.java index fe697295a..16b0ff3bc 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocRecordController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocRecordController.java @@ -12,7 +12,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsController.java index 93f7b4338..a19cca63e 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsController.java @@ -8,7 +8,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsDefinitionController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsDefinitionController.java index 33026be9f..1f44ff7df 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsDefinitionController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsDefinitionController.java @@ -9,7 +9,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocTemplateController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocTemplateController.java index 10ffd5501..7bb5d646b 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocTemplateController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocTemplateController.java @@ -10,7 +10,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.HashMap; import java.util.Map; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/ConvertToDocStatistics.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/ConvertToDocStatistics.java index 79fc9313b..99fa8cc0d 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/ConvertToDocStatistics.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/ConvertToDocStatistics.java @@ -11,7 +11,7 @@ import com.openhis.web.document.dto.DocStatisticsDefinitionDto; import com.openhis.web.document.dto.DocStatisticsDto; import org.springframework.stereotype.Component; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/IAdvancePaymentManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/IAdvancePaymentManageAppService.java index 75dd02b52..9eb7b5572 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/IAdvancePaymentManageAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/IAdvancePaymentManageAppService.java @@ -6,7 +6,7 @@ import com.openhis.web.inhospitalcharge.dto.AdvancePaymentFlowRecordDto; import com.openhis.web.inhospitalcharge.dto.AdvancePaymentInAndOutDto; import com.openhis.web.inhospitalcharge.dto.AdvancePaymentInfoDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/IInHospitalRegisterAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/IInHospitalRegisterAppService.java index efabcb3d7..8a7e9c9c8 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/IInHospitalRegisterAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/IInHospitalRegisterAppService.java @@ -5,7 +5,7 @@ import com.core.common.core.domain.R; import com.openhis.web.common.dto.LocationDto; import com.openhis.web.inhospitalcharge.dto.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.HashMap; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/impl/AdvancePaymentManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/impl/AdvancePaymentManageAppServiceImpl.java index 4f03ba53c..c5f8cfce2 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/impl/AdvancePaymentManageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/impl/AdvancePaymentManageAppServiceImpl.java @@ -28,8 +28,8 @@ import com.openhis.web.inhospitalcharge.mapper.AdvancePaymentManageAppMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.*; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java index b7f2c6461..f3d6438ca 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java @@ -33,8 +33,8 @@ import com.openhis.yb.service.YbManager; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.*; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/controller/AdvancePaymentManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/controller/AdvancePaymentManageController.java index 1b0c468c3..139909bb3 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/controller/AdvancePaymentManageController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/controller/AdvancePaymentManageController.java @@ -11,7 +11,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 预交金管理 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/controller/InHospitalRegisterController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/controller/InHospitalRegisterController.java index 24b459ac0..021ee1a39 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/controller/InHospitalRegisterController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/controller/InHospitalRegisterController.java @@ -10,7 +10,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 住院登记 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IATDManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IATDManageAppService.java index 0f9cc0439..12b141043 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IATDManageAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IATDManageAppService.java @@ -8,7 +8,7 @@ import com.openhis.web.inhospitalnursestation.dto.AdmissionPageParam; import com.openhis.web.inhospitalnursestation.dto.AdmissionPatientInfoDto; import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 入出转管理 service diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IAdviceProcessAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IAdviceProcessAppService.java index 0a77dfbfa..25549d5fb 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IAdviceProcessAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IAdviceProcessAppService.java @@ -9,7 +9,7 @@ import com.openhis.web.inhospitalnursestation.dto.AdmissionPageParam; import com.openhis.web.inhospitalnursestation.dto.AdviceExecuteParam; import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IMedicineSummaryAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IMedicineSummaryAppService.java index e80f0ed6f..9772e3e75 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IMedicineSummaryAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IMedicineSummaryAppService.java @@ -4,7 +4,7 @@ import com.core.common.core.domain.R; import com.openhis.web.inhospitalnursestation.dto.DispenseFormSearchParam; import com.openhis.web.inhospitalnursestation.dto.MedicineSummaryParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/INurseBillingAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/INurseBillingAppService.java index 67469b511..89b74b9d4 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/INurseBillingAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/INurseBillingAppService.java @@ -6,8 +6,8 @@ import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceParam; import com.openhis.web.regdoctorstation.dto.AdviceBatchOpParam; import com.openhis.web.regdoctorstation.dto.RegAdviceSaveParam; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.time.LocalDateTime; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IOrgDeviceStockTakeAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IOrgDeviceStockTakeAppService.java index b5172286f..c2288bead 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IOrgDeviceStockTakeAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IOrgDeviceStockTakeAppService.java @@ -4,7 +4,7 @@ import com.core.common.core.domain.R; import com.openhis.web.inhospitalnursestation.dto.OrgDeviceSummaryParam; import org.springframework.web.bind.annotation.RequestParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java index 38cac4702..8481f7a44 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java @@ -45,9 +45,9 @@ import com.openhis.workflow.service.IServiceRequestService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java index cb6d5003b..cb94a1a05 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java @@ -49,8 +49,8 @@ import com.openhis.workflow.domain.ServiceRequest; import com.openhis.workflow.service.*; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDateTime; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/EncounterAutoRollAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/EncounterAutoRollAppServiceImpl.java index cf1f44fef..2ab4d6e4c 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/EncounterAutoRollAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/EncounterAutoRollAppServiceImpl.java @@ -21,7 +21,7 @@ import com.openhis.web.inhospitalnursestation.dto.*; import com.openhis.web.inhospitalnursestation.mapper.EncounterAutoRollAppMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.Date; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java index 74111116d..0c6cf3418 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java @@ -27,8 +27,8 @@ import com.openhis.workflow.service.ISupplyDeliveryService; import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/NurseBillingAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/NurseBillingAppService.java index 1ddf9bcc8..c6f9a93b5 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/NurseBillingAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/NurseBillingAppService.java @@ -40,9 +40,9 @@ import com.openhis.workflow.service.IServiceRequestService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.*; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/OrgDeviceStockTakeAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/OrgDeviceStockTakeAppServiceImpl.java index e76395aef..1fba739e9 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/OrgDeviceStockTakeAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/OrgDeviceStockTakeAppServiceImpl.java @@ -26,8 +26,8 @@ import com.openhis.workflow.service.ISupplyDeliveryService; import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/ATDManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/ATDManageController.java index bd9578211..62bd6b661 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/ATDManageController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/ATDManageController.java @@ -12,8 +12,8 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; /** * 入出转管理 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/AdviceProcessController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/AdviceProcessController.java index fd2d0439c..dd5b68400 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/AdviceProcessController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/AdviceProcessController.java @@ -13,8 +13,8 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/EncounterAutoRollAppController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/EncounterAutoRollAppController.java index e703922d6..56007b601 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/EncounterAutoRollAppController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/EncounterAutoRollAppController.java @@ -8,7 +8,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * 住院就诊滚方 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/MedicineSummaryController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/MedicineSummaryController.java index d56b5d55e..875197d3f 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/MedicineSummaryController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/MedicineSummaryController.java @@ -8,8 +8,8 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/NurseBillingController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/NurseBillingController.java index 0e5205717..447c493cd 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/NurseBillingController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/NurseBillingController.java @@ -11,9 +11,9 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.time.LocalDateTime; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/OrgDeviceStockTakeController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/OrgDeviceStockTakeController.java index 994fad50d..2e7275e92 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/OrgDeviceStockTakeController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/OrgDeviceStockTakeController.java @@ -7,8 +7,8 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IDepositAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IDepositAppService.java index 81ae6830d..1752e6e87 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IDepositAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IDepositAppService.java @@ -4,7 +4,7 @@ import com.core.common.core.domain.R; import com.openhis.web.inpatientmanage.dto.DepositSearchParam; import com.openhis.yb.dto.PaymentDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 住院登记 应用实现 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/INursingRecordAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/INursingRecordAppService.java index 178ecac10..84aaae879 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/INursingRecordAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/INursingRecordAppService.java @@ -5,7 +5,7 @@ import com.openhis.web.inpatientmanage.dto.NursingEmrTemplateDto; import com.openhis.web.inpatientmanage.dto.NursingRecordDto; import com.openhis.web.inpatientmanage.dto.NursingSearchParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IPatientHomeAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IPatientHomeAppService.java index 941498a21..3d5e663a0 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IPatientHomeAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IPatientHomeAppService.java @@ -4,7 +4,7 @@ import com.core.common.core.domain.R; import com.openhis.web.chargemanage.dto.OrgMetadata; import com.openhis.web.inpatientmanage.dto.PatientHomeSearchParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IVitalSignsAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IVitalSignsAppService.java index 272b13157..74382ca6a 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IVitalSignsAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IVitalSignsAppService.java @@ -5,7 +5,7 @@ import com.openhis.web.inpatientmanage.dto.VitalSignsDeleteDto; import com.openhis.web.inpatientmanage.dto.VitalSignsSaveDto; import com.openhis.web.inpatientmanage.dto.VitalSignsSearchParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/DepositAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/DepositAppServiceImpl.java index 45ef481cf..e49873aa2 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/DepositAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/DepositAppServiceImpl.java @@ -36,8 +36,8 @@ import com.openhis.yb.dto.PaymentDetailDto; import com.openhis.yb.dto.PaymentDto; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.*; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/NursingRecordAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/NursingRecordAppServiceImpl.java index 347f36b17..64c2279a9 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/NursingRecordAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/NursingRecordAppServiceImpl.java @@ -31,8 +31,8 @@ import com.openhis.web.inpatientmanage.mapper.NursingRecordAppMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.HashSet; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/PatientHomeAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/PatientHomeAppServiceImpl.java index 48acbea7e..f1c283a33 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/PatientHomeAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/PatientHomeAppServiceImpl.java @@ -26,8 +26,8 @@ import com.openhis.web.inpatientmanage.dto.PatientHomeSearchParam; import com.openhis.web.inpatientmanage.mapper.PatientHomeAppMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.*; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/VitalSignsAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/VitalSignsAppServiceImpl.java index bd7b83b43..5fd6e1a93 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/VitalSignsAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/VitalSignsAppServiceImpl.java @@ -23,8 +23,8 @@ import com.openhis.web.inpatientmanage.mapper.VitalSignsAppMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/DepositController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/DepositController.java index 1ac15f3dd..1bb7596f5 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/DepositController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/DepositController.java @@ -8,8 +8,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; /** * 预交金管理 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/NursingRecordController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/NursingRecordController.java index 0fb03f934..51ac7e545 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/NursingRecordController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/NursingRecordController.java @@ -9,8 +9,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/PatientHomeController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/PatientHomeController.java index 8f2351eb0..3ac6b987b 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/PatientHomeController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/PatientHomeController.java @@ -8,8 +8,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/VitalSignsController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/VitalSignsController.java index 332546fb7..00d351d0c 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/VitalSignsController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/VitalSignsController.java @@ -9,8 +9,8 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositDetailDto.java index f3746bbaf..a2c05484f 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositDetailDto.java @@ -7,7 +7,7 @@ import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.Date; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositPaymentDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositPaymentDto.java index b256553c8..7fad7bd43 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositPaymentDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositPaymentDto.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingDetailDto.java index 32305d306..2e1f791d0 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingDetailDto.java @@ -7,7 +7,7 @@ import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.Date; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingEmrTemplateDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingEmrTemplateDto.java index ae7fb3836..07d874dad 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingEmrTemplateDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingEmrTemplateDto.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import java.io.Serializable; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingPageDto.java index 48d87bf9e..b0f994bed 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingPageDto.java @@ -7,7 +7,7 @@ import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.Date; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingRecordDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingRecordDto.java index 381640264..404c2ba89 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingRecordDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingRecordDto.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.Date; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryAdjustPriceService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryAdjustPriceService.java index 79d85f493..a69ec1acc 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryAdjustPriceService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryAdjustPriceService.java @@ -3,7 +3,7 @@ package com.openhis.web.inventorymanage.appservice; import com.core.common.core.domain.R; import com.openhis.web.adjustprice.dto.AdjustPriceManagerSearchParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Desc: diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryDetailsAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryDetailsAppService.java index bd89862fc..4c72ea558 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryDetailsAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryDetailsAppService.java @@ -6,7 +6,7 @@ package com.openhis.web.inventorymanage.appservice; import com.core.common.core.domain.R; import com.openhis.web.inventorymanage.dto.InventoryDetailsSearchParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 库存相关明细查询 service diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/ILossReportFormAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/ILossReportFormAppService.java index 01b635764..6558cf024 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/ILossReportFormAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/ILossReportFormAppService.java @@ -8,8 +8,8 @@ import com.openhis.web.inventorymanage.dto.LossReceiptDetailDto; import com.openhis.web.inventorymanage.dto.LossReportFormDto; import com.openhis.web.inventorymanage.dto.LossReportSearchParam; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductDetailAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductDetailAppService.java index bad07632b..a8399b26c 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductDetailAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductDetailAppService.java @@ -5,8 +5,8 @@ import com.core.common.core.domain.R; import com.openhis.web.inventorymanage.dto.ProductDetailPageDto; import com.openhis.web.inventorymanage.dto.ProductDetailSearchParam; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductStocktakingAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductStocktakingAppService.java index f762ff1f2..15c0d4d18 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductStocktakingAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductStocktakingAppService.java @@ -9,8 +9,8 @@ import com.openhis.web.inventorymanage.dto.ProductStocktakingDto; import com.openhis.web.inventorymanage.dto.ProductStocktakingSearchParam; import com.openhis.web.inventorymanage.dto.StocktakingBatchSearchParam; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductTransferAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductTransferAppService.java index b53188a1a..770dbda0b 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductTransferAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductTransferAppService.java @@ -8,8 +8,8 @@ import com.openhis.web.inventorymanage.dto.BatchTransferSearchParam; import com.openhis.web.inventorymanage.dto.ProductTransferDto; import com.openhis.web.inventorymanage.dto.SupplySearchParam; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseInventoryAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseInventoryAppService.java index 67fa31625..24c0521df 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseInventoryAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseInventoryAppService.java @@ -7,8 +7,8 @@ import com.core.common.core.domain.R; import com.openhis.web.inventorymanage.dto.InventorySearchParam; import com.openhis.web.inventorymanage.dto.PurchaseInventoryDto; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseReturnAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseReturnAppService.java index c8bfe3f5a..270aa65b3 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseReturnAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IPurchaseReturnAppService.java @@ -6,7 +6,7 @@ package com.openhis.web.inventorymanage.appservice; import com.core.common.core.domain.R; import com.openhis.web.inventorymanage.dto.PurchaseReturnDetailDto; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReceiptApprovalAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReceiptApprovalAppService.java index 30732bb3b..b9b1ab777 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReceiptApprovalAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReceiptApprovalAppService.java @@ -8,8 +8,8 @@ import com.openhis.web.inventorymanage.dto.ItemChargeDetailDto; import com.openhis.web.inventorymanage.dto.ReceiptApprovalSearchParam; import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IRequisitionIssueAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IRequisitionIssueAppService.java index a9863b811..294825cba 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IRequisitionIssueAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IRequisitionIssueAppService.java @@ -7,8 +7,8 @@ import com.core.common.core.domain.R; import com.openhis.web.inventorymanage.dto.IssueDto; import com.openhis.web.inventorymanage.dto.IssueSearchParam; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReturnIssueAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReturnIssueAppService.java index 3f3f20ad7..7766a712c 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReturnIssueAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IReturnIssueAppService.java @@ -7,8 +7,8 @@ import com.core.common.core.domain.R; import com.openhis.web.inventorymanage.dto.IssueDto; import com.openhis.web.inventorymanage.dto.IssueSearchParam; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/ITraceNoAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/ITraceNoAppService.java index 391a4f162..b48da6157 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/ITraceNoAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/ITraceNoAppService.java @@ -8,7 +8,7 @@ import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto; import com.openhis.web.inventorymanage.dto.TraceNoInfoParam; import com.openhis.web.inventorymanage.dto.TraceNoSearchParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/IInventoryAdjustPriceServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/IInventoryAdjustPriceServiceImpl.java index 952e75f17..904da1564 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/IInventoryAdjustPriceServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/IInventoryAdjustPriceServiceImpl.java @@ -28,8 +28,8 @@ import com.openhis.web.inventorymanage.mapper.InventoryAdjustPriceMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.Date; import java.util.HashSet; import java.util.LinkedList; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/IInventorySettlementAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/IInventorySettlementAppServiceImpl.java index 079ed36aa..1de73bcfe 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/IInventorySettlementAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/IInventorySettlementAppServiceImpl.java @@ -26,7 +26,7 @@ import com.openhis.workflow.service.IInventoryItemService; import org.apache.commons.lang3.tuple.Pair; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.*; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/InventoryDetailsAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/InventoryDetailsAppServiceImpl.java index 819310722..1eadcfcd7 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/InventoryDetailsAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/InventoryDetailsAppServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.web.inventorymanage.mapper.InventoryDetailsMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.HashSet; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/LossReportFormAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/LossReportFormAppServiceImpl.java index ea821d078..314e29725 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/LossReportFormAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/LossReportFormAppServiceImpl.java @@ -27,9 +27,9 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.*; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductDetailAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductDetailAppServiceImpl.java index 74f599e1b..62247a726 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductDetailAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductDetailAppServiceImpl.java @@ -28,9 +28,9 @@ import com.openhis.workflow.domain.InventoryItem; import com.openhis.workflow.mapper.InventoryItemMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.*; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductStocktakingAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductStocktakingAppServiceImpl.java index d0842acdf..113da4343 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductStocktakingAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductStocktakingAppServiceImpl.java @@ -29,9 +29,9 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductTransferAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductTransferAppServiceImpl.java index c1e644e96..41c06fab0 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductTransferAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductTransferAppServiceImpl.java @@ -30,8 +30,8 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java index 7338a8c76..4993be252 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java @@ -28,9 +28,9 @@ import com.openhis.workflow.service.ISupplyRequestService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseReturnAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseReturnAppServiceImpl.java index f8ff8421a..a3b5f7b39 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseReturnAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseReturnAppServiceImpl.java @@ -28,7 +28,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java index a8db9d76e..4232e3150 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java @@ -46,8 +46,8 @@ import com.openhis.yb.service.YbManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.*; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/RequisitionIssueAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/RequisitionIssueAppServiceImpl.java index 33888bab9..940f0f2fc 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/RequisitionIssueAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/RequisitionIssueAppServiceImpl.java @@ -32,8 +32,8 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReturnIssueAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReturnIssueAppServiceImpl.java index 0811fa4a6..e7cc29c0a 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReturnIssueAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReturnIssueAppServiceImpl.java @@ -25,8 +25,8 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/TraceNoAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/TraceNoAppServiceImpl.java index e7d50d321..3aab8b1e6 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/TraceNoAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/TraceNoAppServiceImpl.java @@ -24,8 +24,8 @@ import com.openhis.web.inventorymanage.dto.*; import com.openhis.web.inventorymanage.mapper.TraceNoAppMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/InventoryDetailsController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/InventoryDetailsController.java index 3cd10c077..5f1ed3e1e 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/InventoryDetailsController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/InventoryDetailsController.java @@ -3,7 +3,7 @@ // */ //package com.openhis.web.inventorymanage.controller; // -//import javax.servlet.http.HttpServletRequest; +//import jakarta.servlet.http.HttpServletRequest; // //import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.web.bind.annotation.GetMapping; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/InventorySettlementController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/InventorySettlementController.java index 961569484..68b907281 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/InventorySettlementController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/InventorySettlementController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * 库房日结 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/LossReportFormController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/LossReportFormController.java index a5f4d6c3c..6b3210d6a 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/LossReportFormController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/LossReportFormController.java @@ -13,8 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PriceAdjustmentFormController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PriceAdjustmentFormController.java index 5e998eb30..3a62a349c 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PriceAdjustmentFormController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PriceAdjustmentFormController.java @@ -8,8 +8,8 @@ import com.openhis.web.inventorymanage.appservice.IInventoryAdjustPriceService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; /** * @ClassName AdjustPriceController diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductDetailController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductDetailController.java index 9e6bed9c4..de361af4a 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductDetailController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductDetailController.java @@ -8,9 +8,9 @@ import com.openhis.web.inventorymanage.dto.ProductDetailSearchParam; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductStocktakingController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductStocktakingController.java index d7e0c0d13..4fbb50ff4 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductStocktakingController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductStocktakingController.java @@ -14,8 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductTransferController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductTransferController.java index bbdac4e2f..af19b3503 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductTransferController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ProductTransferController.java @@ -14,8 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java index cb9865464..e8e02a0c7 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java @@ -12,9 +12,9 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseReturnController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseReturnController.java index ed8a786ac..8531ec053 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseReturnController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseReturnController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReceiptApprovalController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReceiptApprovalController.java index 39e84d9d5..30e06c900 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReceiptApprovalController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReceiptApprovalController.java @@ -10,8 +10,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 单据审批 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/RequisitionIssueController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/RequisitionIssueController.java index 42aa32545..cdfdedbbf 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/RequisitionIssueController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/RequisitionIssueController.java @@ -13,8 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReturnIssueController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReturnIssueController.java index 6494c0891..b4fe18d41 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReturnIssueController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/ReturnIssueController.java @@ -13,8 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/TraceNoManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/TraceNoManageController.java index 003ff1a17..1567fdfdf 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/TraceNoManageController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/TraceNoManageController.java @@ -11,8 +11,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDto.java index 92f7c526c..115441f79 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDto.java @@ -11,8 +11,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.Date; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormDto.java index 275e40fca..32c67fc8d 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormDto.java @@ -11,7 +11,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.Date; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingDto.java index 2fa397e04..5ad1a4063 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingDto.java @@ -11,7 +11,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.Date; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDto.java index 88f59cbd3..acb5db39e 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDto.java @@ -11,8 +11,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.Date; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryDto.java index c0d53fdab..94753040d 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryDto.java @@ -12,8 +12,8 @@ import lombok.Data; import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.Date; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/appservice/impl/ReviewPrescriptionRecordsAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/appservice/impl/ReviewPrescriptionRecordsAppServiceImpl.java index efb85f3e4..f83559dfe 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/appservice/impl/ReviewPrescriptionRecordsAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/appservice/impl/ReviewPrescriptionRecordsAppServiceImpl.java @@ -19,7 +19,7 @@ import com.openhis.web.jlau.mapper.ReviewPrescriptionRecordsAppMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/appservice/ILabActivityDefinitionAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/appservice/ILabActivityDefinitionAppService.java index fd2ac5414..11fa0952f 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/appservice/ILabActivityDefinitionAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/appservice/ILabActivityDefinitionAppService.java @@ -4,7 +4,7 @@ import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam; import com.openhis.web.datadictionary.dto.DiagnosisTreatmentUpDto; import com.core.common.core.domain.R; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/appservice/impl/LabActivityDefinitionAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/appservice/impl/LabActivityDefinitionAppServiceImpl.java index 08b1c9b98..17958ff5b 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/appservice/impl/LabActivityDefinitionAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/appservice/impl/LabActivityDefinitionAppServiceImpl.java @@ -24,8 +24,8 @@ import com.openhis.web.lab.appservice.ILabActivityDefinitionAppService; import com.openhis.web.datadictionary.mapper.LabActivityDefinitionManageMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.Arrays; import java.util.HashSet; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/controller/LabActivityDefinitionController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/controller/LabActivityDefinitionController.java index 437fdf9fa..1653890d8 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/controller/LabActivityDefinitionController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/controller/LabActivityDefinitionController.java @@ -8,8 +8,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialCommonService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialCommonService.java index 41232e380..60ca2ce54 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialCommonService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialCommonService.java @@ -4,7 +4,7 @@ import com.core.common.core.domain.R; import com.openhis.web.materialmanage.dto.MaterialInitDto; import com.openhis.web.materialmanage.dto.MaterialSearchParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 物资共通方法 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialCommonServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialCommonServiceImpl.java index 5612a7d18..0823afa97 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialCommonServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialCommonServiceImpl.java @@ -27,8 +27,8 @@ import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialProfitLossOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialProfitLossOrderServiceImpl.java index 80690f301..a56fa32d4 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialProfitLossOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialProfitLossOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialPurchaseOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialPurchaseOrderServiceImpl.java index 2cb33852c..bf17e5a09 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialPurchaseOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialPurchaseOrderServiceImpl.java @@ -19,7 +19,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReceiptApprovalServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReceiptApprovalServiceImpl.java index 06a88d782..7b63690c5 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReceiptApprovalServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReceiptApprovalServiceImpl.java @@ -39,7 +39,7 @@ import com.openhis.yb.service.YbManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.*; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReturnOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReturnOrderServiceImpl.java index 962c94930..95cbe053e 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReturnOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReturnOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReturnToWarehouseOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReturnToWarehouseOrderServiceImpl.java index 710d4a79a..2ae80908f 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReturnToWarehouseOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReturnToWarehouseOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockInOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockInOrderServiceImpl.java index 9301133d1..a417f8263 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockInOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockInOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockOutOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockOutOrderServiceImpl.java index 7fd7557c5..2a9fe3c44 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockOutOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockOutOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStocktakingOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStocktakingOrderServiceImpl.java index 8c2fe6ac7..f92e28b55 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStocktakingOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStocktakingOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferInOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferInOrderServiceImpl.java index 2cfbb9315..490ea3df4 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferInOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferInOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferOutOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferOutOrderServiceImpl.java index b1eda377b..13d0fa2f3 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferOutOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferOutOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialProfitLossOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialProfitLossOrderController.java index d12a3af4c..770dc6402 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialProfitLossOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialProfitLossOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialPurchaseOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialPurchaseOrderController.java index c70188ddf..0ebd9cd99 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialPurchaseOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialPurchaseOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialReturnOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialReturnOrderController.java index ce6f9505a..d2b78722c 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialReturnOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialReturnOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialReturnToWarehouseOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialReturnToWarehouseOrderController.java index cb920b973..bda266924 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialReturnToWarehouseOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialReturnToWarehouseOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStockInOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStockInOrderController.java index a4c037a3f..400d287c0 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStockInOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStockInOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStockOutOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStockOutOrderController.java index 9d35126ea..0a51b3dac 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStockOutOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStockOutOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStocktakingOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStocktakingOrderController.java index 2437d5b3a..4220fe551 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStocktakingOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStocktakingOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialTransferInOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialTransferInOrderController.java index 47114551b..b394e209b 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialTransferInOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialTransferInOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialTransferOutOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialTransferOutOrderController.java index 47f2af9cc..855e5f931 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialTransferOutOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialTransferOutOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/medicationmanagement/controller/DayEndSettlementController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/medicationmanagement/controller/DayEndSettlementController.java index caa9c830b..29a6c0649 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/medicationmanagement/controller/DayEndSettlementController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/medicationmanagement/controller/DayEndSettlementController.java @@ -1,7 +1,7 @@ package com.openhis.web.medicationmanagement.controller; import java.util.List; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfStudentListAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfStudentListAppService.java index 6173e3111..917729d24 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfStudentListAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfStudentListAppService.java @@ -5,7 +5,7 @@ import com.core.common.core.domain.R; import com.openhis.web.nenu.dto.GfStudentListDto; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; /** * 公费医疗-学生名单管理 AppService diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfStudentListAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfStudentListAppServiceImpl.java index 001c98286..ca3884ccb 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfStudentListAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfStudentListAppServiceImpl.java @@ -40,7 +40,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.time.format.DateTimeParseException; import java.util.*; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfStudentListController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfStudentListController.java index a0a69652a..b8b0e22fa 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfStudentListController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfStudentListController.java @@ -9,7 +9,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; /** * 公费医疗-学生名单管理 Controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationProcessDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationProcessDto.java index a06b5fce7..7c6e0bcfc 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationProcessDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationProcessDto.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; /** * 公费医疗-比例调整申请处理Dto diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationRecordDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationRecordDto.java index fdb7737cd..eb4c805e7 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationRecordDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationRecordDto.java @@ -9,8 +9,8 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.Date; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListDto.java index c2337646d..c520e34db 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListDto.java @@ -9,8 +9,8 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.util.Date; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientInfusionAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientInfusionAppService.java index 19bf80ccb..7312234fb 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientInfusionAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientInfusionAppService.java @@ -3,7 +3,7 @@ package com.openhis.web.outpatientmanage.appservice; import com.core.common.core.domain.R; import com.openhis.web.outpatientmanage.dto.OutpatientInfusionPatientDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientTreatmentAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientTreatmentAppService.java index 58f70708c..2372eac88 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientTreatmentAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientTreatmentAppService.java @@ -5,7 +5,7 @@ import com.openhis.web.common.dto.PerformInfoDto; import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentEncounterDto; import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentInfoDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java index 8d06a4c0b..afd7c25d9 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java @@ -25,8 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.*; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientSkinTestAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientSkinTestAppServiceImpl.java index bd069b672..732c99e13 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientSkinTestAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientSkinTestAppServiceImpl.java @@ -17,7 +17,7 @@ import com.openhis.web.outpatientmanage.mapper.OutpatientSkinTestAppMapper; import com.openhis.workflow.service.IActivityDefinitionService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientTreatmentAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientTreatmentAppServiceImpl.java index 5b05b4db9..ea1b5d09f 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientTreatmentAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientTreatmentAppServiceImpl.java @@ -43,8 +43,8 @@ import com.openhis.workflow.service.IInventoryItemService; import com.openhis.workflow.service.IServiceRequestService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientInfusionController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientInfusionController.java index c985b2933..445b05ab2 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientInfusionController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientInfusionController.java @@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientTreatmentController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientTreatmentController.java index 84b30b481..b3dc1bf46 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientTreatmentController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientTreatmentController.java @@ -9,8 +9,8 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IOutpatientRecordService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IOutpatientRecordService.java index e886c29b9..992abb3cd 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IOutpatientRecordService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IOutpatientRecordService.java @@ -5,7 +5,7 @@ import com.core.common.core.domain.R; import com.openhis.web.patientmanage.dto.OutpatientRecordDto; import com.openhis.web.patientmanage.dto.OutpatientRecordSearchParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 门诊记录查询 service diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IPatientInformationService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IPatientInformationService.java index 35427a57d..95e535c53 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IPatientInformationService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/IPatientInformationService.java @@ -5,7 +5,7 @@ import com.core.common.core.domain.R; import com.openhis.web.patientmanage.dto.PatientBaseInfoDto; import com.openhis.web.patientmanage.dto.PatientInfoInitDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 病人管理——病人信息 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/OutpatientRecordServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/OutpatientRecordServiceImpl.java index 2e04fa4a2..545dbb239 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/OutpatientRecordServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/OutpatientRecordServiceImpl.java @@ -17,8 +17,8 @@ import com.openhis.web.patientmanage.mapper.PatientManageMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.HashSet; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java index abe838eed..8fe0ab482 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java @@ -32,7 +32,7 @@ import com.openhis.web.patientmanage.mapper.PatientManageMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/OutpatientRecordController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/OutpatientRecordController.java index 5e43ab882..ad14990bd 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/OutpatientRecordController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/OutpatientRecordController.java @@ -10,7 +10,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 门诊记录查询控制器 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java index ef9110a61..96d10b2bd 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java @@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 病人管理——病人信息 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IPaymentRecService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IPaymentRecService.java index 184baf59e..2ca6831e9 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IPaymentRecService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IPaymentRecService.java @@ -16,7 +16,7 @@ import com.openhis.yb.dto.PaymentDto; import com.openhis.yb.dto.PaymentInpatientDto; import com.openhis.yb.dto.PrePaymentDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/ThreePartPayService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/ThreePartPayService.java index d2a77413a..81f6982fa 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/ThreePartPayService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/ThreePartPayService.java @@ -3,7 +3,7 @@ package com.openhis.web.paymentmanage.appservice; import com.core.common.core.domain.R; import com.openhis.yb.dto.ThreePartPayDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 第三方支付应用层Service diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ChangePriceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ChangePriceImpl.java index 7654ab4a8..69e4d0690 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ChangePriceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ChangePriceImpl.java @@ -7,7 +7,7 @@ import com.openhis.web.paymentmanage.dto.ChangePriceListDto; import com.openhis.web.paymentmanage.mapper.ChangePriceMapper; import org.springframework.stereotype.Component; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java index acb274403..fb81a05d7 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java @@ -60,7 +60,7 @@ import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.IOException; import java.io.StringWriter; import java.math.BigDecimal; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java index 74646c78e..3c21b6ab2 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java @@ -56,7 +56,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java index b3bd2cc42..f4211077c 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java @@ -86,8 +86,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ThreePartPayServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ThreePartPayServiceImpl.java index 742ee90ec..e6a4ba927 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ThreePartPayServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ThreePartPayServiceImpl.java @@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentReconciliationController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentReconciliationController.java index 0dfcc0ac0..c275d597b 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentReconciliationController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentReconciliationController.java @@ -25,8 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import java.util.Map; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ThreePartPayController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ThreePartPayController.java index 1a00263e6..717a90219 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ThreePartPayController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ThreePartPayController.java @@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 第三方支付管理 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentDto.java index dcea42c7f..0a34082c6 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentDto.java @@ -7,7 +7,7 @@ import com.openhis.yb.dto.PaymentDetailDto; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelRegPaymentDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelRegPaymentDto.java index e87a10882..843d6dd37 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelRegPaymentDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelRegPaymentDto.java @@ -6,8 +6,8 @@ import com.openhis.yb.dto.PaymentDetailDto; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/IActivityDeviceAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/IActivityDeviceAppService.java index 1ea6ad7cb..24dfd7cea 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/IActivityDeviceAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/IActivityDeviceAppService.java @@ -8,7 +8,7 @@ import com.openhis.web.datadictionary.dto.DeviceManageSelParam; import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam; import com.openhis.web.personalization.dto.ActivityDeviceDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 诊疗耗材绑定 service diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/ActivityDeviceAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/ActivityDeviceAppServiceImpl.java index 3d3d202f5..565fd44c6 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/ActivityDeviceAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/ActivityDeviceAppServiceImpl.java @@ -25,8 +25,8 @@ import com.openhis.web.personalization.dto.ActivityDeviceInitDto; import com.openhis.web.personalization.mapper.ActivityDeviceAppMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/IOrderGroupAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/IOrderGroupAppServiceImpl.java index 3d02e0310..6a86ede29 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/IOrderGroupAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/IOrderGroupAppServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.web.personalization.dto.OrderGroupInitDto; import com.openhis.web.personalization.mapper.OrderGroupAppMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java index fbba3c18b..83964f788 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.stereotype.Service; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/ActivityDeviceController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/ActivityDeviceController.java index 067991918..a87db2a88 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/ActivityDeviceController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/ActivityDeviceController.java @@ -13,8 +13,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; /** * 耗材诊疗绑定 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/OrderGroupController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/OrderGroupController.java index e2e464723..df440dd02 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/OrderGroupController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/OrderGroupController.java @@ -11,7 +11,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * 组套 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryCommonService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryCommonService.java index 19a07347f..5d7aa9d47 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryCommonService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryCommonService.java @@ -4,7 +4,7 @@ import com.core.common.core.domain.R; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 药房共通方法 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryCommonServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryCommonServiceImpl.java index 6450af436..5cd10acec 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryCommonServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryCommonServiceImpl.java @@ -28,8 +28,8 @@ import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryDispensingOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryDispensingOrderServiceImpl.java index d7c1a6c78..36f2dacc2 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryDispensingOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryDispensingOrderServiceImpl.java @@ -19,7 +19,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryProfitLossOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryProfitLossOrderServiceImpl.java index 99270dcc4..95ec82ec2 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryProfitLossOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryProfitLossOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReceiptApprovalServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReceiptApprovalServiceImpl.java index e7f2772a2..a97a0ffaf 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReceiptApprovalServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReceiptApprovalServiceImpl.java @@ -39,7 +39,7 @@ import com.openhis.yb.service.YbManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.*; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryRequisitionOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryRequisitionOrderServiceImpl.java index 45b9d19bf..bf668cc27 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryRequisitionOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryRequisitionOrderServiceImpl.java @@ -19,7 +19,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReturnToWarehouseOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReturnToWarehouseOrderServiceImpl.java index ec485bd31..88bfdd05c 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReturnToWarehouseOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReturnToWarehouseOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStockInOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStockInOrderServiceImpl.java index 4cce27898..deb73184c 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStockInOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStockInOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStocktakingOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStocktakingOrderServiceImpl.java index a09cf183b..8efc8a6b4 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStocktakingOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStocktakingOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferInOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferInOrderServiceImpl.java index 67c951951..d65c8f977 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferInOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferInOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferOutOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferOutOrderServiceImpl.java index a54089e0e..077ee9f1f 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferOutOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferOutOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryDispensingOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryDispensingOrderController.java index a31d01eb4..9a80c4e8c 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryDispensingOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryDispensingOrderController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 药房发药单 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryProfitLossOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryProfitLossOrderController.java index 80b4f5678..a111e9892 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryProfitLossOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryProfitLossOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryRequisitionOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryRequisitionOrderController.java index 7e2231996..101f44b6a 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryRequisitionOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryRequisitionOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryReturnToWarehouseOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryReturnToWarehouseOrderController.java index 7e193601d..0d77d3601 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryReturnToWarehouseOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryReturnToWarehouseOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStockInOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStockInOrderController.java index f1296d9d7..66d520a51 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStockInOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStockInOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStocktakingOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStocktakingOrderController.java index 380e29810..8aa8f61ee 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStocktakingOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryStocktakingOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferInOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferInOrderController.java index f08c03523..453e23e96 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferInOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferInOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferOutOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferOutOrderController.java index e74fc1597..e4cdceddb 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferOutOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/controller/PharmacyDispensaryTransferOutOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseCommonService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseCommonService.java index e5f568dde..00a54a1cb 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseCommonService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseCommonService.java @@ -4,7 +4,7 @@ import com.core.common.core.domain.R; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 药库共通方法 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseCommonServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseCommonServiceImpl.java index 175e9ca83..b7e951a76 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseCommonServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseCommonServiceImpl.java @@ -28,8 +28,8 @@ import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseDocumentManagementServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseDocumentManagementServiceImpl.java index 29334683a..bd0f92259 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseDocumentManagementServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseDocumentManagementServiceImpl.java @@ -13,7 +13,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseProfitLossOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseProfitLossOrderServiceImpl.java index e8b55759f..3301da2e7 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseProfitLossOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseProfitLossOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehousePurchaseOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehousePurchaseOrderServiceImpl.java index c1ed85b99..2becc1b25 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehousePurchaseOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehousePurchaseOrderServiceImpl.java @@ -19,7 +19,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReceiptApprovalServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReceiptApprovalServiceImpl.java index 382ad424e..a049fa810 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReceiptApprovalServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReceiptApprovalServiceImpl.java @@ -39,7 +39,7 @@ import com.openhis.yb.service.YbManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.*; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnOrderServiceImpl.java index 26d462120..94d0d5628 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnToWarehouseOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnToWarehouseOrderServiceImpl.java index 8b6334967..9004b5a03 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnToWarehouseOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnToWarehouseOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockInOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockInOrderServiceImpl.java index 00583f449..94c8a8f7a 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockInOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockInOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockOutOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockOutOrderServiceImpl.java index 2199b1528..2008475cd 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockOutOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockOutOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStocktakingOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStocktakingOrderServiceImpl.java index 1424784e2..4c6d922ce 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStocktakingOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStocktakingOrderServiceImpl.java @@ -20,7 +20,7 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseDocumentManagementController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseDocumentManagementController.java index 8a65eec50..f5117b40e 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseDocumentManagementController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseDocumentManagementController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 药库单据管理 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseProfitLossOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseProfitLossOrderController.java index ba1d6278c..ddd76d301 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseProfitLossOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseProfitLossOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehousePurchaseOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehousePurchaseOrderController.java index 580baae60..726fc8124 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehousePurchaseOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehousePurchaseOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnOrderController.java index 5af908f51..d3d75a966 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnToWarehouseOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnToWarehouseOrderController.java index be6afe6d6..acfa7b511 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnToWarehouseOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseReturnToWarehouseOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockInOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockInOrderController.java index 88057b3dd..65bd87979 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockInOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockInOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockOutOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockOutOrderController.java index d43f8fdaa..5dea13095 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockOutOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStockOutOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStocktakingOrderController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStocktakingOrderController.java index 2a9c209ca..694763c25 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStocktakingOrderController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/controller/PharmacyWarehouseStocktakingOrderController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IInHospitalReturnMedicineAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IInHospitalReturnMedicineAppService.java index 676bc4c8e..94621f873 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IInHospitalReturnMedicineAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IInHospitalReturnMedicineAppService.java @@ -5,7 +5,7 @@ package com.openhis.web.pharmacymanage.appservice; import java.util.List; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import com.core.common.core.domain.R; import com.openhis.web.pharmacymanage.dto.EncounterInfoDto; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicalDeviceDispenseAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicalDeviceDispenseAppService.java index 1863ad895..119e388c4 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicalDeviceDispenseAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicalDeviceDispenseAppService.java @@ -5,7 +5,7 @@ import com.openhis.web.pharmacymanage.dto.DispenseItemDto; import com.openhis.web.pharmacymanage.dto.EncounterInfoSearchParam; import com.openhis.web.pharmacymanage.dto.ItemDispenseOrderDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicationDetailsAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicationDetailsAppService.java index 11c7611ae..e015780ba 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicationDetailsAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicationDetailsAppService.java @@ -3,8 +3,8 @@ package com.openhis.web.pharmacymanage.appservice; import com.core.common.core.domain.R; import com.openhis.web.pharmacymanage.dto.MedDetailsSearchParam; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 发药明细 应用实现接口 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IPendingMedicationDetailsAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IPendingMedicationDetailsAppService.java index 78ce990c0..c98bbf30d 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IPendingMedicationDetailsAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IPendingMedicationDetailsAppService.java @@ -3,7 +3,7 @@ package com.openhis.web.pharmacymanage.appservice; import com.core.common.core.domain.R; import com.openhis.web.pharmacymanage.dto.PendingMedicationSearchParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 待发药明细 应用实现接口 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IReturnMedicineAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IReturnMedicineAppService.java index 2b556089e..4a8876bc2 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IReturnMedicineAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IReturnMedicineAppService.java @@ -4,7 +4,7 @@ import com.core.common.core.domain.R; import com.openhis.web.pharmacymanage.dto.EncounterInfoDto; import com.openhis.web.pharmacymanage.dto.ReturnMedicineDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IWesternMedicineDispenseAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IWesternMedicineDispenseAppService.java index 4472ec9b9..b3de59da0 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IWesternMedicineDispenseAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IWesternMedicineDispenseAppService.java @@ -5,7 +5,7 @@ import com.openhis.web.pharmacymanage.dto.DispenseItemDto; import com.openhis.web.pharmacymanage.dto.EncounterInfoSearchParam; import com.openhis.web.pharmacymanage.dto.ItemDispenseOrderDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/InHospitalReturnMedicineAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/InHospitalReturnMedicineAppServiceImpl.java index 118c305d4..73b11735d 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/InHospitalReturnMedicineAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/InHospitalReturnMedicineAppServiceImpl.java @@ -8,8 +8,8 @@ import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.lang3.tuple.Pair; import org.springframework.stereotype.Service; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicalDeviceDispenseAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicalDeviceDispenseAppServiceImpl.java index 3eb544010..6f9669c82 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicalDeviceDispenseAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicalDeviceDispenseAppServiceImpl.java @@ -34,8 +34,8 @@ import com.openhis.workflow.service.IDeviceDispenseService; import com.openhis.workflow.service.IInventoryItemService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicationDetailsAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicationDetailsAppServiceImpl.java index ba1de5f91..4014da50a 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicationDetailsAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicationDetailsAppServiceImpl.java @@ -24,8 +24,8 @@ import com.openhis.web.pharmacymanage.mapper.MedicationDetailsMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.Arrays; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/PendingMedicationDetailsAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/PendingMedicationDetailsAppServiceImpl.java index 7679526fe..69abf1ae9 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/PendingMedicationDetailsAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/PendingMedicationDetailsAppServiceImpl.java @@ -14,7 +14,7 @@ import com.openhis.web.pharmacymanage.mapper.PendingMedicationDetailsMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.HashSet; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java index fbf16abe2..45b5015d7 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java @@ -45,8 +45,8 @@ import com.openhis.yb.service.YbManager; import org.apache.commons.lang3.tuple.Pair; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.*; import java.util.function.Function; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java index 66323be56..8ee1fec9d 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java @@ -36,8 +36,8 @@ import com.openhis.workflow.service.ISupplyRequestService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java index db5f236ce..041ffd8a1 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java @@ -48,8 +48,8 @@ import org.apache.commons.lang3.tuple.Pair; import org.springframework.stereotype.Service; import reactor.util.annotation.Nullable; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.*; import java.util.function.Function; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/InHospitalReturnMedicineController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/InHospitalReturnMedicineController.java index 36950308a..8d96eb7fa 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/InHospitalReturnMedicineController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/InHospitalReturnMedicineController.java @@ -5,8 +5,8 @@ package com.openhis.web.pharmacymanage.controller; import java.util.List; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.web.bind.annotation.*; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicalDeviceDispenseController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicalDeviceDispenseController.java index daf4142aa..c0365b3e9 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicalDeviceDispenseController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicalDeviceDispenseController.java @@ -9,8 +9,8 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicationDetailsController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicationDetailsController.java index 2f11c49f2..99ca306b4 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicationDetailsController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicationDetailsController.java @@ -10,9 +10,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 发药明细 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/PendingMedicationDetailsController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/PendingMedicationDetailsController.java index ae95caffb..1f31f7572 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/PendingMedicationDetailsController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/PendingMedicationDetailsController.java @@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; /** * 待发药明细 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/ReturnMedicineController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/ReturnMedicineController.java index b38996b76..2cc955b8e 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/ReturnMedicineController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/ReturnMedicineController.java @@ -8,8 +8,8 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/SummaryDispenseMedicineController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/SummaryDispenseMedicineController.java index a17dd1f94..45dbd98cf 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/SummaryDispenseMedicineController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/SummaryDispenseMedicineController.java @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/WesternMedicineDispenseController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/WesternMedicineDispenseController.java index 208e9cce6..2be2ab34a 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/WesternMedicineDispenseController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/WesternMedicineDispenseController.java @@ -9,8 +9,8 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IAdviceManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IAdviceManageAppService.java index d74e99c7f..71e50ff9c 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IAdviceManageAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IAdviceManageAppService.java @@ -6,7 +6,7 @@ import com.openhis.web.regdoctorstation.dto.AdviceBatchOpParam; import com.openhis.web.regdoctorstation.dto.RegAdviceSaveParam; import com.openhis.web.regdoctorstation.dto.RegPatientMainInfoDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java index 80aef8a59..15e6aa355 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java @@ -45,8 +45,8 @@ import com.openhis.document.service.IRequestFormService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/NurseManageServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/NurseManageServiceImpl.java index bed2a2c55..0363525cc 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/NurseManageServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/NurseManageServiceImpl.java @@ -21,7 +21,7 @@ import com.openhis.web.regdoctorstation.appservice.INurseManageService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.LinkedList; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java index e2876ba39..521e0c418 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java @@ -40,7 +40,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java index aa719dfc0..5678f0fa6 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java @@ -22,7 +22,7 @@ import com.openhis.workflow.service.IServiceRequestService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.util.Arrays; import java.util.Date; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/AdviceManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/AdviceManageController.java index 3648dd909..82251432e 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/AdviceManageController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/AdviceManageController.java @@ -14,7 +14,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/NurseManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/NurseManageController.java index 77c05ee49..719461ab3 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/NurseManageController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/NurseManageController.java @@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; /** * @ClassName NurseManageController diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/utils/RegPrescriptionUtils.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/utils/RegPrescriptionUtils.java index b4b3689fe..8d58e6a8b 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/utils/RegPrescriptionUtils.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/utils/RegPrescriptionUtils.java @@ -5,7 +5,7 @@ import com.openhis.common.enums.AssignSeqEnum; import com.openhis.web.regdoctorstation.dto.RegAdviceSaveDto; import org.springframework.stereotype.Component; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/appservice/IInfectiousCardAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/appservice/IInfectiousCardAppService.java index 0226706f4..574f444ad 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/appservice/IInfectiousCardAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/appservice/IInfectiousCardAppService.java @@ -3,7 +3,7 @@ package com.openhis.web.reportManagement.appservice; import com.core.common.core.domain.R; import com.openhis.web.reportManagement.dto.InfectiousCardParam; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/appservice/impl/InfectiousCardAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/appservice/impl/InfectiousCardAppServiceImpl.java index f8fcdf32b..cba749820 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/appservice/impl/InfectiousCardAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/appservice/impl/InfectiousCardAppServiceImpl.java @@ -18,7 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/controller/reportManagementController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/controller/reportManagementController.java index 6ccea53a7..7d656a876 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/controller/reportManagementController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/controller/reportManagementController.java @@ -12,8 +12,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; /** * 传染病报卡管理 Controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/BatchReturnInfectiousCardRequest.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/BatchReturnInfectiousCardRequest.java index 2a0994d5a..07570fd28 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/BatchReturnInfectiousCardRequest.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/BatchReturnInfectiousCardRequest.java @@ -2,7 +2,7 @@ package com.openhis.web.reportManagement.dto; import lombok.Data; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Size; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/ReturnInfectiousCardRequest.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/ReturnInfectiousCardRequest.java index 0a0b8383f..6837b2b6d 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/ReturnInfectiousCardRequest.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportManagement/dto/ReturnInfectiousCardRequest.java @@ -2,7 +2,7 @@ package com.openhis.web.reportManagement.dto; import lombok.Data; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Size; /** * 退回传染病报卡请求 DTO diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IAmbAdviceStatisticsAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IAmbAdviceStatisticsAppService.java index 669c781d2..4626a6840 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IAmbAdviceStatisticsAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IAmbAdviceStatisticsAppService.java @@ -3,8 +3,8 @@ */ package com.openhis.web.reportmanage.appservice; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.core.common.core.domain.R; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IChargeReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IChargeReportAppService.java index 676e8354b..ad9bc46e4 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IChargeReportAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IChargeReportAppService.java @@ -6,8 +6,8 @@ package com.openhis.web.reportmanage.appservice; import com.core.common.core.domain.R; import com.openhis.web.reportmanage.dto.ChargeReportSearchParam; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 费用明细报表 appService diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IDepartmentRevenueStatisticsAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IDepartmentRevenueStatisticsAppService.java index 8779eb1a4..144fac05f 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IDepartmentRevenueStatisticsAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IDepartmentRevenueStatisticsAppService.java @@ -5,7 +5,7 @@ package com.openhis.web.reportmanage.appservice; import com.core.common.core.domain.R; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 科室收入统计 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IDrugDosageSettlementAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IDrugDosageSettlementAppService.java index 578bf5b83..4353b9832 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IDrugDosageSettlementAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IDrugDosageSettlementAppService.java @@ -6,7 +6,7 @@ package com.openhis.web.reportmanage.appservice; import com.core.common.core.domain.R; import com.openhis.web.reportmanage.dto.DrugDosageSettlementSearchParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 药品用量结算 appService diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInboundReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInboundReportAppService.java index 033fa2204..5736121ba 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInboundReportAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInboundReportAppService.java @@ -6,8 +6,8 @@ package com.openhis.web.reportmanage.appservice; import com.core.common.core.domain.R; import com.openhis.web.reportmanage.dto.InboundReportSearchParam; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 入库明细报表 appService diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInventoryProductReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInventoryProductReportAppService.java index 2438b37ad..5c70f3de1 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInventoryProductReportAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IInventoryProductReportAppService.java @@ -6,8 +6,8 @@ package com.openhis.web.reportmanage.appservice; import com.core.common.core.domain.R; import com.openhis.web.reportmanage.dto.InventoryProductReportSearchParam; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 库存商品明细报表 appService diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ILossReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ILossReportAppService.java index 81d303134..f41b67544 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ILossReportAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ILossReportAppService.java @@ -6,8 +6,8 @@ package com.openhis.web.reportmanage.appservice; import com.core.common.core.domain.R; import com.openhis.web.reportmanage.dto.LossReportSearchParam; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 报损明细报表 appService diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMedicationDeviceReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMedicationDeviceReportAppService.java index cd61d173d..cd6382195 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMedicationDeviceReportAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMedicationDeviceReportAppService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.openhis.web.reportmanage.dto.MedUseReportInfoDto; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; /** * 药品院内开立情况 appService diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMedicationInboundReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMedicationInboundReportAppService.java index 60cc80354..accc364bd 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMedicationInboundReportAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMedicationInboundReportAppService.java @@ -2,7 +2,7 @@ package com.openhis.web.reportmanage.appservice; import com.core.common.core.domain.R; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 药品入库情况 appService diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IOutboundReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IOutboundReportAppService.java index 3d7c692ba..7b54974b7 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IOutboundReportAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IOutboundReportAppService.java @@ -3,8 +3,8 @@ package com.openhis.web.reportmanage.appservice; import com.core.common.core.domain.R; import com.openhis.web.reportmanage.dto.OutboundReportSearchParam; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 出库明细报表 appService diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IPharmacySettlementReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IPharmacySettlementReportAppService.java index 8236c4a49..99862a99f 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IPharmacySettlementReportAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IPharmacySettlementReportAppService.java @@ -3,8 +3,8 @@ */ package com.openhis.web.reportmanage.appservice; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.core.common.core.domain.R; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IRegisterReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IRegisterReportAppService.java index 668ef4ac4..c916048d9 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IRegisterReportAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IRegisterReportAppService.java @@ -6,7 +6,7 @@ package com.openhis.web.reportmanage.appservice; import com.core.common.core.domain.R; import com.openhis.web.reportmanage.dto.RegisterReportSearchParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 挂号明细报表 appService diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReportAppService.java index 97e463549..a9e20bc73 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReportAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReportAppService.java @@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.openhis.web.reportmanage.dto.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.time.LocalDateTime; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReturnIssueReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReturnIssueReportAppService.java index 667d9d1e9..5591c235b 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReturnIssueReportAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReturnIssueReportAppService.java @@ -3,8 +3,8 @@ package com.openhis.web.reportmanage.appservice; import com.core.common.core.domain.R; import com.openhis.web.reportmanage.dto.ReturnIssueReportSearchParam; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 领用退库明细报表 appService diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IStocktakingReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IStocktakingReportAppService.java index de06a12f8..85cdbde04 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IStocktakingReportAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IStocktakingReportAppService.java @@ -6,8 +6,8 @@ package com.openhis.web.reportmanage.appservice; import com.core.common.core.domain.R; import com.openhis.web.reportmanage.dto.StocktakingReportSearchParam; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 库存盘点明细报表 appService diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ITransferReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ITransferReportAppService.java index 416d3e54c..c0cca47c8 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ITransferReportAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/ITransferReportAppService.java @@ -6,8 +6,8 @@ package com.openhis.web.reportmanage.appservice; import com.core.common.core.domain.R; import com.openhis.web.reportmanage.dto.TransferReportSearchParam; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 商品调拨明细报表 appService diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/InpatientMedicalRecordHomePageCollectionAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/InpatientMedicalRecordHomePageCollectionAppService.java index 828bc2ba0..10d9dfa62 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/InpatientMedicalRecordHomePageCollectionAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/InpatientMedicalRecordHomePageCollectionAppService.java @@ -5,7 +5,7 @@ package com.openhis.web.reportmanage.appservice; import com.core.common.core.domain.R; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/PurchaseReturnReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/PurchaseReturnReportAppService.java index d4618b2a6..989b4d863 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/PurchaseReturnReportAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/PurchaseReturnReportAppService.java @@ -6,8 +6,8 @@ package com.openhis.web.reportmanage.appservice; import com.core.common.core.domain.R; import com.openhis.web.reportmanage.dto.PurchaseReturnReportSearchParam; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 采购退货明细报表 appService diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/AmbAdviceStatisticsAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/AmbAdviceStatisticsAppServiceImpl.java index 6354e91f4..efb1211c7 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/AmbAdviceStatisticsAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/AmbAdviceStatisticsAppServiceImpl.java @@ -5,8 +5,8 @@ package com.openhis.web.reportmanage.appservice.impl; import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ChargeReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ChargeReportAppServiceImpl.java index 9fc04f7f9..905e650a8 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ChargeReportAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ChargeReportAppServiceImpl.java @@ -25,9 +25,9 @@ import com.openhis.web.reportmanage.mapper.ChargeReportMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/DepartmentRevenueStatisticsAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/DepartmentRevenueStatisticsAppServiceImpl.java index 56fad05f6..c550bebd8 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/DepartmentRevenueStatisticsAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/DepartmentRevenueStatisticsAppServiceImpl.java @@ -16,7 +16,7 @@ import com.openhis.web.reportmanage.mapper.DepartmentRevenueStatisticsMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 科室收入统计 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/DrugDosageSettlementAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/DrugDosageSettlementAppServiceImpl.java index ecb9a0d5f..2a42773ff 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/DrugDosageSettlementAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/DrugDosageSettlementAppServiceImpl.java @@ -17,7 +17,7 @@ import com.openhis.web.reportmanage.mapper.DrugDosageSettlementMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 药品用量结算 impl diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InboundReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InboundReportAppServiceImpl.java index b06c4ea41..afe36a84a 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InboundReportAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InboundReportAppServiceImpl.java @@ -28,9 +28,9 @@ import com.openhis.web.reportmanage.mapper.InboundReportMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InpatientMedicalRecordHomePageCollectionAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InpatientMedicalRecordHomePageCollectionAppServiceImpl.java index 09ac8501d..8396b6ff2 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InpatientMedicalRecordHomePageCollectionAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InpatientMedicalRecordHomePageCollectionAppServiceImpl.java @@ -18,8 +18,8 @@ import com.openhis.web.reportmanage.utils.CsvFillerUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.math.BigDecimal; import java.text.DecimalFormat; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InventoryProductReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InventoryProductReportAppServiceImpl.java index 2d972e1a1..86f1c02b7 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InventoryProductReportAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InventoryProductReportAppServiceImpl.java @@ -26,9 +26,9 @@ import com.openhis.web.reportmanage.utils.ExcelFillerUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/LossReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/LossReportAppServiceImpl.java index 1214e8193..188b58118 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/LossReportAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/LossReportAppServiceImpl.java @@ -25,9 +25,9 @@ import com.openhis.web.reportmanage.mapper.LossReportMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MedicationDeviceReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MedicationDeviceReportAppServiceImpl.java index 1f3a59c4b..be61bc230 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MedicationDeviceReportAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MedicationDeviceReportAppServiceImpl.java @@ -24,8 +24,8 @@ import com.openhis.web.reportmanage.utils.ExcelFillerUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MedicationInboundReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MedicationInboundReportAppServiceImpl.java index 23b00c1da..3c535993c 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MedicationInboundReportAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MedicationInboundReportAppServiceImpl.java @@ -16,8 +16,8 @@ import com.openhis.web.reportmanage.dto.MedicationInboundReportDto; import com.openhis.web.reportmanage.mapper.MedicationInboundReportMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashSet; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/OutboundReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/OutboundReportAppServiceImpl.java index 54ee0237e..050db97cf 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/OutboundReportAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/OutboundReportAppServiceImpl.java @@ -25,9 +25,9 @@ import com.openhis.web.reportmanage.mapper.OutboundReportMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/PharmacySettlementReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/PharmacySettlementReportAppServiceImpl.java index 5cfa85d47..4cba218cb 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/PharmacySettlementReportAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/PharmacySettlementReportAppServiceImpl.java @@ -10,8 +10,8 @@ import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/PurchaseReturnReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/PurchaseReturnReportAppServiceImpl.java index 680c16760..1e5939a63 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/PurchaseReturnReportAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/PurchaseReturnReportAppServiceImpl.java @@ -28,9 +28,9 @@ import com.openhis.web.reportmanage.utils.ExcelFillerUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/RegisterReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/RegisterReportAppServiceImpl.java index f7891ddb1..b947c8221 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/RegisterReportAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/RegisterReportAppServiceImpl.java @@ -21,8 +21,8 @@ import com.openhis.web.reportmanage.mapper.RegisterReportMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReportAppServiceImpl.java index 136f30d3e..a40cc53b8 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReportAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReportAppServiceImpl.java @@ -25,9 +25,9 @@ import com.openhis.web.reportmanage.mapper.ReportMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReturnIssueReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReturnIssueReportAppServiceImpl.java index 2547faeb2..08106b113 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReturnIssueReportAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReturnIssueReportAppServiceImpl.java @@ -25,9 +25,9 @@ import com.openhis.web.reportmanage.utils.ExcelFillerUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/StocktakingReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/StocktakingReportAppServiceImpl.java index fc83178e3..76b58a757 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/StocktakingReportAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/StocktakingReportAppServiceImpl.java @@ -25,9 +25,9 @@ import com.openhis.web.reportmanage.mapper.StocktakingReportMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/TransferReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/TransferReportAppServiceImpl.java index 0ae2fc8f3..1a7d60ecb 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/TransferReportAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/TransferReportAppServiceImpl.java @@ -26,9 +26,9 @@ import com.openhis.web.reportmanage.mapper.TransferReportMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/AmbAdviceStatisticsAppController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/AmbAdviceStatisticsAppController.java index 5a31e9531..2c551a489 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/AmbAdviceStatisticsAppController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/AmbAdviceStatisticsAppController.java @@ -3,8 +3,8 @@ */ package com.openhis.web.reportmanage.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ChargeReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ChargeReportController.java index c5a2c6d7c..1c5f8d110 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ChargeReportController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ChargeReportController.java @@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 费用明细报表 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/DepartmentRevenueStatisticsController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/DepartmentRevenueStatisticsController.java index 4e612c628..b40ebb703 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/DepartmentRevenueStatisticsController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/DepartmentRevenueStatisticsController.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 科室收入统计 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/DrugDosageSettlementController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/DrugDosageSettlementController.java index 0d2620b04..f06905219 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/DrugDosageSettlementController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/DrugDosageSettlementController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 药品用量结算 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InboundReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InboundReportController.java index c852e5727..b7d02a257 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InboundReportController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InboundReportController.java @@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 入库明细报表 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InpatientMedicalRecordHomePageCollectionController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InpatientMedicalRecordHomePageCollectionController.java index fb503494b..e834065ca 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InpatientMedicalRecordHomePageCollectionController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InpatientMedicalRecordHomePageCollectionController.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InventoryProductReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InventoryProductReportController.java index 28bb1642c..df644ff50 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InventoryProductReportController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/InventoryProductReportController.java @@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 库存商品明细报表 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/LossReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/LossReportController.java index 3ee0df17a..0a47e8c17 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/LossReportController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/LossReportController.java @@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 报损明细报表 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MedicationDeviceReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MedicationDeviceReportController.java index dc0302a13..a02b283ff 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MedicationDeviceReportController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MedicationDeviceReportController.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; /** * 药品耗材统计查询用 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MedicationInboundReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MedicationInboundReportController.java index 4d6fb519e..56348f0e1 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MedicationInboundReportController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MedicationInboundReportController.java @@ -8,9 +8,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 药品入库情况 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/OutboundReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/OutboundReportController.java index 17c298cc3..be924974d 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/OutboundReportController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/OutboundReportController.java @@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 出库明细报表 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PharmacySettlementReportAppController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PharmacySettlementReportAppController.java index ccf221362..713a077bb 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PharmacySettlementReportAppController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PharmacySettlementReportAppController.java @@ -3,8 +3,8 @@ */ package com.openhis.web.reportmanage.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PurchaseReturnReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PurchaseReturnReportController.java index bc1e51ed0..769fb2ce1 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PurchaseReturnReportController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PurchaseReturnReportController.java @@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 采购退货明细报表 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/RegisterReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/RegisterReportController.java index b79de30a2..ad1cbbb28 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/RegisterReportController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/RegisterReportController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 挂号明细报表 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReportController.java index 62550e006..a96a5607e 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReportController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReportController.java @@ -14,8 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.time.LocalDateTime; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReturnIssueReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReturnIssueReportController.java index f566e8ea4..2fcbbbd51 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReturnIssueReportController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReturnIssueReportController.java @@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 领用退库明细报表 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/StocktakingReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/StocktakingReportController.java index 299c57949..8f70aa40c 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/StocktakingReportController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/StocktakingReportController.java @@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 库存盘点明细报表 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/TransferReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/TransferReportController.java index 3d19267f9..17a7e0c41 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/TransferReportController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/TransferReportController.java @@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 商品调拨明细报表 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/utils/CsvFillerUtil.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/utils/CsvFillerUtil.java index 36977a4fd..2f79cc6e1 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/utils/CsvFillerUtil.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/utils/CsvFillerUtil.java @@ -3,7 +3,7 @@ package com.openhis.web.reportmanage.utils; import com.openhis.common.constant.CommonConstants; import com.openhis.web.reportmanage.dto.InpatientMedicalRecordHomePageCollectionDto; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.BufferedWriter; import java.io.File; import java.io.IOException; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/utils/ExcelFillerUtil.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/utils/ExcelFillerUtil.java index 82caca0ed..bf8e187c0 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/utils/ExcelFillerUtil.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/utils/ExcelFillerUtil.java @@ -3,7 +3,7 @@ package com.openhis.web.reportmanage.utils; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.lang.reflect.Field; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/system/controller/HomeController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/system/controller/HomeController.java index e86e6252e..bfa11ae66 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/system/controller/HomeController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/system/controller/HomeController.java @@ -5,8 +5,9 @@ import com.core.common.utils.SecurityUtils; import com.openhis.web.doctorstation.appservice.IDoctorStationEmrAppService; import com.openhis.web.dto.HomeStatisticsDto; import com.openhis.web.service.IHomeStatisticsService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameters; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -15,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController; /** * 系统首页控制器 */ -@Api(tags = "系统首页") +@Tag(name = "系统首页") @RestController @RequestMapping("/system/home") @AllArgsConstructor @@ -24,7 +25,7 @@ public class HomeController { private final IDoctorStationEmrAppService doctorStationEmrAppService; private final IHomeStatisticsService homeStatisticsService; - @ApiOperation("获取首页统计数据") + @Operation(summary = "获取首页统计数据") @GetMapping("/statistics") public R getStatistics() { // 获取基础统计数据 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/appservice/ITencentAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/appservice/ITencentAppService.java index 1094d78d2..e004e0985 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/appservice/ITencentAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/appservice/ITencentAppService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.openhis.web.tencentJH.dto.CurrentDayEncounterTencentDto; import com.openhis.web.tencentJH.dto.PatientInfoTencentDto; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 腾讯医疗支付 Qmi支付 应用Service diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/appservice/impl/TencentAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/appservice/impl/TencentAppServiceImpl.java index 83432127a..c36f33840 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/appservice/impl/TencentAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/appservice/impl/TencentAppServiceImpl.java @@ -15,8 +15,8 @@ import com.openhis.web.tencentJH.mapper.TencentAppMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.HashSet; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/controller/TencentController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/controller/TencentController.java index b355bca87..ccb71f910 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/controller/TencentController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/controller/TencentController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /* 腾讯相关接口 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/CallNumberVoiceConfigAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/CallNumberVoiceConfigAppServiceImpl.java index c9add5332..8fff8693f 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/CallNumberVoiceConfigAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/CallNumberVoiceConfigAppServiceImpl.java @@ -7,7 +7,7 @@ import com.openhis.triageandqueuemanage.service.CallNumberVoiceConfigService; import com.openhis.web.triageandqueuemanage.appservice.CallNumberVoiceConfigAppService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.List; @Service diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/TriageQueueAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/TriageQueueAppServiceImpl.java index a90b34b27..6c9d553a2 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/TriageQueueAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/TriageQueueAppServiceImpl.java @@ -29,7 +29,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.time.LocalDate; import java.time.LocalDateTime; import com.core.common.core.domain.model.LoginUser; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/controller/CallNumberVoiceConfigController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/controller/CallNumberVoiceConfigController.java index c107a1ba2..e0f3f815e 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/controller/CallNumberVoiceConfigController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/controller/CallNumberVoiceConfigController.java @@ -6,7 +6,7 @@ import com.openhis.web.triageandqueuemanage.appservice.CallNumberVoiceConfigAppS import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; @RestController @Slf4j diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/controller/TriageQueueController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/controller/TriageQueueController.java index 4aabafe70..faca9281a 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/controller/TriageQueueController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/controller/TriageQueueController.java @@ -16,7 +16,7 @@ import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.time.LocalDate; import java.util.HashMap; import java.util.Map; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbController.java index 5c6e52a60..d559dbaab 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbController.java @@ -47,8 +47,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.*; import java.math.BigDecimal; import java.net.URLEncoder; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbElepController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbElepController.java index c212ee1e6..3b07d7b0b 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbElepController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbElepController.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.rmi.ServerException; import java.util.Date; import java.util.Map; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbInpatientController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbInpatientController.java index e391a4736..4d7fe11d4 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbInpatientController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbInpatientController.java @@ -15,7 +15,7 @@ import com.openhis.yb.service.YbHttpUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 医保接口 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clearing3205AWebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clearing3205AWebParam.java index c4c36d35a..18199ade6 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clearing3205AWebParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clearing3205AWebParam.java @@ -5,7 +5,7 @@ package com.openhis.web.ybmanage.dto; import lombok.Data; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; /** * 【3205A】前端入参 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203AWebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203AWebParam.java index 49fca9556..9c79d0d23 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203AWebParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203AWebParam.java @@ -6,7 +6,7 @@ package com.openhis.web.ybmanage.dto; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.Date; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3201WebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3201WebParam.java index 4ade156d1..fa7307c7b 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3201WebParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3201WebParam.java @@ -2,8 +2,8 @@ package com.openhis.web.ybmanage.dto; import lombok.Data; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; @Data diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3203AWebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3203AWebParam.java index 2d9a2d4e4..26e038dfc 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3203AWebParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3203AWebParam.java @@ -2,8 +2,8 @@ package com.openhis.web.ybmanage.dto; import lombok.Data; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; @Data diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Result.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Result.java index f22a2cb0b..2820e4a1a 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Result.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Result.java @@ -1,15 +1,14 @@ package com.openhis.web.ybmanage.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @Data -@ApiModel(value="接口返回对象", description="接口返回对象") +@Schema(description="接口返回对象") @JsonIgnoreProperties(ignoreUnknown = true) public class Result implements Serializable { @@ -18,31 +17,31 @@ public class Result implements Serializable { /** * 成功标志 */ - @ApiModelProperty(value = "成功标志") + @Schema(description = "成功标志") private boolean success = true; /** * 返回处理消息 */ - @ApiModelProperty(value = "返回处理消息") + @Schema(description = "返回处理消息") private String message = "操作成功!"; /** * 返回代码 */ - @ApiModelProperty(value = "返回代码") + @Schema(description = "返回代码") private Integer code = 0; /** * 返回数据对象 data */ - @ApiModelProperty(value = "返回数据对象") + @Schema(description = "返回数据对象") private T result; /** * 时间戳 */ - @ApiModelProperty(value = "时间戳") + @Schema(description = "时间戳") private long timestamp ; } \ No newline at end of file diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3201WebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3201WebParam.java index ef40deed3..588b2779b 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3201WebParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3201WebParam.java @@ -5,7 +5,7 @@ package com.openhis.web.ybmanage.dto; import lombok.Data; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; /** * 【3201】前台入参 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3202WebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3202WebParam.java index ad6b36e70..9af774500 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3202WebParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3202WebParam.java @@ -5,7 +5,7 @@ package com.openhis.web.ybmanage.dto; import lombok.Data; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; /** * 【3202】前台入参 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2403InputInpatientParamDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2403InputInpatientParamDto.java index 358f8309f..4305584a4 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2403InputInpatientParamDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2403InputInpatientParamDto.java @@ -9,7 +9,7 @@ import com.openhis.yb.dto.Yb2403InputMdtrtGrpContent; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleBaseService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleBaseService.java index 496021d52..e121de8d5 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleBaseService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleBaseService.java @@ -7,7 +7,7 @@ import com.core.common.core.domain.R; import com.openhis.web.ybmanage.dto.VeriPrescriptionParam; import com.openhis.ybelep.domain.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.rmi.ServerException; import java.util.Date; import java.util.Map; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbService.java index 9fcae1bd2..e933e7231 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbService.java @@ -9,7 +9,7 @@ import com.openhis.yb.dto.Info1101Output; import com.openhis.yb.dto.PrePaymentDto; import com.openhis.yb.dto.Yb2402InputParam; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * 医保Service diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbElepBaseServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbElepBaseServiceImpl.java index cd6308131..d15941f30 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbElepBaseServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbElepBaseServiceImpl.java @@ -53,8 +53,8 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import java.rmi.ServerException; import java.util.*; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbServiceImpl.java index 24d085adf..8cdc04c95 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbServiceImpl.java @@ -62,7 +62,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.math.BigDecimal; import java.time.*; diff --git a/openhis-server-new/openhis-application/src/main/resources/application-dev.yml b/openhis-server-new/openhis-application/src/main/resources/application-dev.yml index 9cd7eeecc..d895ecc66 100755 --- a/openhis-server-new/openhis-application/src/main/resources/application-dev.yml +++ b/openhis-server-new/openhis-application/src/main/resources/application-dev.yml @@ -70,27 +70,28 @@ spring: config: multi-statement-allow: true # redis 配置 - redis: - # 地址 - host: 192.168.110.252 - # 端口,默认为6379 - port: 6379 - # 数据库索引 - database: 1 - # 密码 - password: Jchl1528 - # 连接超时时间 - timeout: 10s - lettuce: - pool: - # 连接池中的最小空闲连接 - min-idle: 0 - # 连接池中的最大空闲连接 - max-idle: 8 - # 连接池的最大数据库连接数 - max-active: 8 - # #连接池最大阻塞等待时间(使用负值表示没有限制) - max-wait: -1ms + data: + redis: + # 地址 + host: 192.168.110.252 + # 端口,默认为6379 + port: 6379 + # 数据库索引 + database: 1 + # 密码 + password: Jchl1528 + # 连接超时时间 + timeout: 10s + lettuce: + pool: + # 连接池中的最小空闲连接 + min-idle: 0 + # 连接池中的最大空闲连接 + max-idle: 8 + # 连接池的最大数据库连接数 + max-active: 8 + # #连接池最大阻塞等待时间(使用负值表示没有限制) + max-wait: -1ms # 服务器配置 server: diff --git a/openhis-server-new/openhis-application/src/main/resources/application-prd.yml b/openhis-server-new/openhis-application/src/main/resources/application-prd.yml index 32581f8b3..91f6c8851 100755 --- a/openhis-server-new/openhis-application/src/main/resources/application-prd.yml +++ b/openhis-server-new/openhis-application/src/main/resources/application-prd.yml @@ -60,31 +60,32 @@ spring: config: multi-statement-allow: true # redis 配置 - redis: - # 地址 - host: 192.168.110.252 - # 端口,默认为6379 - port: 6379 - # 数据库索引 - database: 1 - # 密码 - password: Jchl1528 - # 连接超时时间 - timeout: 10s - lettuce: - pool: - # 连接池中的最小空闲连接 - min-idle: 0 - # 连接池中的最大空闲连接 - max-idle: 8 - # 连接池的最大数据库连接数 - max-active: 8 - # #连接池最大阻塞等待时间(使用负值表示没有限制) - max-wait: -1ms - # 文言 - messages: - basename: i18n/general_message/messages - encoding: utf-8 + data: + redis: + # 地址 + host: 192.168.110.252 + # 端口,默认为6379 + port: 6379 + # 数据库索引 + database: 1 + # 密码 + password: Jchl1528 + # 连接超时时间 + timeout: 10s + lettuce: + pool: + # 连接池中的最小空闲连接 + min-idle: 0 + # 连接池中的最大空闲连接 + max-idle: 8 + # 连接池的最大数据库连接数 + max-active: 8 + # #连接池最大阻塞等待时间(使用负值表示没有限制) + max-wait: -1ms + # 文言 + messages: + basename: i18n/general_message/messages + encoding: utf-8 server: # 服务器的HTTP端口,默认为18080 port: 18082 diff --git a/openhis-server-new/openhis-application/src/main/resources/application-test.yml b/openhis-server-new/openhis-application/src/main/resources/application-test.yml index 3136dea96..8615df62c 100755 --- a/openhis-server-new/openhis-application/src/main/resources/application-test.yml +++ b/openhis-server-new/openhis-application/src/main/resources/application-test.yml @@ -60,31 +60,32 @@ spring: config: multi-statement-allow: true # redis 配置 - redis: - # 地址 - host: 192.168.110.252 - # 端口,默认为6379 - port: 6379 - # 数据库索引 - database: 1 - # 密码 - password: Jchl1528 - # 连接超时时间 - timeout: 10s - lettuce: - pool: - # 连接池中的最小空闲连接 - min-idle: 0 - # 连接池中的最大空闲连接 - max-idle: 8 - # 连接池的最大数据库连接数 - max-active: 8 - # #连接池最大阻塞等待时间(使用负值表示没有限制) - max-wait: -1ms - # 文言 - messages: - basename: i18n/general_message/messages - encoding: utf-8 + data: + redis: + # 地址 + host: 192.168.110.252 + # 端口,默认为6379 + port: 6379 + # 数据库索引 + database: 1 + # 密码 + password: Jchl1528 + # 连接超时时间 + timeout: 10s + lettuce: + pool: + # 连接池中的最小空闲连接 + min-idle: 0 + # 连接池中的最大空闲连接 + max-idle: 8 + # 连接池的最大数据库连接数 + max-active: 8 + # #连接池最大阻塞等待时间(使用负值表示没有限制) + max-wait: -1ms + # 文言 + messages: + basename: i18n/general_message/messages + encoding: utf-8 server: # 服务器的HTTP端口,默认为18080 port: 18081 diff --git a/openhis-server-new/openhis-application/src/main/resources/application.yml b/openhis-server-new/openhis-application/src/main/resources/application.yml index b3d0ab777..cc6fee372 100755 --- a/openhis-server-new/openhis-application/src/main/resources/application.yml +++ b/openhis-server-new/openhis-application/src/main/resources/application.yml @@ -132,7 +132,7 @@ xss: # flowable相关表 flowable: # true 会对数据库中所有表进行更新操作。如果表不存在,则自动创建(建议开发时使用) - database-schema-update: false + database-schema-update: true # 关闭定时任务JOB async-executor-activate: false diff --git a/openhis-server-new/openhis-common/pom.xml b/openhis-server-new/openhis-common/pom.xml index 9d2617c44..67020cba1 100755 --- a/openhis-server-new/openhis-common/pom.xml +++ b/openhis-server-new/openhis-common/pom.xml @@ -41,7 +41,17 @@ com.baomidou - mybatis-plus-boot-starter + mybatis-plus-spring-boot3-starter + + + com.baomidou + mybatis-plus-boot-starter + + + org.jetbrains.kotlin + kotlin-reflect + + diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/OperLogAspect.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/OperLogAspect.java index c38dcdfa8..a69e3d443 100755 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/OperLogAspect.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/OperLogAspect.java @@ -19,8 +19,8 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.lang.reflect.Method; import java.util.Date; import java.util.HashMap; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/HisQueryUtils.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/HisQueryUtils.java index 82ed04123..9a7c0c92e 100755 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/HisQueryUtils.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/HisQueryUtils.java @@ -8,7 +8,7 @@ import com.openhis.common.constant.CommonConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.lang.reflect.Field; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/openhis-server-new/openhis-domain/pom.xml b/openhis-server-new/openhis-domain/pom.xml index d216f6cb4..b616754f4 100755 --- a/openhis-server-new/openhis-domain/pom.xml +++ b/openhis-server-new/openhis-domain/pom.xml @@ -77,12 +77,17 @@ com.baomidou - mybatis-plus-boot-starter - - - - org.jetbrains.kotlin - kotlin-reflect + mybatis-plus-spring-boot3-starter + + + com.baomidou + mybatis-plus-boot-starter + + + org.jetbrains.kotlin + kotlin-reflect + + diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/OutpatientManageDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/OutpatientManageDto.java index 1e91eb71c..48836af35 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/OutpatientManageDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/OutpatientManageDto.java @@ -3,7 +3,7 @@ package com.openhis.administration.dto; import java.util.Date; import com.core.common.annotation.Excel; -import liquibase.pro.packaged.E; + import org.springframework.format.annotation.DateTimeFormat; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IFrequencyService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IFrequencyService.java index 864eb2ef9..52b67df9a 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IFrequencyService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IFrequencyService.java @@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.administration.domain.Frequency; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * @author 47826 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/AccountServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/AccountServiceImpl.java index 28f96ba17..f26aa3814 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/AccountServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/AccountServiceImpl.java @@ -13,7 +13,7 @@ import com.openhis.common.enums.AccountType; import com.openhis.common.enums.Whether; import org.springframework.stereotype.Service; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.List; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChangePriceRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChangePriceRecordServiceImpl.java index 48a2eb551..68aca5ce8 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChangePriceRecordServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChangePriceRecordServiceImpl.java @@ -12,7 +12,7 @@ import com.openhis.administration.service.IChangePriceRecordService; import com.openhis.common.enums.SupplyStatus; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterDiagnosisServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterDiagnosisServiceImpl.java index b7f2f297c..569985fcf 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterDiagnosisServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterDiagnosisServiceImpl.java @@ -10,7 +10,7 @@ import com.openhis.common.enums.Whether; import com.openhis.common.enums.ybenums.YbIptDiseTypeCode; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterServiceImpl.java index 59d9a4483..eeac2b4e7 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterServiceImpl.java @@ -17,7 +17,7 @@ import com.openhis.common.enums.EncounterStatus; import com.openhis.common.enums.EncounterType; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/FrequencyServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/FrequencyServiceImpl.java index adec574cd..41780dd75 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/FrequencyServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/FrequencyServiceImpl.java @@ -9,7 +9,7 @@ import com.openhis.administration.service.IFrequencyService; import com.openhis.common.utils.HisPageUtils; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * @author 47826 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/LocationServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/LocationServiceImpl.java index 2117ab18a..fc3aff5d5 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/LocationServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/LocationServiceImpl.java @@ -12,7 +12,7 @@ import com.openhis.common.enums.LocationForm; import com.openhis.common.enums.LocationStatus; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.List; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java index 776666483..78ffd154e 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java @@ -11,7 +11,7 @@ import com.openhis.administration.service.IOrganizationService; import com.openhis.common.enums.AccountStatus; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.List; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/AppointmentBookDTO.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/AppointmentBookDTO.java index a43c673a0..10c3877da 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/AppointmentBookDTO.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/AppointmentBookDTO.java @@ -1,8 +1,8 @@ package com.openhis.appointmentmanage.domain; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.math.BigDecimal; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionDefinitionService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionDefinitionService.java index a597ae2ab..adc4a5deb 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionDefinitionService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionDefinitionService.java @@ -3,7 +3,7 @@ package com.openhis.clinical.service; import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.clinical.domain.ConditionDefinition; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionDefinitionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionDefinitionServiceImpl.java index 2e30d38e4..1cf96100f 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionDefinitionServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionDefinitionServiceImpl.java @@ -13,7 +13,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.HashSet; import java.util.List; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/OrderServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/OrderServiceImpl.java index 10f7eec3c..032e88e42 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/OrderServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/OrderServiceImpl.java @@ -10,7 +10,7 @@ import com.openhis.common.enums.AssignSeqEnum; import com.openhis.common.enums.OrderStatus; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedureServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedureServiceImpl.java index 59bb91bfc..002b12ffa 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedureServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedureServiceImpl.java @@ -15,7 +15,7 @@ import com.openhis.common.enums.ProcedureCategory; import com.openhis.medication.domain.MedicationRequest; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/SurgeryServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/SurgeryServiceImpl.java index cfd2b832b..4fdfbf1f1 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/SurgeryServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/SurgeryServiceImpl.java @@ -11,7 +11,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/TicketServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/TicketServiceImpl.java index 25e48f1cb..76a764cba 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/TicketServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/TicketServiceImpl.java @@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentReconciliationServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentReconciliationServiceImpl.java index 67a4407b0..da79d6fc0 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentReconciliationServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentReconciliationServiceImpl.java @@ -48,7 +48,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.ArrayList; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDispenseServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDispenseServiceImpl.java index ad48bc76b..a739f35c9 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDispenseServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDispenseServiceImpl.java @@ -15,7 +15,7 @@ import com.openhis.medication.mapper.MedicationDispenseMapper; import com.openhis.medication.service.IMedicationDispenseService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.ZoneId; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/DoctorPhrase.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/DoctorPhrase.java index ba303d119..0ba983a52 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/DoctorPhrase.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/DoctorPhrase.java @@ -9,7 +9,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import java.time.LocalDateTime; @Data diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceDispenseServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceDispenseServiceImpl.java index 36ecd8e3e..040e978ff 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceDispenseServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceDispenseServiceImpl.java @@ -15,7 +15,7 @@ import com.openhis.workflow.mapper.DeviceDispenseMapper; import com.openhis.workflow.service.IDeviceDispenseService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.ZoneId; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java index 39b4ef426..6a68f05c9 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java @@ -19,7 +19,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/CancelPaymentDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/CancelPaymentDto.java index af3e117cb..3c79ae7ff 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/CancelPaymentDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/CancelPaymentDto.java @@ -8,8 +8,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.List; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/CancelRegPaymentDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/CancelRegPaymentDto.java index 45d337554..98ce259a4 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/CancelRegPaymentDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/CancelRegPaymentDto.java @@ -5,8 +5,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.List; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AWebParma.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AWebParma.java index f26b672d8..b00aedd96 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AWebParma.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AWebParma.java @@ -5,7 +5,7 @@ package com.openhis.yb.dto; import lombok.Data; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; /** * 【3205A】前端入参 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203AWebParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203AWebParam.java index 673dc1487..eafa4b763 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203AWebParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203AWebParam.java @@ -6,7 +6,7 @@ package com.openhis.yb.dto; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDto.java index f5ec88932..d8a848501 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDto.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import java.util.List; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentInpatientDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentInpatientDto.java index 7077adbb3..ac46266ac 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentInpatientDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentInpatientDto.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import java.util.List; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PrePaymentDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PrePaymentDto.java index e7427767a..860a71675 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PrePaymentDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PrePaymentDto.java @@ -6,8 +6,8 @@ package com.openhis.yb.dto; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import java.util.List; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Result.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Result.java index 598c523d7..19f6eb2f1 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Result.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Result.java @@ -1,15 +1,14 @@ package com.openhis.yb.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @Data -@ApiModel(value="接口返回对象", description="接口返回对象") +@Schema(description="接口返回对象") @JsonIgnoreProperties(ignoreUnknown = true) public class Result implements Serializable { @@ -18,31 +17,31 @@ public class Result implements Serializable { /** * 成功标志 */ - @ApiModelProperty(value = "成功标志") + @Schema(description = "成功标志") private boolean success = true; /** * 返回处理消息 */ - @ApiModelProperty(value = "返回处理消息") + @Schema(description = "返回处理消息") private String message = "操作成功!"; /** * 返回代码 */ - @ApiModelProperty(value = "返回代码") + @Schema(description = "返回代码") private Integer code = 0; /** * 返回数据对象 data */ - @ApiModelProperty(value = "返回数据对象") + @Schema(description = "返回数据对象") private T result; /** * 时间戳 */ - @ApiModelProperty(value = "时间戳") + @Schema(description = "时间戳") private long timestamp ; } \ No newline at end of file diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201WebParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201WebParam.java index 98093f4f5..b1e07c5e8 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201WebParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3201WebParam.java @@ -5,7 +5,7 @@ package com.openhis.yb.dto; import lombok.Data; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; /** * 【3201】前台入参 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ThreePartPayDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ThreePartPayDto.java index d5330239e..813f9ee3f 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ThreePartPayDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ThreePartPayDto.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import java.util.List; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputData.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputData.java index 9321ca933..1baee3787 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputData.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputData.java @@ -5,8 +5,8 @@ import lombok.Data; import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; import java.util.List; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiDiagnoseDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiDiagnoseDto.java index bd66aa338..516911581 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiDiagnoseDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiDiagnoseDto.java @@ -6,8 +6,8 @@ import lombok.Data; import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.util.Date; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiEncounterDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiEncounterDto.java index c2bf57242..b3f872aa6 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiEncounterDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiEncounterDto.java @@ -6,9 +6,9 @@ import lombok.Data; import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiOperationDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiOperationDto.java index 4da9f3484..9d723e378 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiOperationDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiOperationDto.java @@ -5,7 +5,7 @@ import lombok.Data; import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import java.util.Date; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiOrderDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiOrderDto.java index 0e839c4b2..28f63f1b0 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiOrderDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputFsiOrderDto.java @@ -6,8 +6,8 @@ import lombok.Data; import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.Date; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputPatientDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputPatientDto.java index 44a46e6d3..ec50c1a5c 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputPatientDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101InputPatientDto.java @@ -6,9 +6,9 @@ import lombok.Data; import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101OutputJudgeResultDetailDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101OutputJudgeResultDetailDto.java index c8507c1b5..1c87e4232 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101OutputJudgeResultDetailDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101OutputJudgeResultDetailDto.java @@ -5,8 +5,8 @@ import lombok.Data; import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101OutputResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101OutputResult.java index 200b31397..4b4b70c62 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101OutputResult.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101OutputResult.java @@ -5,9 +5,9 @@ import lombok.Data; import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.List; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3103InputData.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3103InputData.java index ca2836b6d..4e95464e6 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3103InputData.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3103InputData.java @@ -5,8 +5,8 @@ import lombok.Data; import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; import java.util.List; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3103InputWarn.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3103InputWarn.java index 733828cbf..83ed741c8 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3103InputWarn.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3103InputWarn.java @@ -5,7 +5,7 @@ import lombok.Data; import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; /** * 【3103】输入(节点标识:warns) diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputDiseinfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputDiseinfo.java index 8308edb10..ffb719bdb 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputDiseinfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputDiseinfo.java @@ -5,7 +5,7 @@ import lombok.Data; import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; /** * 【4101A】住院诊断信息(节点标识:diseinfo) diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputIcuinfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputIcuinfo.java index 865356eb7..b8418fbc5 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputIcuinfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputIcuinfo.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import java.util.Date; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputIteminfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputIteminfo.java index 80d4a6f0e..fd1692ed2 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputIteminfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputIteminfo.java @@ -5,7 +5,7 @@ import lombok.Data; import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import java.util.Date; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputOprninfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputOprninfo.java index c6a618a2b..dbd40c572 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputOprninfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputOprninfo.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import java.util.Date; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputOpspdiseinfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputOpspdiseinfo.java index d2db20758..562079b95 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputOpspdiseinfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputOpspdiseinfo.java @@ -5,7 +5,7 @@ import lombok.Data; import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; /** * 【4101A】门诊慢特病诊断信息(节点标识:opspdiseinfo) diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputSetlinfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputSetlinfo.java index 95a6e4776..dbdc97c7b 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputSetlinfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputSetlinfo.java @@ -6,8 +6,8 @@ import lombok.Data; import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.Date; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AOutputData.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AOutputData.java index 77affd2db..c8953d9ec 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AOutputData.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AOutputData.java @@ -5,7 +5,7 @@ import lombok.Data; import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; /** * 【4101A】输出(节点标识:data) diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/CancelRegPaymentModel.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/CancelRegPaymentModel.java index f35e3bcf5..87bacf998 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/CancelRegPaymentModel.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/CancelRegPaymentModel.java @@ -5,8 +5,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.yb.dto.PaymentDetailDto; import lombok.Data; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.List; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbDao.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbDao.java index 6e58fd817..99a0d5f45 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbDao.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbDao.java @@ -51,8 +51,8 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; -import javax.validation.constraints.NotNull; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/openhis-server-new/pom.xml b/openhis-server-new/pom.xml index 43946a208..66bcdcbf5 100755 --- a/openhis-server-new/pom.xml +++ b/openhis-server-new/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.18 + 3.5.14 @@ -28,7 +28,7 @@ 3.1.1 1.2.28 1.21 - 1.8.0 + 2.8.6 2.3.3 2.1.1 6.10.0 @@ -37,16 +37,13 @@ 2.3 0.9.1 - 9.0.96 - 1.2.13 1.18.34 3.5.16 - 6.8.0 + 7.1.0 42.7.4 5.3.3 - 1.5.21 + 4.5.14 2.0.61 - 1.6.2 2.5.1 2.12.4.1 5.8.35 @@ -126,13 +123,6 @@ ${pinyin4j.version} - - - io.swagger - swagger-models - ${swagger-models.version} - - com.alibaba.fastjson2 fastjson2 @@ -145,13 +135,6 @@ ${fastjson2.version} - - - io.swagger - swagger-annotations - ${swagger-annotations.version} - - @@ -231,17 +214,33 @@ + + com.baomidou + mybatis-plus-spring-boot3-starter + ${mybatis-plus.version} + + + org.jetbrains.kotlin + kotlin-reflect + + + com.baomidou + mybatis-plus-boot-starter + + + + + com.baomidou mybatis-plus-boot-starter ${mybatis-plus.version} - com.alibaba - druid-spring-boot-starter + druid-spring-boot-3-starter ${druid.version} @@ -269,7 +268,7 @@ org.springdoc - springdoc-openapi-ui + springdoc-openapi-starter-webmvc-ui ${springdoc.version} @@ -329,12 +328,7 @@ ${jsr250.version} - - - org.jetbrains.kotlin - kotlin-reflect - 1.9.10 - + @@ -343,6 +337,11 @@ ${jsqlparser.version} + + org.apache.httpcomponents + httpclient + ${httpclient.version} + diff --git a/openhis-server-new/pom.xml.bak b/openhis-server-new/pom.xml.bak new file mode 100755 index 000000000..447c26f9a --- /dev/null +++ b/openhis-server-new/pom.xml.bak @@ -0,0 +1,423 @@ + + + 4.0.0 + + + org.springframework.boot + spring-boot-starter-parent + 2.5.15 + + + + com.openhis + openhis-server + 0.0.1-SNAPSHOT + + openhis-server + 开放医疗管理系统 + + + 0.0.1-SNAPSHOT + 0.0.1-SNAPSHOT + UTF-8 + UTF-8 + 17 + 3.11.0 + 3.1.1 + 1.2.27 + 1.21 + 3.0.0 + 2.3.3 + 1.4.7 + 6.6.5 + 2.13.0 + 4.1.2 + 2.3 + 0.9.1 + + 9.0.96 + 1.2.13 + 1.18.34 + 3.5.5 + 6.8.0 + 42.2.27 + 5.3.3 + 1.5.21 + 2.0.58 + 1.6.2 + 2.5.1 + 2.12.4.1 + 5.3.8 + 1.69 + 7.1.2 + 5.5.12 + 5.2.0 + 9.4.0 + 1.3.2 + 4.5 + + + + + + + com.mysql + mysql-connector-j + ${mysql-connector-j.version} + + + org.projectlombok + lombok + ${lombok.version} + provided + + + + com.itextpdf + itextpdf + ${itextpdf.version} + + + com.itextpdf + itext-asian + ${itext-asian.version} + + + + cn.hutool + hutool-all + ${hutool-all.version} + + + + org.bouncycastle + bcprov-jdk15on + ${bcprov-jdk15on.version} + + + + + com.itextpdf + kernel + ${kernel.version} + + + + + + com.core + core-admin + ${project.version} + + + + + com.yomahub + liteflow-spring-boot-starter + ${liteflow-spring-boot-starter.version} + + + + + com.belerweb + pinyin4j + ${pinyin4j.version} + + + + + io.swagger + swagger-models + ${swagger-models.version} + + + + com.alibaba.fastjson2 + fastjson2 + ${fastjson2.version} + + + + com.alibaba + fastjson + ${fastjson2.version} + + + + + io.swagger + swagger-annotations + ${swagger-annotations.version} + + + + + + com.googlecode.aviator + aviator + ${aviator.version} + + + + + com.openhis + openhis-miniapp + ${openhis.version} + + + + + com.openhis + openhis-application + ${openhis.version} + + + + + com.openhis + openhis-domain + ${openhis.version} + + + + + com.openhis + openhis-common + ${openhis.version} + + + + + com.core + core-quartz + ${core.version} + + + + + com.core + core-generator + ${core.version} + + + + + com.core + core-framework + ${core.version} + + + + + com.core + core-system + ${core.version} + + + + + com.core + core-common + ${core.version} + + + + + com.core + core-flowable + ${core.version} + + + + + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus.version} + + + + + + com.alibaba + druid-spring-boot-starter + ${druid.version} + + + + + eu.bitwalker + UserAgentUtils + ${bitwalker.version} + + + + + com.github.pagehelper + pagehelper-spring-boot-starter + ${pagehelper.boot.version} + + + + + com.github.oshi + oshi-core + ${oshi.version} + + + + + io.springfox + springfox-boot-starter + ${swagger.version} + + + io.swagger + swagger-models + + + + + + + commons-io + commons-io + ${commons.io.version} + + + + + org.apache.poi + poi-ooxml + ${poi.version} + + + + + org.apache.velocity + velocity-engine-core + ${velocity.version} + + + + + io.jsonwebtoken + jjwt + ${jwt.version} + + + + + pro.fessional + kaptcha + ${kaptcha.version} + + + + + org.flowable + flowable-spring-boot-starter + ${flowable.version} + + + + org.postgresql + postgresql + ${postgresql.version} + + + + + javax.annotation + javax.annotation-api + ${jsr250.version} + + + + + org.jetbrains.kotlin + kotlin-reflect + 1.9.10 + + + + + com.github.jsqlparser + jsqlparser + ${jsqlparser.version} + + + + + + + + openhis-application + openhis-domain + openhis-common + core-admin + core-framework + core-system + core-quartz + core-generator + core-common + core-flowable + + + pom + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${java.version} + ${java.version} + ${project.build.sourceEncoding} + + -parameters + -Xlint:unchecked + --add-modules + java.base + + + + org.projectlombok + lombok + ${lombok.version} + + + + + + + + + + public + aliyun nexus + https://maven.aliyun.com/repository/public + + true + + + + + + + public + aliyun nexus + https://maven.aliyun.com/repository/public + + true + + + false + + + + + \ No newline at end of file diff --git a/openhis-server-new/pom.xml.bak-2.5.15 b/openhis-server-new/pom.xml.bak-2.5.15 new file mode 100755 index 000000000..97301e5c9 --- /dev/null +++ b/openhis-server-new/pom.xml.bak-2.5.15 @@ -0,0 +1,423 @@ + + + 4.0.0 + + + org.springframework.boot + spring-boot-starter-parent + 2.5.15 + + + + com.openhis + openhis-server + 0.0.1-SNAPSHOT + + openhis-server + 开放医疗管理系统 + + + 0.0.1-SNAPSHOT + 0.0.1-SNAPSHOT + UTF-8 + UTF-8 + 17 + 3.11.0 + 3.1.1 + 1.2.28 + 1.21 + 3.0.0 + 2.3.3 + 1.4.7 + 6.10.0 + 2.21.0 + 4.1.2 + 2.3 + 0.9.1 + + 9.0.96 + 1.2.13 + 1.18.34 + 3.5.5 + 6.8.0 + 42.7.4 + 5.3.3 + 1.5.21 + 2.0.61 + 1.6.2 + 2.5.1 + 2.12.4.1 + 5.8.35 + 1.80 + 7.1.2 + 5.5.13.4 + 5.2.0 + 9.4.0 + 1.3.2 + 4.5 + + + + + + + com.mysql + mysql-connector-j + ${mysql-connector-j.version} + + + org.projectlombok + lombok + ${lombok.version} + provided + + + + com.itextpdf + itextpdf + ${itextpdf.version} + + + com.itextpdf + itext-asian + ${itext-asian.version} + + + + cn.hutool + hutool-all + ${hutool-all.version} + + + + org.bouncycastle + bcprov-jdk18on + ${bcprov-jdk18on.version} + + + + + com.itextpdf + kernel + ${kernel.version} + + + + + + com.core + core-admin + ${project.version} + + + + + com.yomahub + liteflow-spring-boot-starter + ${liteflow-spring-boot-starter.version} + + + + + com.belerweb + pinyin4j + ${pinyin4j.version} + + + + + io.swagger + swagger-models + ${swagger-models.version} + + + + com.alibaba.fastjson2 + fastjson2 + ${fastjson2.version} + + + + com.alibaba + fastjson + ${fastjson2.version} + + + + + io.swagger + swagger-annotations + ${swagger-annotations.version} + + + + + + com.googlecode.aviator + aviator + ${aviator.version} + + + + + com.openhis + openhis-miniapp + ${openhis.version} + + + + + com.openhis + openhis-application + ${openhis.version} + + + + + com.openhis + openhis-domain + ${openhis.version} + + + + + com.openhis + openhis-common + ${openhis.version} + + + + + com.core + core-quartz + ${core.version} + + + + + com.core + core-generator + ${core.version} + + + + + com.core + core-framework + ${core.version} + + + + + com.core + core-system + ${core.version} + + + + + com.core + core-common + ${core.version} + + + + + com.core + core-flowable + ${core.version} + + + + + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus.version} + + + + + + com.alibaba + druid-spring-boot-starter + ${druid.version} + + + + + eu.bitwalker + UserAgentUtils + ${bitwalker.version} + + + + + com.github.pagehelper + pagehelper-spring-boot-starter + ${pagehelper.boot.version} + + + + + com.github.oshi + oshi-core + ${oshi.version} + + + + + io.springfox + springfox-boot-starter + ${swagger.version} + + + io.swagger + swagger-models + + + + + + + commons-io + commons-io + ${commons.io.version} + + + + + org.apache.poi + poi-ooxml + ${poi.version} + + + + + org.apache.velocity + velocity-engine-core + ${velocity.version} + + + + + io.jsonwebtoken + jjwt + ${jwt.version} + + + + + pro.fessional + kaptcha + ${kaptcha.version} + + + + + org.flowable + flowable-spring-boot-starter + ${flowable.version} + + + + org.postgresql + postgresql + ${postgresql.version} + + + + + javax.annotation + javax.annotation-api + ${jsr250.version} + + + + + org.jetbrains.kotlin + kotlin-reflect + 1.9.10 + + + + + com.github.jsqlparser + jsqlparser + ${jsqlparser.version} + + + + + + + + openhis-application + openhis-domain + openhis-common + core-admin + core-framework + core-system + core-quartz + core-generator + core-common + core-flowable + + + pom + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${java.version} + ${java.version} + ${project.build.sourceEncoding} + + -parameters + -Xlint:unchecked + --add-modules + java.base + + + + org.projectlombok + lombok + ${lombok.version} + + + + + + + + + + public + aliyun nexus + https://maven.aliyun.com/repository/public + + true + + + + + + + public + aliyun nexus + https://maven.aliyun.com/repository/public + + true + + + false + + + + + \ No newline at end of file diff --git a/openhis-ui-vue3/.backup-ruoyi-392/Settings.vue.bak b/openhis-ui-vue3/.backup-ruoyi-392/Settings.vue.bak new file mode 100755 index 000000000..9026f290c --- /dev/null +++ b/openhis-ui-vue3/.backup-ruoyi-392/Settings.vue.bak @@ -0,0 +1,286 @@ + + + + + \ No newline at end of file diff --git a/openhis-ui-vue3/.backup-ruoyi-392/package.json b/openhis-ui-vue3/.backup-ruoyi-392/package.json new file mode 100755 index 000000000..b4c9c8d77 --- /dev/null +++ b/openhis-ui-vue3/.backup-ruoyi-392/package.json @@ -0,0 +1,88 @@ +{ + "name": "openhis", + "version": "3.8.10", + "description": "OpenHIS管理系统", + "author": "OpenHIS", + "license": "MIT", + "type": "module", + "scripts": { + "dev": "vite --mode dev", + "build:prod": "vite build --mode prod", + "build:stage": "vite build --mode staging", + "build:test": "vite build --mode test", + "build:dev": "vite build --mode dev", + "preview": "vite preview", + "build:spug": "vite build --mode spug", + "test": "vitest", + "test:run": "vitest run", + "test:coverage": "vitest run --coverage", + "test:ui": "vitest --ui", + "lint": "eslint . --ext .js,.vue src/", + "test:e2e": "playwright test", + "test:e2e:ui": "playwright test --ui", + "test:e2e:report": "playwright show-report" + }, + "repository": { + "type": "git", + "url": "giturl" + }, + "dependencies": { + "@element-plus/icons-vue": "^2.3.2", + "@vue/shared": "^3.5.25", + "@vueup/vue-quill": "^1.5.1", + "@vueuse/core": "^14.3.0", + "axios": "^1.16.1", + "china-division": "^2.7.0", + "d3": "^7.9.0", + "dayjs": "^1.11.19", + "decimal.js": "^10.5.0", + "echarts": "^5.4.3", + "element-china-area-data": "^6.1.0", + "element-plus": "^2.14.1", + "file-saver": "^2.0.5", + "fuse.js": "^7.0.0", + "html2pdf.js": "^0.10.3", + "js-cookie": "^3.0.5", + "jsencrypt": "^3.3.2", + "json-bigint": "^1.0.0", + "lodash-es": "^4.17.21", + "nprogress": "^0.2.0", + "pinia": "^2.2.0", + "pinyin": "^4.0.0-alpha.2", + "province-city-china": "^8.5.8", + "qrcodejs2": "^0.0.2", + "segmentit": "^2.0.3", + "sortablejs": "^1.15.7", + "v-region": "^3.3.0", + "vue": "^3.5.25", + "vue-area-linkage": "^5.1.0", + "vue-cropper": "^1.1.1", + "vue-plugin-hiprint": "^0.0.60", + "vue-router": "^4.3.0", + "vxe-table": "^4.19.6", + "xe-utils": "^4.0.8" + }, + "devDependencies": { + "@playwright/test": "^1.60.0", + "@types/node": "^25.0.1", + "@vitejs/plugin-vue": "^5.2.4", + "@vue/test-utils": "^2.4.6", + "eslint": "^10.4.1", + "eslint-import-resolver-alias": "^1.1.2", + "eslint-plugin-import": "^2.32.0", + "eslint-plugin-vue": "^10.9.1", + "globals": "^17.5.0", + "happy-dom": "^20.8.3", + "jsdom": "^28.1.0", + "pg": "^8.18.0", + "sass": "^1.100.0", + "typescript": "^5.9.3", + "unplugin-auto-import": "^0.18.6", + "vite": "^6.4.3", + "vite-plugin-compression": "0.5.1", + "vite-plugin-svg-icons": "2.0.1", + "vite-plugin-vue-mcp": "^0.3.2", + "vitest": "^4.0.18", + "vue-tsc": "^3.3.3" + } +} \ No newline at end of file diff --git a/openhis-ui-vue3/.backup-ruoyi-392/permission.js b/openhis-ui-vue3/.backup-ruoyi-392/permission.js new file mode 100755 index 000000000..d4b6b93aa --- /dev/null +++ b/openhis-ui-vue3/.backup-ruoyi-392/permission.js @@ -0,0 +1,103 @@ +import router from './router' +import {ElMessage} from 'element-plus' +import NProgress from 'nprogress' +import 'nprogress/nprogress.css' +import {getToken} from '@/utils/auth' +import {isHttp} from '@/utils/validate' +import {isRelogin} from '@/utils/request' +import useUserStore from '@/store/modules/user' +import useSettingsStore from '@/store/modules/settings' +import usePermissionStore from '@/store/modules/permission' + +// 全局变量,用于控制公告弹窗只显示一次 +let hasShownNoticePopup = false + +NProgress.configure({ showSpinner: false }); + +const whiteList = ['/login', '/register']; + +router.beforeEach((to, from, next) => { + NProgress.start() + if (getToken()) { + to.meta.title && useSettingsStore().setTitle(to.meta.title) + /* has token*/ + if (to.path === '/login') { + next({ path: '/' }) + NProgress.done() + } else if (whiteList.indexOf(to.path) !== -1) { + next() + } else { + if (useUserStore().roles.length === 0) { + isRelogin.show = true + // 判断当前用户是否已拉取完user_info信息 + useUserStore().getInfo().then(() => { + isRelogin.show = false + usePermissionStore().generateRoutes().then(accessRoutes => { + // 根据roles权限生成可访问的路由表 + accessRoutes.forEach(route => { + if (!isHttp(route.path)) { + // 检查是否已经存在同名路由 + if (!router.hasRoute(route.name)) { + router.addRoute(route) // 动态添加可访问路由表 + } + } + }) + next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 + }) + }).catch(err => { + useUserStore().logOut().then(() => { + ElMessage.error(err) + next({ path: '/' }) + }) + }) + } else { + next() + } + } + } else { + // 没有token + if (whiteList.indexOf(to.path) !== -1) { + // 在免登录白名单,直接进入 + next() + } else { + next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页 + NProgress.done() + } + } +}) + +router.afterEach(() => { + NProgress.done() + + // 登录成功后显示公告弹窗(仅限非登录页面且未显示过) + const token = getToken() + const isLoginPage = router.currentRoute.value.path === '/login' + + if (token && !isLoginPage && !hasShownNoticePopup) { + // 延迟显示,确保页面完全加载 + setTimeout(() => { + showNoticePopupGlobally() + hasShownNoticePopup = true + }, 1500) + } +}) + +// 全局函数:显示公告弹窗 +function showNoticePopupGlobally() { + try { + // 通过多种方式尝试获取并显示公告弹窗 + const layouts = document.querySelectorAll('.app-wrapper') + for (const layout of layouts) { + const noticePopupRef = layout.__vue_app__?.config.globalProperties.$refs?.noticePopupRef + if (noticePopupRef && noticePopupRef.showNotice) { + noticePopupRef.showNotice() + return + } + } + + // 如果直接获取失败,尝试通过事件总线方式 + window.dispatchEvent(new CustomEvent('show-notice-popup')) + } catch (error) { + console.error('显示公告弹窗失败:', error) + } +} \ No newline at end of file diff --git a/openhis-ui-vue3/.backup-ruoyi-392/tagsView.js b/openhis-ui-vue3/.backup-ruoyi-392/tagsView.js new file mode 100755 index 000000000..49d4811fa --- /dev/null +++ b/openhis-ui-vue3/.backup-ruoyi-392/tagsView.js @@ -0,0 +1,190 @@ +const useTagsViewStore = defineStore( + 'tags-view', + { + state: () => ({ + visitedViews: [], + cachedViews: [], + iframeViews: [] + }), + actions: { + addView(view) { + this.addVisitedView(view) + this.addCachedView(view) + }, + addIframeView(view) { + if (this.iframeViews.some(v => v.path === view.path)) return + this.iframeViews.push( + Object.assign({}, view, { + title: view.meta.title || 'no-name' + }) + ) + }, + addVisitedView(view) { + if (this.visitedViews.some(v => v.path === view.path)) return + this.visitedViews.push( + Object.assign({}, view, { + title: view.meta.title || 'no-name' + }) + ) + if(this.visitedViews.length==2){ + sessionStorage.setItem('visitedViews',this.visitedViews[1].name) + if(this.visitedViews[1].query.supplyBusNo){ // 编辑 + sessionStorage.setItem('visitedViewsQuery',this.visitedViews[1].query.supplyBusNo) + }else{ + sessionStorage.setItem('visitedViewsQuery',"") + } + } + }, + addCachedView(view) { + if (this.cachedViews.includes(view.name)) return + if (!view.meta.noCache) { + this.cachedViews.push(view.name) + } + }, + delView(view) { + return new Promise(resolve => { + this.delVisitedView(view) + this.delCachedView(view) + resolve({ + visitedViews: [...this.visitedViews], + cachedViews: [...this.cachedViews] + }) + }) + }, + delVisitedView(view) { + return new Promise(resolve => { + for (const [i, v] of this.visitedViews.entries()) { + if (v.path === view.path) { + this.visitedViews.splice(i, 1) + break + } + } + this.iframeViews = this.iframeViews.filter(item => item.path !== view.path) + resolve([...this.visitedViews]) + }) + }, + delIframeView(view) { + return new Promise(resolve => { + this.iframeViews = this.iframeViews.filter(item => item.path !== view.path) + resolve([...this.iframeViews]) + }) + }, + delCachedView(view) { + return new Promise(resolve => { + const index = this.cachedViews.indexOf(view.name) + index > -1 && this.cachedViews.splice(index, 1) + resolve([...this.cachedViews]) + }) + }, + delOthersViews(view) { + return new Promise(resolve => { + this.delOthersVisitedViews(view) + this.delOthersCachedViews(view) + resolve({ + visitedViews: [...this.visitedViews], + cachedViews: [...this.cachedViews] + }) + }) + }, + delOthersVisitedViews(view) { + return new Promise(resolve => { + this.visitedViews = this.visitedViews.filter(v => { + return v.meta.affix || v.path === view.path + }) + this.iframeViews = this.iframeViews.filter(item => item.path === view.path) + resolve([...this.visitedViews]) + }) + }, + delOthersCachedViews(view) { + return new Promise(resolve => { + const index = this.cachedViews.indexOf(view.name) + if (index > -1) { + this.cachedViews = this.cachedViews.slice(index, index + 1) + } else { + this.cachedViews = [] + } + resolve([...this.cachedViews]) + }) + }, + delAllViews(view) { + return new Promise(resolve => { + this.delAllVisitedViews(view) + this.delAllCachedViews(view) + resolve({ + visitedViews: [...this.visitedViews], + cachedViews: [...this.cachedViews] + }) + }) + }, + delAllVisitedViews(view) { + return new Promise(resolve => { + const affixTags = this.visitedViews.filter(tag => tag.meta.affix) + this.visitedViews = affixTags + this.iframeViews = [] + resolve([...this.visitedViews]) + }) + }, + delAllCachedViews(view) { + return new Promise(resolve => { + this.cachedViews = [] + resolve([...this.cachedViews]) + }) + }, + updateVisitedView(view) { + for (let v of this.visitedViews) { + if (v.path === view.path) { + v = Object.assign(v, view) + break + } + } + }, + delRightTags(view) { + return new Promise(resolve => { + const index = this.visitedViews.findIndex(v => v.path === view.path) + if (index === -1) { + return + } + this.visitedViews = this.visitedViews.filter((item, idx) => { + if (idx <= index || (item.meta && item.meta.affix)) { + return true + } + const i = this.cachedViews.indexOf(item.name) + if (i > -1) { + this.cachedViews.splice(i, 1) + } + if(item.meta.link) { + const fi = this.iframeViews.findIndex(v => v.path === item.path) + this.iframeViews.splice(fi, 1) + } + return false + }) + resolve([...this.visitedViews]) + }) + }, + delLeftTags(view) { + return new Promise(resolve => { + const index = this.visitedViews.findIndex(v => v.path === view.path) + if (index === -1) { + return + } + this.visitedViews = this.visitedViews.filter((item, idx) => { + if (idx >= index || (item.meta && item.meta.affix)) { + return true + } + const i = this.cachedViews.indexOf(item.name) + if (i > -1) { + this.cachedViews.splice(i, 1) + } + if(item.meta.link) { + const fi = this.iframeViews.findIndex(v => v.path === item.path) + this.iframeViews.splice(fi, 1) + } + return false + }) + resolve([...this.visitedViews]) + }) + } + } + }) + +export default useTagsViewStore diff --git a/openhis-ui-vue3/.backup-ruoyi-392/tagsView.js.bak b/openhis-ui-vue3/.backup-ruoyi-392/tagsView.js.bak new file mode 100755 index 000000000..49d4811fa --- /dev/null +++ b/openhis-ui-vue3/.backup-ruoyi-392/tagsView.js.bak @@ -0,0 +1,190 @@ +const useTagsViewStore = defineStore( + 'tags-view', + { + state: () => ({ + visitedViews: [], + cachedViews: [], + iframeViews: [] + }), + actions: { + addView(view) { + this.addVisitedView(view) + this.addCachedView(view) + }, + addIframeView(view) { + if (this.iframeViews.some(v => v.path === view.path)) return + this.iframeViews.push( + Object.assign({}, view, { + title: view.meta.title || 'no-name' + }) + ) + }, + addVisitedView(view) { + if (this.visitedViews.some(v => v.path === view.path)) return + this.visitedViews.push( + Object.assign({}, view, { + title: view.meta.title || 'no-name' + }) + ) + if(this.visitedViews.length==2){ + sessionStorage.setItem('visitedViews',this.visitedViews[1].name) + if(this.visitedViews[1].query.supplyBusNo){ // 编辑 + sessionStorage.setItem('visitedViewsQuery',this.visitedViews[1].query.supplyBusNo) + }else{ + sessionStorage.setItem('visitedViewsQuery',"") + } + } + }, + addCachedView(view) { + if (this.cachedViews.includes(view.name)) return + if (!view.meta.noCache) { + this.cachedViews.push(view.name) + } + }, + delView(view) { + return new Promise(resolve => { + this.delVisitedView(view) + this.delCachedView(view) + resolve({ + visitedViews: [...this.visitedViews], + cachedViews: [...this.cachedViews] + }) + }) + }, + delVisitedView(view) { + return new Promise(resolve => { + for (const [i, v] of this.visitedViews.entries()) { + if (v.path === view.path) { + this.visitedViews.splice(i, 1) + break + } + } + this.iframeViews = this.iframeViews.filter(item => item.path !== view.path) + resolve([...this.visitedViews]) + }) + }, + delIframeView(view) { + return new Promise(resolve => { + this.iframeViews = this.iframeViews.filter(item => item.path !== view.path) + resolve([...this.iframeViews]) + }) + }, + delCachedView(view) { + return new Promise(resolve => { + const index = this.cachedViews.indexOf(view.name) + index > -1 && this.cachedViews.splice(index, 1) + resolve([...this.cachedViews]) + }) + }, + delOthersViews(view) { + return new Promise(resolve => { + this.delOthersVisitedViews(view) + this.delOthersCachedViews(view) + resolve({ + visitedViews: [...this.visitedViews], + cachedViews: [...this.cachedViews] + }) + }) + }, + delOthersVisitedViews(view) { + return new Promise(resolve => { + this.visitedViews = this.visitedViews.filter(v => { + return v.meta.affix || v.path === view.path + }) + this.iframeViews = this.iframeViews.filter(item => item.path === view.path) + resolve([...this.visitedViews]) + }) + }, + delOthersCachedViews(view) { + return new Promise(resolve => { + const index = this.cachedViews.indexOf(view.name) + if (index > -1) { + this.cachedViews = this.cachedViews.slice(index, index + 1) + } else { + this.cachedViews = [] + } + resolve([...this.cachedViews]) + }) + }, + delAllViews(view) { + return new Promise(resolve => { + this.delAllVisitedViews(view) + this.delAllCachedViews(view) + resolve({ + visitedViews: [...this.visitedViews], + cachedViews: [...this.cachedViews] + }) + }) + }, + delAllVisitedViews(view) { + return new Promise(resolve => { + const affixTags = this.visitedViews.filter(tag => tag.meta.affix) + this.visitedViews = affixTags + this.iframeViews = [] + resolve([...this.visitedViews]) + }) + }, + delAllCachedViews(view) { + return new Promise(resolve => { + this.cachedViews = [] + resolve([...this.cachedViews]) + }) + }, + updateVisitedView(view) { + for (let v of this.visitedViews) { + if (v.path === view.path) { + v = Object.assign(v, view) + break + } + } + }, + delRightTags(view) { + return new Promise(resolve => { + const index = this.visitedViews.findIndex(v => v.path === view.path) + if (index === -1) { + return + } + this.visitedViews = this.visitedViews.filter((item, idx) => { + if (idx <= index || (item.meta && item.meta.affix)) { + return true + } + const i = this.cachedViews.indexOf(item.name) + if (i > -1) { + this.cachedViews.splice(i, 1) + } + if(item.meta.link) { + const fi = this.iframeViews.findIndex(v => v.path === item.path) + this.iframeViews.splice(fi, 1) + } + return false + }) + resolve([...this.visitedViews]) + }) + }, + delLeftTags(view) { + return new Promise(resolve => { + const index = this.visitedViews.findIndex(v => v.path === view.path) + if (index === -1) { + return + } + this.visitedViews = this.visitedViews.filter((item, idx) => { + if (idx >= index || (item.meta && item.meta.affix)) { + return true + } + const i = this.cachedViews.indexOf(item.name) + if (i > -1) { + this.cachedViews.splice(i, 1) + } + if(item.meta.link) { + const fi = this.iframeViews.findIndex(v => v.path === item.path) + this.iframeViews.splice(fi, 1) + } + return false + }) + resolve([...this.visitedViews]) + }) + } + } + }) + +export default useTagsViewStore diff --git a/openhis-ui-vue3/.backup-ruoyi-392/user.js b/openhis-ui-vue3/.backup-ruoyi-392/user.js new file mode 100755 index 000000000..3d78ba00e --- /dev/null +++ b/openhis-ui-vue3/.backup-ruoyi-392/user.js @@ -0,0 +1,99 @@ +import {getInfo, login, logout} from '@/api/login' +import {getToken, removeToken, setToken} from '@/utils/auth' +import defAva from '@/assets/images/user.png' +import {defineStore} from 'pinia' + +const useUserStore = defineStore( + 'user', + { + state: () => ({ + token: getToken(), + id: '', + name: '', + avatar: '', + orgId: '', + practitionerId: '', + orgName: '', + nickName: '', + fixmedinsCode: '', // 医疗机构编码 + roles: [], + permissions: [], + tenantId: '', + tenantName: '', // 租户名称 + hospitalName:'', + optionMap: {} // 租户配置项Map(从sys_tenant_option表读取) + }), + actions: { + // 登录 + login(userInfo) { + const username = userInfo.username.trim() + const password = userInfo.password + const code = userInfo.code + const uuid = userInfo.uuid + const tenantId = userInfo.tenantId + return new Promise((resolve, reject) => { + login(username, password, code, uuid ,tenantId).then(res => { + setToken(res.token) + this.token = res.token + this.tenantId = tenantId + resolve() + }).catch(error => { + reject(error) + }) + }) + }, + // 获取用户信息 + getInfo() { + return new Promise((resolve, reject) => { + getInfo().then(res => { + const user = res.user + const avatar = (user.avatar == "" || user.avatar == null) ? defAva : import.meta.env.VITE_APP_BASE_API + user.avatar; + + if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组 + this.roles = res.roles + this.permissions = res.permissions + } else { + this.roles = ['ROLE_DEFAULT'] + } + // console.log('user info:', user); + this.id = user.userId + this.name = user.userName // 用户账号(对应数据库的user_name字段,如'admin') + this.orgId = user.orgId + this.orgName = user.orgName + this.nickName = user.nickName + this.practitionerId = res.practitionerId + this.fixmedinsCode = res.optionJson.fixmedinsCode + this.avatar = avatar + this.optionMap = res.optionMap || {} + // 优先从optionMap获取配置,如果没有则从optionJson获取 + this.hospitalName = this.optionMap.hospitalName || res.optionJson.hospitalName || '' + this.tenantName = res.tenantName || '' + + resolve(res) + }).catch(error => { + reject(error) + }) + }) + }, + // 退出系统 + logOut() { + return new Promise((resolve, reject) => { + logout(this.token).then(() => { + this.token = '' + this.roles = [] + this.permissions = [] + this.tenantId = '' + removeToken() + resolve() + }).catch(error => { + reject(error) + }) + }) + }, + removeRoles(){ + this.roles = [] + } + } + }) + +export default useUserStore diff --git a/openhis-ui-vue3/.backup-ruoyi-392/validate.js b/openhis-ui-vue3/.backup-ruoyi-392/validate.js new file mode 100755 index 000000000..27e896916 --- /dev/null +++ b/openhis-ui-vue3/.backup-ruoyi-392/validate.js @@ -0,0 +1,127 @@ +/** + * 判断url是否是http或https + * @param {string} path + * @returns {Boolean} + */ +export function isHttp(url) { + return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1; +} + +/** + * 判断path是否为外链 + * @param {string} path + * @returns {Boolean} + */ +export function isExternal(path) { + return /^(https?:|mailto:|tel:)/.test(path); +} + +/** + * @param {string} str + * @returns {Boolean} + */ +export function validUsername(str) { + const valid_map = ['admin', 'editor']; + return valid_map.indexOf(str.trim()) >= 0; +} + +/** + * @param {string} url + * @returns {Boolean} + */ +export function validURL(url) { + const reg = + /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/; + return reg.test(url); +} + +/** + * @param {string} str + * @returns {Boolean} + */ +export function validLowerCase(str) { + const reg = /^[a-z]+$/; + return reg.test(str); +} + +/** + * @param {string} str + * @returns {Boolean} + */ +export function validUpperCase(str) { + const reg = /^[A-Z]+$/; + return reg.test(str); +} + +/** + * @param {string} str + * @returns {Boolean} + */ +export function validAlphabets(str) { + const reg = /^[A-Za-z]+$/; + return reg.test(str); +} + +/** + * @param {string} email + * @returns {Boolean} + */ +export function validEmail(email) { + const reg = + /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; + return reg.test(email); +} + +/** + * @param {string} str + * @returns {Boolean} + */ +export function isString(str) { + if (typeof str === 'string' || str instanceof String) { + return true; + } + return false; +} + +/** + * @param {Array} arg + * @returns {Boolean} + */ +export function isArray(arg) { + if (typeof Array.isArray === 'undefined') { + return Object.prototype.toString.call(arg) === '[object Array]'; + } + return Array.isArray(arg); +} +// 手机号正则 +export function isValidCNPhoneNumber(phone) { + const regex = /^1[3-9]\d{9}$/; + return regex.test(phone); +} +// 身份证号正则 +export function isValidCNidCardNumber(idCard) { + const regex = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/; + return regex.test(idCard); +} +// 根据身份证号获取性别和年龄 +export function getGenderAndAge(idCard) { + // 确保身份证号码是18位 + if (idCard.length !== 18) { + return { error: '身份证号码必须是18位' }; + } + // 提取出生年月日 + const birthDate = idCard.substr(6, 8); // YYYYMMDD + const year = birthDate.substr(0, 4); + const month = birthDate.substr(4, 2); + const day = birthDate.substr(6, 2); + const dateOfBirth = new Date(`${year}-${month}-${day}`); + // 计算年龄 + let age = new Date().getFullYear() - dateOfBirth.getFullYear(); + const m = new Date().getMonth() - dateOfBirth.getMonth(); + if (m < 0 || (m === 0 && new Date().getDate() < dateOfBirth.getDate())) { + age--; + } + // 提取性别(身份证第17位:奇数=男, 偶数=女)对应数据库字典 1=男 2=女 + const gender = idCard.charAt(16) % 2 === 0 ? 2 : 1; + return { age, gender }; +} diff --git a/openhis-ui-vue3/src/views/datadictionary/definition/index.vue.original b/openhis-ui-vue3/src/views/datadictionary/definition/index.vue.original new file mode 100755 index 000000000..bf1e0f81c --- /dev/null +++ b/openhis-ui-vue3/src/views/datadictionary/definition/index.vue.original @@ -0,0 +1,806 @@ + + + diff --git a/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentManagement/index.vue.bak b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentManagement/index.vue.bak new file mode 100755 index 000000000..1f42faf5a --- /dev/null +++ b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentManagement/index.vue.bak @@ -0,0 +1,1252 @@ + + + diff --git a/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentManagement/index.vue.original b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentManagement/index.vue.original new file mode 100755 index 000000000..1f42faf5a --- /dev/null +++ b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentManagement/index.vue.original @@ -0,0 +1,1252 @@ + + + diff --git a/openhis-ui-vue3/tests/e2e/specs/bug-591.spec.ts b/openhis-ui-vue3/tests/e2e/specs/bug-591.spec.ts new file mode 100644 index 000000000..37e91c034 --- /dev/null +++ b/openhis-ui-vue3/tests/e2e/specs/bug-591.spec.ts @@ -0,0 +1,47 @@ +import { test, expect } from '@playwright/test'; +import { LoginPage } from '../pages/LoginPage'; + +/** + * Bug #591: 请修复 Bug #591:【住院医生站-临床医嘱】长期医嘱点击“停嘱”未弹出时间录入弹窗执行强停,且医嘱列表缺失“停嘱医生/时间”显示 + * 自动生成: 2026-06-02 04:03:44 + */ +test.describe('🐛 Bug#591', () => { + let loginPage: LoginPage; + + test.beforeEach(async ({ page }) => { + loginPage = new LoginPage(page); + await loginPage.goto(); + await loginPage.login( + process.env.TEST_USERNAME || 'admin', + process.env.TEST_PASSWORD || 'admin123' + ); + await loginPage.expectLoginSuccess(); + }); + + test('#591 请修复 Bug #591:【住院医生站-临床医嘱】长期医嘱点击“停嘱”未弹出时间录入弹窗执行强停,且医嘱列表缺失“停嘱医生/时间”显示 @bug591 @regression', async ({ page }) => { + await page.goto('/inpatientDoctor'); + await page.waitForLoadState('networkidle'); + + + // 检查页面正常加载(非登录页) + await expect(page).not.toHaveURL(/.*login.*/); + + // 检查无 JS 错误 + const jsErrors: string[] = []; + page.on('pageerror', (err) => jsErrors.push(err.message)); + await page.waitForTimeout(2000); + + // 页面基本可交互 + const body = page.locator('body'); + await expect(body).toBeVisible(); + + // 截图记录 + await page.screenshot({ + path: 'tests/e2e/report/bug-591-result.png', + fullPage: true + }); + + // 无 JS 错误 + expect(jsErrors).toEqual([]); + }); +}); diff --git a/openhis-ui-vue3/tests/e2e/specs/bug-593.spec.ts b/openhis-ui-vue3/tests/e2e/specs/bug-593.spec.ts new file mode 100644 index 000000000..f3a3bd3d0 --- /dev/null +++ b/openhis-ui-vue3/tests/e2e/specs/bug-593.spec.ts @@ -0,0 +1,47 @@ +import { test, expect } from '@playwright/test'; +import { LoginPage } from '../pages/LoginPage'; + +/** + * Bug #593: 请修复 Bug #593:【住院医生工作站-临床医嘱】长期医嘱模块缺失“取消停嘱”功能,误操作停止的医嘱无法恢复,不满足医院临床双向容错业务逻辑 + * 自动生成: 2026-06-02 03:30:55 + */ +test.describe('🐛 Bug#593', () => { + let loginPage: LoginPage; + + test.beforeEach(async ({ page }) => { + loginPage = new LoginPage(page); + await loginPage.goto(); + await loginPage.login( + process.env.TEST_USERNAME || 'admin', + process.env.TEST_PASSWORD || 'admin123' + ); + await loginPage.expectLoginSuccess(); + }); + + test('#593 请修复 Bug #593:【住院医生工作站-临床医嘱】长期医嘱模块缺失“取消停嘱”功能,误操作停止的医嘱无法恢复,不满足医院临床双向容错业务逻辑 @bug593 @regression', async ({ page }) => { + await page.goto('/inpatientDoctor'); + await page.waitForLoadState('networkidle'); + + + // 检查页面正常加载(非登录页) + await expect(page).not.toHaveURL(/.*login.*/); + + // 检查无 JS 错误 + const jsErrors: string[] = []; + page.on('pageerror', (err) => jsErrors.push(err.message)); + await page.waitForTimeout(2000); + + // 页面基本可交互 + const body = page.locator('body'); + await expect(body).toBeVisible(); + + // 截图记录 + await page.screenshot({ + path: 'tests/e2e/report/bug-593-result.png', + fullPage: true + }); + + // 无 JS 错误 + expect(jsErrors).toEqual([]); + }); +}); diff --git a/openhis-ui-vue3/tests/e2e/specs/bug-594.spec.ts b/openhis-ui-vue3/tests/e2e/specs/bug-594.spec.ts new file mode 100644 index 000000000..705b6c19a --- /dev/null +++ b/openhis-ui-vue3/tests/e2e/specs/bug-594.spec.ts @@ -0,0 +1,47 @@ +import { test, expect } from '@playwright/test'; +import { LoginPage } from '../pages/LoginPage'; + +/** + * Bug #594: 请修复 Bug #594:【住院医生工作站-临床医嘱】开立需皮试药物时系统未弹出皮试确认框,且医嘱输入行“皮试”字段置灰只读无法手动编辑 + * 自动生成: 2026-06-02 03:28:41 + */ +test.describe('🐛 Bug#594', () => { + let loginPage: LoginPage; + + test.beforeEach(async ({ page }) => { + loginPage = new LoginPage(page); + await loginPage.goto(); + await loginPage.login( + process.env.TEST_USERNAME || 'admin', + process.env.TEST_PASSWORD || 'admin123' + ); + await loginPage.expectLoginSuccess(); + }); + + test('#594 请修复 Bug #594:【住院医生工作站-临床医嘱】开立需皮试药物时系统未弹出皮试确认框,且医嘱输入行“皮试”字段置灰只读无法手动编辑 @bug594 @regression', async ({ page }) => { + await page.goto('/inpatientDoctor'); + await page.waitForLoadState('networkidle'); + + + // 检查页面正常加载(非登录页) + await expect(page).not.toHaveURL(/.*login.*/); + + // 检查无 JS 错误 + const jsErrors: string[] = []; + page.on('pageerror', (err) => jsErrors.push(err.message)); + await page.waitForTimeout(2000); + + // 页面基本可交互 + const body = page.locator('body'); + await expect(body).toBeVisible(); + + // 截图记录 + await page.screenshot({ + path: 'tests/e2e/report/bug-594-result.png', + fullPage: true + }); + + // 无 JS 错误 + expect(jsErrors).toEqual([]); + }); +}); diff --git a/openhis-ui-vue3/tests/e2e/specs/bug-598.spec.ts b/openhis-ui-vue3/tests/e2e/specs/bug-598.spec.ts new file mode 100644 index 000000000..a1e440289 --- /dev/null +++ b/openhis-ui-vue3/tests/e2e/specs/bug-598.spec.ts @@ -0,0 +1,47 @@ +import { test, expect } from '@playwright/test'; +import { LoginPage } from '../pages/LoginPage'; + +/** + * Bug #598: 请修复 Bug #598:【住院医生工作站-临床医嘱】临床医嘱列表缺少“开嘱医生”列,无法追溯责任医生 + * 自动生成: 2026-06-02 03:25:45 + */ +test.describe('🐛 Bug#598', () => { + let loginPage: LoginPage; + + test.beforeEach(async ({ page }) => { + loginPage = new LoginPage(page); + await loginPage.goto(); + await loginPage.login( + process.env.TEST_USERNAME || 'admin', + process.env.TEST_PASSWORD || 'admin123' + ); + await loginPage.expectLoginSuccess(); + }); + + test('#598 请修复 Bug #598:【住院医生工作站-临床医嘱】临床医嘱列表缺少“开嘱医生”列,无法追溯责任医生 @bug598 @regression', async ({ page }) => { + await page.goto('/inpatientDoctor'); + await page.waitForLoadState('networkidle'); + + + // 检查页面正常加载(非登录页) + await expect(page).not.toHaveURL(/.*login.*/); + + // 检查无 JS 错误 + const jsErrors: string[] = []; + page.on('pageerror', (err) => jsErrors.push(err.message)); + await page.waitForTimeout(2000); + + // 页面基本可交互 + const body = page.locator('body'); + await expect(body).toBeVisible(); + + // 截图记录 + await page.screenshot({ + path: 'tests/e2e/report/bug-598-result.png', + fullPage: true + }); + + // 无 JS 错误 + expect(jsErrors).toEqual([]); + }); +}); diff --git a/openhis-ui-vue3/tests/e2e/specs/bug-606.spec.ts b/openhis-ui-vue3/tests/e2e/specs/bug-606.spec.ts new file mode 100644 index 000000000..6f4cd4966 --- /dev/null +++ b/openhis-ui-vue3/tests/e2e/specs/bug-606.spec.ts @@ -0,0 +1,47 @@ +import { test, expect } from '@playwright/test'; +import { LoginPage } from '../pages/LoginPage'; + +/** + * Bug #606: 请修复 Bug #606:门诊术中安排-医嘱】预览列表字段显示及逻辑异常(涉及单位、频次、执行时间) + * 自动生成: 2026-06-02 03:20:28 + */ +test.describe('🐛 Bug#606', () => { + let loginPage: LoginPage; + + test.beforeEach(async ({ page }) => { + loginPage = new LoginPage(page); + await loginPage.goto(); + await loginPage.login( + process.env.TEST_USERNAME || 'admin', + process.env.TEST_PASSWORD || 'admin123' + ); + await loginPage.expectLoginSuccess(); + }); + + test('#606 请修复 Bug #606:门诊术中安排-医嘱】预览列表字段显示及逻辑异常(涉及单位、频次、执行时间) @bug606 @regression', async ({ page }) => { + await page.goto('/'); + await page.waitForLoadState('networkidle'); + + + // 检查页面正常加载(非登录页) + await expect(page).not.toHaveURL(/.*login.*/); + + // 检查无 JS 错误 + const jsErrors: string[] = []; + page.on('pageerror', (err) => jsErrors.push(err.message)); + await page.waitForTimeout(2000); + + // 页面基本可交互 + const body = page.locator('body'); + await expect(body).toBeVisible(); + + // 截图记录 + await page.screenshot({ + path: 'tests/e2e/report/bug-606-result.png', + fullPage: true + }); + + // 无 JS 错误 + expect(jsErrors).toEqual([]); + }); +}); diff --git a/openhis-ui-vue3/tests/e2e/specs/bug-617.spec.ts b/openhis-ui-vue3/tests/e2e/specs/bug-617.spec.ts new file mode 100644 index 000000000..645605a88 --- /dev/null +++ b/openhis-ui-vue3/tests/e2e/specs/bug-617.spec.ts @@ -0,0 +1,47 @@ +import { test, expect } from '@playwright/test'; +import { LoginPage } from '../pages/LoginPage'; + +/** + * Bug #617: 请修复 Bug #617:[住院登记] “费用性质”字段保存逻辑错误(登记选择医保保存后变为全自费) + * 自动生成: 2026-06-02 02:56:17 + */ +test.describe('🐛 Bug#617', () => { + let loginPage: LoginPage; + + test.beforeEach(async ({ page }) => { + loginPage = new LoginPage(page); + await loginPage.goto(); + await loginPage.login( + process.env.TEST_USERNAME || 'admin', + process.env.TEST_PASSWORD || 'admin123' + ); + await loginPage.expectLoginSuccess(); + }); + + test('#617 请修复 Bug #617:[住院登记] “费用性质”字段保存逻辑错误(登记选择医保保存后变为全自费) @bug617 @regression', async ({ page }) => { + await page.goto('/'); + await page.waitForLoadState('networkidle'); + + + // 检查页面正常加载(非登录页) + await expect(page).not.toHaveURL(/.*login.*/); + + // 检查无 JS 错误 + const jsErrors: string[] = []; + page.on('pageerror', (err) => jsErrors.push(err.message)); + await page.waitForTimeout(2000); + + // 页面基本可交互 + const body = page.locator('body'); + await expect(body).toBeVisible(); + + // 截图记录 + await page.screenshot({ + path: 'tests/e2e/report/bug-617-result.png', + fullPage: true + }); + + // 无 JS 错误 + expect(jsErrors).toEqual([]); + }); +}); diff --git a/openhis-ui-vue3/tests/e2e/specs/bug-633.spec.ts b/openhis-ui-vue3/tests/e2e/specs/bug-633.spec.ts new file mode 100644 index 000000000..13d8b2844 --- /dev/null +++ b/openhis-ui-vue3/tests/e2e/specs/bug-633.spec.ts @@ -0,0 +1,47 @@ +import { test, expect } from '@playwright/test'; +import { LoginPage } from '../pages/LoginPage'; + +/** + * Bug #633: 请修复 Bug #633:【住院管理-住院医生工作站】点击住院医生工作站的前端页面有错误 + * 自动生成: 2026-06-02 01:49:44 + */ +test.describe('🐛 Bug#633', () => { + let loginPage: LoginPage; + + test.beforeEach(async ({ page }) => { + loginPage = new LoginPage(page); + await loginPage.goto(); + await loginPage.login( + process.env.TEST_USERNAME || 'admin', + process.env.TEST_PASSWORD || 'admin123' + ); + await loginPage.expectLoginSuccess(); + }); + + test('#633 请修复 Bug #633:【住院管理-住院医生工作站】点击住院医生工作站的前端页面有错误 @bug633 @regression', async ({ page }) => { + await page.goto('/inpatientDoctor'); + await page.waitForLoadState('networkidle'); + + + // 检查页面正常加载(非登录页) + await expect(page).not.toHaveURL(/.*login.*/); + + // 检查无 JS 错误 + const jsErrors: string[] = []; + page.on('pageerror', (err) => jsErrors.push(err.message)); + await page.waitForTimeout(2000); + + // 页面基本可交互 + const body = page.locator('body'); + await expect(body).toBeVisible(); + + // 截图记录 + await page.screenshot({ + path: 'tests/e2e/report/bug-633-result.png', + fullPage: true + }); + + // 无 JS 错误 + expect(jsErrors).toEqual([]); + }); +}); diff --git a/openhis-ui-vue3/tests/e2e/specs/bug-635.spec.ts b/openhis-ui-vue3/tests/e2e/specs/bug-635.spec.ts new file mode 100644 index 000000000..27f44a49d --- /dev/null +++ b/openhis-ui-vue3/tests/e2e/specs/bug-635.spec.ts @@ -0,0 +1,47 @@ +import { test, expect } from '@playwright/test'; +import { LoginPage } from '../pages/LoginPage'; + +/** + * Bug #635: 请修复 Bug #635:[门诊医生站-检验] “状态设置”区域冗余建议删除,并完善“急诊”标志的保存与列表显示逻辑 + * 自动生成: 2026-06-02 01:34:09 + */ +test.describe('🐛 Bug#635', () => { + let loginPage: LoginPage; + + test.beforeEach(async ({ page }) => { + loginPage = new LoginPage(page); + await loginPage.goto(); + await loginPage.login( + process.env.TEST_USERNAME || 'admin', + process.env.TEST_PASSWORD || 'admin123' + ); + await loginPage.expectLoginSuccess(); + }); + + test('#635 请修复 Bug #635:[门诊医生站-检验] “状态设置”区域冗余建议删除,并完善“急诊”标志的保存与列表显示逻辑 @bug635 @regression', async ({ page }) => { + await page.goto('/doctorstation'); + await page.waitForLoadState('networkidle'); + + + // 检查页面正常加载(非登录页) + await expect(page).not.toHaveURL(/.*login.*/); + + // 检查无 JS 错误 + const jsErrors: string[] = []; + page.on('pageerror', (err) => jsErrors.push(err.message)); + await page.waitForTimeout(2000); + + // 页面基本可交互 + const body = page.locator('body'); + await expect(body).toBeVisible(); + + // 截图记录 + await page.screenshot({ + path: 'tests/e2e/report/bug-635-result.png', + fullPage: true + }); + + // 无 JS 错误 + expect(jsErrors).toEqual([]); + }); +}); diff --git a/openhis-ui-vue3/tests/e2e/specs/bug-636.spec.ts b/openhis-ui-vue3/tests/e2e/specs/bug-636.spec.ts new file mode 100644 index 000000000..37d8c0fe1 --- /dev/null +++ b/openhis-ui-vue3/tests/e2e/specs/bug-636.spec.ts @@ -0,0 +1,47 @@ +import { test, expect } from '@playwright/test'; +import { LoginPage } from '../pages/LoginPage'; + +/** + * Bug #636: 请修复 Bug #636:[门诊医生站-医嘱] 西药医嘱开立界面“执行次数”字段逻辑冗余,建议优化 + * 自动生成: 2026-06-02 01:26:33 + */ +test.describe('🐛 Bug#636', () => { + let loginPage: LoginPage; + + test.beforeEach(async ({ page }) => { + loginPage = new LoginPage(page); + await loginPage.goto(); + await loginPage.login( + process.env.TEST_USERNAME || 'admin', + process.env.TEST_PASSWORD || 'admin123' + ); + await loginPage.expectLoginSuccess(); + }); + + test('#636 请修复 Bug #636:[门诊医生站-医嘱] 西药医嘱开立界面“执行次数”字段逻辑冗余,建议优化 @bug636 @regression', async ({ page }) => { + await page.goto('/doctorstation'); + await page.waitForLoadState('networkidle'); + + + // 检查页面正常加载(非登录页) + await expect(page).not.toHaveURL(/.*login.*/); + + // 检查无 JS 错误 + const jsErrors: string[] = []; + page.on('pageerror', (err) => jsErrors.push(err.message)); + await page.waitForTimeout(2000); + + // 页面基本可交互 + const body = page.locator('body'); + await expect(body).toBeVisible(); + + // 截图记录 + await page.screenshot({ + path: 'tests/e2e/report/bug-636-result.png', + fullPage: true + }); + + // 无 JS 错误 + expect(jsErrors).toEqual([]); + }); +}); diff --git a/openhis-ui-vue3/tests/e2e/specs/bug-637.spec.ts b/openhis-ui-vue3/tests/e2e/specs/bug-637.spec.ts new file mode 100644 index 000000000..c05838db2 --- /dev/null +++ b/openhis-ui-vue3/tests/e2e/specs/bug-637.spec.ts @@ -0,0 +1,47 @@ +import { test, expect } from '@playwright/test'; +import { LoginPage } from '../pages/LoginPage'; + +/** + * Bug #637: 请修复 Bug #637:[住院护士站-体温单] 选中患者后系统上下文不同步,导致无法触发“变更体温单”录入弹窗 + * 自动生成: 2026-06-01 22:58:56 + */ +test.describe('🐛 Bug#637', () => { + let loginPage: LoginPage; + + test.beforeEach(async ({ page }) => { + loginPage = new LoginPage(page); + await loginPage.goto(); + await loginPage.login( + process.env.TEST_USERNAME || 'admin', + process.env.TEST_PASSWORD || 'admin123' + ); + await loginPage.expectLoginSuccess(); + }); + + test('#637 请修复 Bug #637:[住院护士站-体温单] 选中患者后系统上下文不同步,导致无法触发“变更体温单”录入弹窗 @bug637 @regression', async ({ page }) => { + await page.goto('/inpatientNurse'); + await page.waitForLoadState('networkidle'); + + + // 检查页面正常加载(非登录页) + await expect(page).not.toHaveURL(/.*login.*/); + + // 检查无 JS 错误 + const jsErrors: string[] = []; + page.on('pageerror', (err) => jsErrors.push(err.message)); + await page.waitForTimeout(2000); + + // 页面基本可交互 + const body = page.locator('body'); + await expect(body).toBeVisible(); + + // 截图记录 + await page.screenshot({ + path: 'tests/e2e/report/bug-637-result.png', + fullPage: true + }); + + // 无 JS 错误 + expect(jsErrors).toEqual([]); + }); +}); diff --git a/openhis-ui-vue3/tests/e2e/specs/bug-638.spec.ts b/openhis-ui-vue3/tests/e2e/specs/bug-638.spec.ts new file mode 100644 index 000000000..f92c3fc8b --- /dev/null +++ b/openhis-ui-vue3/tests/e2e/specs/bug-638.spec.ts @@ -0,0 +1,47 @@ +import { test, expect } from '@playwright/test'; +import { LoginPage } from '../pages/LoginPage'; + +/** + * Bug #638: 请修复 Bug #638:[分诊排队管理] 智能候选池数据过滤失效,导致跨科室患者数据错误显示 + * 自动生成: 2026-06-01 22:58:47 + */ +test.describe('🐛 Bug#638', () => { + let loginPage: LoginPage; + + test.beforeEach(async ({ page }) => { + loginPage = new LoginPage(page); + await loginPage.goto(); + await loginPage.login( + process.env.TEST_USERNAME || 'admin', + process.env.TEST_PASSWORD || 'admin123' + ); + await loginPage.expectLoginSuccess(); + }); + + test('#638 请修复 Bug #638:[分诊排队管理] 智能候选池数据过滤失效,导致跨科室患者数据错误显示 @bug638 @regression', async ({ page }) => { + await page.goto('/triageandqueuemanage'); + await page.waitForLoadState('networkidle'); + + + // 检查页面正常加载(非登录页) + await expect(page).not.toHaveURL(/.*login.*/); + + // 检查无 JS 错误 + const jsErrors: string[] = []; + page.on('pageerror', (err) => jsErrors.push(err.message)); + await page.waitForTimeout(2000); + + // 页面基本可交互 + const body = page.locator('body'); + await expect(body).toBeVisible(); + + // 截图记录 + await page.screenshot({ + path: 'tests/e2e/report/bug-638-result.png', + fullPage: true + }); + + // 无 JS 错误 + expect(jsErrors).toEqual([]); + }); +}); diff --git a/openhis-ui-vue3/tests/e2e/specs/bug-639.spec.ts b/openhis-ui-vue3/tests/e2e/specs/bug-639.spec.ts new file mode 100644 index 000000000..107603e8a --- /dev/null +++ b/openhis-ui-vue3/tests/e2e/specs/bug-639.spec.ts @@ -0,0 +1,47 @@ +import { test, expect } from '@playwright/test'; +import { LoginPage } from '../pages/LoginPage'; + +/** + * Bug #639: 请修复 Bug #639:[门诊医生站-手术申请] 无法检索到已启用的手术项目(如:足跟缺损修复术) + * 自动生成: 2026-06-01 22:55:32 + */ +test.describe('🐛 Bug#639', () => { + let loginPage: LoginPage; + + test.beforeEach(async ({ page }) => { + loginPage = new LoginPage(page); + await loginPage.goto(); + await loginPage.login( + process.env.TEST_USERNAME || 'admin', + process.env.TEST_PASSWORD || 'admin123' + ); + await loginPage.expectLoginSuccess(); + }); + + test('#639 请修复 Bug #639:[门诊医生站-手术申请] 无法检索到已启用的手术项目(如:足跟缺损修复术) @bug639 @regression', async ({ page }) => { + await page.goto('/doctorstation'); + await page.waitForLoadState('networkidle'); + + + // 检查页面正常加载(非登录页) + await expect(page).not.toHaveURL(/.*login.*/); + + // 检查无 JS 错误 + const jsErrors: string[] = []; + page.on('pageerror', (err) => jsErrors.push(err.message)); + await page.waitForTimeout(2000); + + // 页面基本可交互 + const body = page.locator('body'); + await expect(body).toBeVisible(); + + // 截图记录 + await page.screenshot({ + path: 'tests/e2e/report/bug-639-result.png', + fullPage: true + }); + + // 无 JS 错误 + expect(jsErrors).toEqual([]); + }); +}); diff --git a/openhis-ui-vue3/tests/e2e/specs/bug-641.spec.ts b/openhis-ui-vue3/tests/e2e/specs/bug-641.spec.ts new file mode 100644 index 000000000..9ee3bd80f --- /dev/null +++ b/openhis-ui-vue3/tests/e2e/specs/bug-641.spec.ts @@ -0,0 +1,47 @@ +import { test, expect } from '@playwright/test'; +import { LoginPage } from '../pages/LoginPage'; + +/** + * Bug #641: 请修复 Bug #641:[住院护士站-医嘱校对] 停嘱医嘱状态同步错误(显示为“已提交”)且缺少停嘱详情列 + * 自动生成: 2026-06-02 00:17:03 + */ +test.describe('🐛 Bug#641', () => { + let loginPage: LoginPage; + + test.beforeEach(async ({ page }) => { + loginPage = new LoginPage(page); + await loginPage.goto(); + await loginPage.login( + process.env.TEST_USERNAME || 'admin', + process.env.TEST_PASSWORD || 'admin123' + ); + await loginPage.expectLoginSuccess(); + }); + + test('#641 请修复 Bug #641:[住院护士站-医嘱校对] 停嘱医嘱状态同步错误(显示为“已提交”)且缺少停嘱详情列 @bug641 @regression', async ({ page }) => { + await page.goto('/inpatientNurse'); + await page.waitForLoadState('networkidle'); + + + // 检查页面正常加载(非登录页) + await expect(page).not.toHaveURL(/.*login.*/); + + // 检查无 JS 错误 + const jsErrors: string[] = []; + page.on('pageerror', (err) => jsErrors.push(err.message)); + await page.waitForTimeout(2000); + + // 页面基本可交互 + const body = page.locator('body'); + await expect(body).toBeVisible(); + + // 截图记录 + await page.screenshot({ + path: 'tests/e2e/report/bug-641-result.png', + fullPage: true + }); + + // 无 JS 错误 + expect(jsErrors).toEqual([]); + }); +}); diff --git a/openhis-ui-vue3/tests/e2e/specs/bug-642.spec.ts b/openhis-ui-vue3/tests/e2e/specs/bug-642.spec.ts new file mode 100644 index 000000000..cf136f0d4 --- /dev/null +++ b/openhis-ui-vue3/tests/e2e/specs/bug-642.spec.ts @@ -0,0 +1,47 @@ +import { test, expect } from '@playwright/test'; +import { LoginPage } from '../pages/LoginPage'; + +/** + * Bug #642: 请修复 Bug #642:[住院医生站-临床医嘱] 开立医嘱时检索下拉框对齐方式不合理(弹出位置偏移) + * 自动生成: 2026-06-01 23:15:11 + */ +test.describe('🐛 Bug#642', () => { + let loginPage: LoginPage; + + test.beforeEach(async ({ page }) => { + loginPage = new LoginPage(page); + await loginPage.goto(); + await loginPage.login( + process.env.TEST_USERNAME || 'admin', + process.env.TEST_PASSWORD || 'admin123' + ); + await loginPage.expectLoginSuccess(); + }); + + test('#642 请修复 Bug #642:[住院医生站-临床医嘱] 开立医嘱时检索下拉框对齐方式不合理(弹出位置偏移) @bug642 @regression', async ({ page }) => { + await page.goto('/inpatientDoctor'); + await page.waitForLoadState('networkidle'); + + + // 检查页面正常加载(非登录页) + await expect(page).not.toHaveURL(/.*login.*/); + + // 检查无 JS 错误 + const jsErrors: string[] = []; + page.on('pageerror', (err) => jsErrors.push(err.message)); + await page.waitForTimeout(2000); + + // 页面基本可交互 + const body = page.locator('body'); + await expect(body).toBeVisible(); + + // 截图记录 + await page.screenshot({ + path: 'tests/e2e/report/bug-642-result.png', + fullPage: true + }); + + // 无 JS 错误 + expect(jsErrors).toEqual([]); + }); +}); diff --git a/openhis-ui-vue3/tests/e2e/specs/bug-643.spec.ts b/openhis-ui-vue3/tests/e2e/specs/bug-643.spec.ts new file mode 100644 index 000000000..066a419f7 --- /dev/null +++ b/openhis-ui-vue3/tests/e2e/specs/bug-643.spec.ts @@ -0,0 +1,47 @@ +import { test, expect } from '@playwright/test'; +import { LoginPage } from '../pages/LoginPage'; + +/** + * Bug #643: 请修复 Bug #643:[门诊手术安排-术中医嘱] 删除已生成的临时医嘱提示成功,但点击刷新后医嘱重新出现 + * 自动生成: 2026-06-01 23:48:57 + */ +test.describe('🐛 Bug#643', () => { + let loginPage: LoginPage; + + test.beforeEach(async ({ page }) => { + loginPage = new LoginPage(page); + await loginPage.goto(); + await loginPage.login( + process.env.TEST_USERNAME || 'admin', + process.env.TEST_PASSWORD || 'admin123' + ); + await loginPage.expectLoginSuccess(); + }); + + test('#643 请修复 Bug #643:[门诊手术安排-术中医嘱] 删除已生成的临时医嘱提示成功,但点击刷新后医嘱重新出现 @bug643 @regression', async ({ page }) => { + await page.goto('/operatingroom'); + await page.waitForLoadState('networkidle'); + + + // 检查页面正常加载(非登录页) + await expect(page).not.toHaveURL(/.*login.*/); + + // 检查无 JS 错误 + const jsErrors: string[] = []; + page.on('pageerror', (err) => jsErrors.push(err.message)); + await page.waitForTimeout(2000); + + // 页面基本可交互 + const body = page.locator('body'); + await expect(body).toBeVisible(); + + // 截图记录 + await page.screenshot({ + path: 'tests/e2e/report/bug-643-result.png', + fullPage: true + }); + + // 无 JS 错误 + expect(jsErrors).toEqual([]); + }); +}); diff --git a/openhis-ui-vue3/tests/e2e/specs/debug-console.spec.ts b/openhis-ui-vue3/tests/e2e/specs/debug-console.spec.ts new file mode 100644 index 000000000..c9d7c4b89 --- /dev/null +++ b/openhis-ui-vue3/tests/e2e/specs/debug-console.spec.ts @@ -0,0 +1,39 @@ +import { test } from '@playwright/test'; + +test('debug console', async ({ page }) => { + const errors: string[] = []; + const requests: string[] = []; + + page.on('console', msg => { + if (msg.type() === 'error' || msg.type() === 'warn') { + errors.push(`[${msg.type()}] ${msg.text()}`); + } + }); + + page.on('response', async resp => { + if (resp.status() >= 400) { + requests.push(`${resp.status()} ${resp.url()}`); + } + }); + + await page.goto('http://localhost:81/'); + const loginResp = await page.request.post('http://localhost:18082/openhis/login', { + data: { username: 'doctor1', password: '123456', tenantId: '1', code: '', uuid: '' } + }); + const { token } = await loginResp.json(); + await page.context().addCookies([{ + name: 'Admin-Token', value: token, domain: 'localhost', path: '/' + }]); + + await page.goto('http://localhost:81/clinicManagement/doctorStation'); + await page.waitForLoadState('networkidle'); + await page.waitForTimeout(8000); + + console.log('=== Console errors/warnings ==='); + errors.forEach(e => console.log(e)); + console.log('=== Failed requests ==='); + requests.forEach(r => console.log(r)); + console.log('=== App innerHTML length ==='); + const len = await page.evaluate(() => document.querySelector('#app')?.innerHTML.length || 0); + console.log(len); +}); diff --git a/openhis-ui-vue3/tests/e2e/specs/debug-login.spec.ts b/openhis-ui-vue3/tests/e2e/specs/debug-login.spec.ts new file mode 100644 index 000000000..214f5db7f --- /dev/null +++ b/openhis-ui-vue3/tests/e2e/specs/debug-login.spec.ts @@ -0,0 +1,55 @@ +import { test, expect } from '@playwright/test'; + +test('debug login', async ({ page }) => { + // 1. 先访问页面获取 cookie + await page.goto('http://localhost:81/'); + await page.waitForLoadState('networkidle'); + + // 2. 调用登录 API + const loginResp = await page.request.post('http://localhost:18082/openhis/login', { + data: { + username: 'doctor1', + password: '123456', + tenantId: '1', + code: '', + uuid: '' + } + }); + const loginData = await loginResp.json(); + console.log('Login response:', JSON.stringify(loginData)); + + // 3. 设置 token + const token = loginData.token; + await page.evaluate((t) => { + localStorage.setItem('Admin-Token', t); + }, token); + + // 4. 检查 token 是否设置成功 + const savedToken = await page.evaluate(() => localStorage.getItem('Admin-Token')); + console.log('Saved token:', savedToken ? savedToken.substring(0, 20) + '...' : 'null'); + + // 5. 导航到门诊医生站 + await page.goto('http://localhost:81/clinicManagement/doctorStation'); + await page.waitForLoadState('networkidle'); + await page.waitForTimeout(5000); + + // 6. 检查页面内容 + const title = await page.title(); + console.log('Page title:', title); + console.log('Page URL:', page.url()); + + // 7. 获取页面 HTML 结构 + const bodyHTML = await page.evaluate(() => document.body.innerHTML.substring(0, 2000)); + console.log('Body HTML (first 2000 chars):', bodyHTML); + + // 8. 检查是否有错误 + const errors = await page.evaluate(() => { + const errorElements = document.querySelectorAll('.el-message--error, .error, [class*="error"]'); + return Array.from(errorElements).map(e => e.textContent?.trim()).filter(Boolean); + }); + console.log('Errors found:', errors); + + // 截图 + await page.screenshot({ path: '/tmp/debug-login.png' }); + console.log('Screenshot saved to /tmp/debug-login.png'); +}); diff --git a/openhis-ui-vue3/tests/e2e/specs/debug-page.spec.ts b/openhis-ui-vue3/tests/e2e/specs/debug-page.spec.ts new file mode 100644 index 000000000..e85c879fb --- /dev/null +++ b/openhis-ui-vue3/tests/e2e/specs/debug-page.spec.ts @@ -0,0 +1,41 @@ +import { test, expect } from '@playwright/test'; + +test('debug page load', async ({ page }) => { + // 登录 + await page.goto('http://localhost:81/'); + const loginResp = await page.request.post('http://localhost:18082/openhis/login', { + data: { username: 'doctor1', password: '123456', tenantId: '1', code: '', uuid: '' } + }); + const loginData = await loginResp.json(); + await page.context().addCookies([{ + name: 'Admin-Token', + value: loginData.token, + domain: 'localhost', + path: '/' + }]); + + // 导航到门诊医生站 + await page.goto('http://localhost:81/clinicManagement/doctorStation'); + await page.waitForLoadState('networkidle'); + await page.waitForTimeout(8000); // 等待更长时间 + + // 获取页面 HTML + const html = await page.content(); + console.log('=== HTML 长度:', html.length); + console.log('=== 前 3000 字符 ==='); + console.log(html.substring(0, 3000)); + console.log('=== 检查 Vue app ==='); + const appExists = await page.evaluate(() => !!document.querySelector('#app')); + console.log('App exists:', appExists); + const appChildren = await page.evaluate(() => document.querySelector('#app')?.children.length || 0); + console.log('App children:', appChildren); + + // 检查是否有加载中的元素 + const loadingElements = await page.evaluate(() => { + const els = document.querySelectorAll('.loading, .el-loading, [class*="loading"]'); + return els.length; + }); + console.log('Loading elements:', loadingElements); + + await page.screenshot({ path: '/tmp/debug-page.png', fullPage: true }); +});