diff --git a/TestDeleteInspectionType.java b/TestDeleteInspectionType.java deleted file mode 100644 index 16e639cd..00000000 --- a/TestDeleteInspectionType.java +++ /dev/null @@ -1,39 +0,0 @@ -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.Scanner; - -public class TestDeleteInspectionType { - public static void main(String[] args) { - try { - // 测试删除ID为1的检验类型 - long inspectionTypeId = 1; - URL url = new URL("http://localhost:8080/system/inspection-type/" + inspectionTypeId); - HttpURLConnection connection = (HttpURLConnection) url.openConnection(); - connection.setRequestMethod("DELETE"); - connection.setRequestProperty("Content-Type", "application/json"); - connection.setRequestProperty("Accept", "application/json"); - - // 发送请求 - int responseCode = connection.getResponseCode(); - System.out.println("响应代码: " + responseCode); - - // 读取响应 - Scanner scanner; - if (responseCode >= 200 && responseCode < 300) { - scanner = new Scanner(connection.getInputStream()); - } else { - scanner = new Scanner(connection.getErrorStream()); - } - - String response = scanner.useDelimiter("\\A").next(); - System.out.println("响应内容: " + response); - - scanner.close(); - connection.disconnect(); - - } catch (IOException e) { - e.printStackTrace(); - } - } -} \ No newline at end of file diff --git a/login-notice-popup.js b/login-notice-popup.js new file mode 100644 index 00000000..e69de29b diff --git a/notice-popup-utils.js b/notice-popup-utils.js new file mode 100644 index 00000000..e69de29b diff --git a/notice-popup.js b/notice-popup.js new file mode 100644 index 00000000..e69de29b diff --git a/notice-popup.vue b/notice-popup.vue new file mode 100644 index 00000000..e69de29b diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysLoginController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysLoginController.java index 0d7604cc..4803ff12 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysLoginController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysLoginController.java @@ -11,6 +11,7 @@ import com.core.framework.web.service.SysLoginService; import com.core.framework.web.service.SysPermissionService; import com.core.framework.web.service.TokenService; import com.core.system.service.ISysMenuService; +import com.core.system.service.ISysTenantService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -39,6 +40,9 @@ public class SysLoginController { @Autowired private TokenService tokenService; + @Autowired + private ISysTenantService tenantService; + /**已评审 * 登录方法 * @@ -72,12 +76,21 @@ public class SysLoginController { loginUser.setPermissions(permissions); tokenService.refreshToken(loginUser); } + // 获取租户名称 + String tenantName = null; + if (loginUser.getTenantId() != null) { + com.core.system.domain.SysTenant tenant = tenantService.getById(loginUser.getTenantId()); + if (tenant != null) { + tenantName = tenant.getTenantName(); + } + } AjaxResult ajax = AjaxResult.success(); ajax.put("optionJson", loginUser.getOptionJson()); ajax.put("practitionerId", String.valueOf(loginUser.getPractitionerId())); ajax.put("user", user); ajax.put("roles", roles); ajax.put("permissions", permissions); + ajax.put("tenantName", tenantName); return ajax; } diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysNoticeController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysNoticeController.java index f4b4d9e5..9fe8c707 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysNoticeController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysNoticeController.java @@ -3,9 +3,12 @@ package com.core.web.controller.system; import com.core.common.annotation.Log; import com.core.common.core.controller.BaseController; import com.core.common.core.domain.AjaxResult; +import com.core.common.core.domain.entity.SysUser; +import com.core.common.core.domain.model.LoginUser; import com.core.common.core.page.TableDataInfo; import com.core.common.enums.BusinessType; import com.core.system.domain.SysNotice; +import com.core.system.service.ISysNoticeReadService; import com.core.system.service.ISysNoticeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -25,6 +28,9 @@ public class SysNoticeController extends BaseController { @Autowired private ISysNoticeService noticeService; + @Autowired + private ISysNoticeReadService noticeReadService; + /** * 获取通知公告列表 */ @@ -36,6 +42,108 @@ public class SysNoticeController extends BaseController { return getDataTable(list); } + /** + * 获取当前用户的公告列表（公开接口） + * 公告类型：通常 noticeType = '1' 代表通知，noticeType = '2' 代表公告 + */ + @GetMapping("/public/list") + public TableDataInfo getPublicList(SysNotice notice) { + // 只查询状态为正常（0）且已发布（1）的公告 + notice.setStatus("0"); + notice.setPublishStatus("1"); + // 公告类型设置为 '2'（公告） + notice.setNoticeType("2"); + // 设置分页参数 + startPage(); + List list = noticeService.selectNoticeList(notice); + return getDataTable(list); + } + + /** + * 获取当前用户的通知列表（公开接口） + * 通知类型：通常 noticeType = '1' 代表通知，noticeType = '2' 代表公告 + * 返回已发布且状态正常的所有公告和通知，并标注已读状态 + * 按优先级排序，高优先级在前 + */ + @GetMapping("/public/notice") + public AjaxResult getUserNotices() { + // 获取当前用户信息 + LoginUser loginUser = getLoginUser(); + SysUser currentUser = loginUser.getUser(); + + // 查询已发布且状态正常的所有公告和通知 + SysNotice notice = new SysNotice(); + notice.setStatus("0"); + notice.setPublishStatus("1"); + + List list = noticeService.selectNoticeList(notice); + + // 按优先级排序（1高 2中 3低），相同优先级按创建时间降序 + list.sort((a, b) -> { + String priorityA = a.getPriority() != null ? a.getPriority() : "3"; + String priorityB = b.getPriority() != null ? b.getPriority() : "3"; + int priorityCompare = priorityA.compareTo(priorityB); + if (priorityCompare != 0) { + return priorityCompare; + } + // 相同优先级，按创建时间降序 + return b.getCreateTime().compareTo(a.getCreateTime()); + }); + + // 获取用户已读的公告/通知ID列表 + List readIds = noticeReadService.selectReadNoticeIdsByUserId(currentUser.getUserId()); + + // 为每个公告/通知添加已读状态 + for (SysNotice item : list) { + boolean isRead = readIds.contains(item.getNoticeId()); + item.setIsRead(isRead); + } + + return success(list); + } + + /** + * 获取用户未读公告/通知数量（公开接口） + */ + @GetMapping("/public/unread/count") + public AjaxResult getUnreadCount() { + LoginUser loginUser = getLoginUser(); + SysUser currentUser = loginUser.getUser(); + int count = noticeReadService.getUnreadCount(currentUser.getUserId()); + return success(count); + } + + /** + * 标记公告/通知为已读（公开接口） + */ + @PostMapping("/public/read/{noticeId}") + public AjaxResult markAsRead(@PathVariable Long noticeId) { + LoginUser loginUser = getLoginUser(); + SysUser currentUser = loginUser.getUser(); + return noticeReadService.markAsRead(noticeId, currentUser.getUserId()); + } + + /** + * 批量标记公告/通知为已读（公开接口） + */ + @PostMapping("/public/read/all") + public AjaxResult markAllAsRead(@RequestBody Long[] noticeIds) { + LoginUser loginUser = getLoginUser(); + SysUser currentUser = loginUser.getUser(); + return noticeReadService.markAllAsRead(noticeIds, currentUser.getUserId()); + } + + /** + * 获取用户已读公告/通知ID列表（公开接口） + */ + @GetMapping("/public/read/ids") + public AjaxResult getReadNoticeIds() { + LoginUser loginUser = getLoginUser(); + SysUser currentUser = loginUser.getUser(); + List readIds = noticeReadService.selectReadNoticeIdsByUserId(currentUser.getUserId()); + return success(readIds); + } + /** * 根据通知公告编号获取详细信息 */ @@ -53,6 +161,14 @@ public class SysNoticeController extends BaseController { @PostMapping public AjaxResult add(@Validated @RequestBody SysNotice notice) { notice.setCreateBy(getUsername()); + // 新建的公告默认为未发布状态 + if (notice.getPublishStatus() == null || notice.getPublishStatus().isEmpty()) { + notice.setPublishStatus("0"); + } + // 设置默认优先级为中（2） + if (notice.getPriority() == null || notice.getPriority().isEmpty()) { + notice.setPriority("2"); + } return toAjax(noticeService.insertNotice(notice)); } @@ -76,4 +192,42 @@ public class SysNoticeController extends BaseController { public AjaxResult remove(@PathVariable Long[] noticeIds) { return toAjax(noticeService.deleteNoticeByIds(noticeIds)); } + + /** + * 发布公告/通知 + */ + @PreAuthorize("@ss.hasPermi('system:notice:edit')") + @Log(title = "发布公告", businessType = BusinessType.UPDATE) + @PutMapping("/publish/{noticeId}") + public AjaxResult publish(@PathVariable Long noticeId) { + SysNotice notice = noticeService.selectNoticeById(noticeId); + if (notice == null) { + return error("公告不存在"); + } + if ("1".equals(notice.getPublishStatus())) { + return error("该公告已发布"); + } + notice.setPublishStatus("1"); + notice.setUpdateBy(getUsername()); + return toAjax(noticeService.updateNotice(notice)); + } + + /** + * 取消发布公告/通知 + */ + @PreAuthorize("@ss.hasPermi('system:notice:edit')") + @Log(title = "取消发布", businessType = BusinessType.UPDATE) + @PutMapping("/unpublish/{noticeId}") + public AjaxResult unpublish(@PathVariable Long noticeId) { + SysNotice notice = noticeService.selectNoticeById(noticeId); + if (notice == null) { + return error("公告不存在"); + } + if ("0".equals(notice.getPublishStatus())) { + return error("该公告未发布"); + } + notice.setPublishStatus("0"); + notice.setUpdateBy(getUsername()); + return toAjax(noticeService.updateNotice(notice)); + } } 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 98f82ad3..e4006682 100644 --- 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 @@ -1,12 +1,10 @@ package com.core.flowable.common.expand.el; -import javax.annotation.Resource; - +import com.core.system.service.ISysDeptService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import com.core.system.service.ISysDeptService; - -import lombok.extern.slf4j.Slf4j; +import javax.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 faeedfa5..9e24aac2 100644 --- 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 @@ -1,22 +1,5 @@ package com.core.flowable.controller; -import java.awt.image.BufferedImage; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.nio.charset.StandardCharsets; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; -import javax.imageio.ImageIO; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - import com.core.common.annotation.Log; import com.core.common.core.controller.BaseController; import com.core.common.core.domain.AjaxResult; @@ -30,11 +13,25 @@ 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 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 javax.imageio.ImageIO; +import javax.servlet.http.HttpServletResponse; +import java.awt.image.BufferedImage; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.charset.StandardCharsets; +import java.util.List; +import java.util.Map; /** *

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 661455a1..a5bd0a7b 100644 --- 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 @@ -1,21 +1,19 @@ package com.core.flowable.controller; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - import com.core.common.annotation.Log; import com.core.common.core.controller.BaseController; 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 lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; /** *

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 40451fbb..4853f4d2 100644 --- 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 @@ -1,16 +1,5 @@ package com.core.flowable.controller; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -import javax.imageio.ImageIO; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - import com.core.common.annotation.Log; import com.core.common.core.controller.BaseController; import com.core.common.core.domain.AjaxResult; @@ -19,11 +8,19 @@ 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 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 java.awt.image.BufferedImage; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; /** *

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 eac6284e..cbb49379 100644 --- 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 @@ -1,13 +1,5 @@ package com.core.flowable.controller; -import java.util.List; - -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - import com.core.common.annotation.Log; import com.core.common.core.controller.BaseController; import com.core.common.core.domain.AjaxResult; @@ -16,6 +8,12 @@ import com.core.common.enums.BusinessType; import com.core.common.utils.poi.ExcelUtil; import com.core.system.domain.SysExpression; import com.core.system.service.ISysExpressionService; +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 java.util.List; /** * 流程达式Controller diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysFormController.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysFormController.java index 6d161131..63cd1b43 100644 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysFormController.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysFormController.java @@ -1,11 +1,5 @@ package com.core.flowable.controller; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - import com.core.common.annotation.Log; import com.core.common.core.controller.BaseController; import com.core.common.core.domain.AjaxResult; @@ -16,6 +10,11 @@ import com.core.flowable.service.ISysDeployFormService; import com.core.flowable.service.ISysFormService; import com.core.system.domain.SysDeployForm; import com.core.system.domain.SysForm; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 流程表单Controller 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 da0ba247..435307ee 100644 --- 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 @@ -1,13 +1,5 @@ package com.core.flowable.controller; -import java.util.List; - -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - import com.core.common.annotation.Log; import com.core.common.core.controller.BaseController; import com.core.common.core.domain.AjaxResult; @@ -16,6 +8,12 @@ import com.core.common.enums.BusinessType; import com.core.common.utils.poi.ExcelUtil; import com.core.system.domain.SysListener; import com.core.system.service.ISysListenerService; +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 java.util.List; /** * 流程监听Controller diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowCommentDto.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowCommentDto.java index 66116f1c..4169a565 100644 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowCommentDto.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowCommentDto.java @@ -1,10 +1,10 @@ package com.core.flowable.domain.dto; -import java.io.Serializable; - import lombok.Builder; import lombok.Data; +import java.io.Serializable; + /** * @author system * @date 2021/3/28 15:50 diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowFromFieldDTO.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowFromFieldDTO.java index 764e1930..0d58414b 100644 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowFromFieldDTO.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowFromFieldDTO.java @@ -1,9 +1,9 @@ package com.core.flowable.domain.dto; -import java.io.Serializable; - import lombok.Data; +import java.io.Serializable; + /** * @author system * @date 2021/3/31 23:20 diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowNextDto.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowNextDto.java index 26a4b77b..dedb2005 100644 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowNextDto.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowNextDto.java @@ -1,9 +1,9 @@ package com.core.flowable.domain.dto; -import java.io.Serializable; - import lombok.Data; +import java.io.Serializable; + /** * 动态人员、组 * diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowSaveXmlVo.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowSaveXmlVo.java index c25a7dce..38b236b6 100644 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowSaveXmlVo.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowSaveXmlVo.java @@ -1,9 +1,9 @@ package com.core.flowable.domain.dto; -import java.io.Serializable; - import lombok.Data; +import java.io.Serializable; + /** * @author system * @date 2021/3/28 19:48 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 55e9a459..cb25f878 100644 --- 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,15 +1,14 @@ package com.core.flowable.domain.dto; -import java.io.Serializable; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; +import java.io.Serializable; +import java.util.Date; + /** *

* 工作流任务 diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowViewerDto.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowViewerDto.java index d6600071..42ed97f9 100644 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowViewerDto.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowViewerDto.java @@ -1,9 +1,9 @@ package com.core.flowable.domain.dto; -import java.io.Serializable; - import lombok.Data; +import java.io.Serializable; + /** * @author system * @date 2021/4/21 20:55 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 0684edce..fb9a5295 100644 --- 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,12 +1,12 @@ package com.core.flowable.domain.vo; -import java.util.List; -import java.util.Map; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; +import java.util.Map; + /** *

* 流程任务 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 8d5a30c9..19d4cbf9 100644 --- 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 @@ -1,12 +1,11 @@ package com.core.flowable.factory; -import javax.annotation.Resource; - +import lombok.Getter; import org.flowable.engine.*; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; -import lombok.Getter; +import javax.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 710dd470..085e5fb3 100644 --- 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 @@ -1,5 +1,11 @@ package com.core.flowable.flow; +import org.flowable.bpmn.model.AssociationDirection; +import org.flowable.bpmn.model.GraphicInfo; +import org.flowable.image.impl.DefaultProcessDiagramCanvas; +import org.flowable.image.util.ReflectUtil; + +import javax.imageio.ImageIO; import java.awt.*; import java.awt.font.FontRenderContext; import java.awt.font.LineBreakMeasurer; @@ -13,13 +19,6 @@ import java.io.IOException; import java.text.AttributedCharacterIterator; import java.text.AttributedString; -import javax.imageio.ImageIO; - -import org.flowable.bpmn.model.AssociationDirection; -import org.flowable.bpmn.model.GraphicInfo; -import org.flowable.image.impl.DefaultProcessDiagramCanvas; -import org.flowable.image.util.ReflectUtil; - /** * @author system * @date 2021/4/4 23:58 diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramGenerator.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramGenerator.java index a2956f0d..f42e5a1e 100644 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramGenerator.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramGenerator.java @@ -1,13 +1,13 @@ package com.core.flowable.flow; -import java.util.Iterator; -import java.util.List; - import org.flowable.bpmn.model.*; import org.flowable.bpmn.model.Process; import org.flowable.image.impl.DefaultProcessDiagramCanvas; import org.flowable.image.impl.DefaultProcessDiagramGenerator; +import java.util.Iterator; +import java.util.List; + /** * @author system * @date 2021/4/5 0:31 diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/FindNextNodeUtil.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/FindNextNodeUtil.java index 16e487b8..a9f2634a 100644 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/FindNextNodeUtil.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/FindNextNodeUtil.java @@ -1,17 +1,16 @@ package com.core.flowable.flow; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - +import com.googlecode.aviator.AviatorEvaluator; +import com.googlecode.aviator.Expression; import org.flowable.bpmn.model.*; import org.flowable.bpmn.model.Process; import org.flowable.engine.RepositoryService; import org.flowable.engine.repository.ProcessDefinition; -import com.googlecode.aviator.AviatorEvaluator; -import com.googlecode.aviator.Expression; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; /** * @author system diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/FlowableUtils.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/FlowableUtils.java index 4b5c450d..63d2e9fa 100644 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/FlowableUtils.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/FlowableUtils.java @@ -1,8 +1,6 @@ package com.core.flowable.flow; -import java.util.*; -import java.util.stream.Collectors; - +import lombok.extern.slf4j.Slf4j; import org.flowable.bpmn.model.*; import org.flowable.engine.RepositoryService; import org.flowable.engine.impl.bpmn.behavior.ParallelMultiInstanceBehavior; @@ -10,7 +8,8 @@ import org.flowable.engine.impl.bpmn.behavior.SequentialMultiInstanceBehavior; import org.flowable.engine.repository.ProcessDefinition; import org.flowable.task.api.history.HistoricTaskInstance; -import lombok.extern.slf4j.Slf4j; +import java.util.*; +import java.util.stream.Collectors; /** * @author system diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/listener/FlowExecutionListener.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/listener/FlowExecutionListener.java index e21280f6..9fb8d43f 100644 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/listener/FlowExecutionListener.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/listener/FlowExecutionListener.java @@ -1,12 +1,11 @@ package com.core.flowable.listener; +import lombok.extern.slf4j.Slf4j; import org.flowable.common.engine.api.delegate.Expression; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.ExecutionListener; import org.springframework.stereotype.Component; -import lombok.extern.slf4j.Slf4j; - /** * 执行监听器 * diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/listener/FlowTaskListener.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/listener/FlowTaskListener.java index 8d807f03..1cda009a 100644 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/listener/FlowTaskListener.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/listener/FlowTaskListener.java @@ -1,11 +1,10 @@ package com.core.flowable.listener; +import lombok.extern.slf4j.Slf4j; import org.flowable.engine.delegate.TaskListener; import org.flowable.task.service.delegate.DelegateTask; import org.springframework.stereotype.Component; -import lombok.extern.slf4j.Slf4j; - /** * 任务监听器 * diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowDefinitionService.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowDefinitionService.java index 9949f4e8..c1da76b7 100644 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowDefinitionService.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowDefinitionService.java @@ -1,13 +1,13 @@ package com.core.flowable.service; -import java.io.IOException; -import java.io.InputStream; -import java.util.Map; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.AjaxResult; import com.core.system.domain.FlowProcDefDto; +import java.io.IOException; +import java.io.InputStream; +import java.util.Map; + /** * @author system * @date 2021-04-03 14:41 diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowInstanceService.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowInstanceService.java index bf02e305..c95397bc 100644 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowInstanceService.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowInstanceService.java @@ -1,11 +1,10 @@ package com.core.flowable.service; -import java.util.Map; - -import org.flowable.engine.history.HistoricProcessInstance; - import com.core.common.core.domain.AjaxResult; import com.core.flowable.domain.vo.FlowTaskVo; +import org.flowable.engine.history.HistoricProcessInstance; + +import java.util.Map; /** * @author system diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowTaskService.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowTaskService.java index f14973e6..f47cd3c8 100644 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowTaskService.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowTaskService.java @@ -1,11 +1,11 @@ package com.core.flowable.service; -import java.io.InputStream; - import com.core.common.core.domain.AjaxResult; import com.core.flowable.domain.vo.FlowQueryVo; import com.core.flowable.domain.vo.FlowTaskVo; +import java.io.InputStream; + /** * @author system * @date 2021-04-03 14:42 diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/ISysDeployFormService.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/ISysDeployFormService.java index d5eed8f4..7e12243a 100644 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/ISysDeployFormService.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/ISysDeployFormService.java @@ -1,10 +1,10 @@ package com.core.flowable.service; -import java.util.List; - import com.core.system.domain.SysDeployForm; import com.core.system.domain.SysForm; +import java.util.List; + /** * 流程实例关联表单Service接口 * diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/ISysFormService.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/ISysFormService.java index 04472930..7009e140 100644 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/ISysFormService.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/ISysFormService.java @@ -1,9 +1,9 @@ package com.core.flowable.service; -import java.util.List; - import com.core.system.domain.SysForm; +import java.util.List; + /** * 表单 * 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 7228d00b..996fbdfa 100644 --- 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 @@ -1,25 +1,5 @@ package com.core.flowable.service.impl; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -import javax.annotation.Resource; - -import org.apache.commons.io.IOUtils; -import org.flowable.bpmn.model.BpmnModel; -import org.flowable.engine.repository.Deployment; -import org.flowable.engine.repository.ProcessDefinition; -import org.flowable.engine.repository.ProcessDefinitionQuery; -import org.flowable.engine.runtime.ProcessInstance; -import org.flowable.image.impl.DefaultProcessDiagramGenerator; -import org.flowable.task.api.Task; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.AjaxResult; import com.core.common.core.domain.entity.SysUser; @@ -37,8 +17,25 @@ import com.core.system.service.ISysDeptService; import com.core.system.service.ISysUserService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; - import lombok.extern.slf4j.Slf4j; +import org.apache.commons.io.IOUtils; +import org.flowable.bpmn.model.BpmnModel; +import org.flowable.engine.repository.Deployment; +import org.flowable.engine.repository.ProcessDefinition; +import org.flowable.engine.repository.ProcessDefinitionQuery; +import org.flowable.engine.runtime.ProcessInstance; +import org.flowable.image.impl.DefaultProcessDiagramGenerator; +import org.flowable.task.api.Task; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; /** * 流程定义 diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowInstanceServiceImpl.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowInstanceServiceImpl.java index df2fe237..324e3e24 100644 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowInstanceServiceImpl.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowInstanceServiceImpl.java @@ -1,20 +1,18 @@ package com.core.flowable.service.impl; -import java.util.Map; -import java.util.Objects; - -import org.flowable.common.engine.api.FlowableObjectNotFoundException; -import org.flowable.engine.history.HistoricProcessInstance; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.core.common.core.domain.AjaxResult; import com.core.common.utils.SecurityUtils; import com.core.flowable.domain.vo.FlowTaskVo; import com.core.flowable.factory.FlowServiceFactory; import com.core.flowable.service.IFlowInstanceService; - import lombok.extern.slf4j.Slf4j; +import org.flowable.common.engine.api.FlowableObjectNotFoundException; +import org.flowable.engine.history.HistoricProcessInstance; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Map; +import java.util.Objects; /** *

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 8ace7f30..3dce91c0 100644 --- 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 @@ -1,43 +1,5 @@ package com.core.flowable.service.impl; -import java.io.InputStream; -import java.lang.reflect.Field; -import java.nio.charset.StandardCharsets; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; -import org.flowable.bpmn.model.*; -import org.flowable.bpmn.model.Process; -import org.flowable.common.engine.api.FlowableException; -import org.flowable.common.engine.api.FlowableObjectNotFoundException; -import org.flowable.engine.ProcessEngineConfiguration; -import org.flowable.engine.history.HistoricActivityInstance; -import org.flowable.engine.history.HistoricProcessInstance; -import org.flowable.engine.history.HistoricProcessInstanceQuery; -import org.flowable.engine.impl.cmd.AddMultiInstanceExecutionCmd; -import org.flowable.engine.impl.cmd.DeleteMultiInstanceExecutionCmd; -import org.flowable.engine.repository.ProcessDefinition; -import org.flowable.engine.runtime.Execution; -import org.flowable.engine.runtime.ProcessInstance; -import org.flowable.engine.task.Comment; -import org.flowable.identitylink.api.history.HistoricIdentityLink; -import org.flowable.image.ProcessDiagramGenerator; -import org.flowable.task.api.DelegationState; -import org.flowable.task.api.Task; -import org.flowable.task.api.TaskQuery; -import org.flowable.task.api.history.HistoricTaskInstance; -import org.flowable.task.api.history.HistoricTaskInstanceQuery; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.TypeReference; @@ -65,8 +27,43 @@ import com.core.flowable.service.ISysFormService; import com.core.system.domain.SysForm; import com.core.system.service.ISysRoleService; import com.core.system.service.ISysUserService; - import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.flowable.bpmn.model.*; +import org.flowable.bpmn.model.Process; +import org.flowable.common.engine.api.FlowableException; +import org.flowable.common.engine.api.FlowableObjectNotFoundException; +import org.flowable.engine.ProcessEngineConfiguration; +import org.flowable.engine.history.HistoricActivityInstance; +import org.flowable.engine.history.HistoricProcessInstance; +import org.flowable.engine.history.HistoricProcessInstanceQuery; +import org.flowable.engine.impl.cmd.AddMultiInstanceExecutionCmd; +import org.flowable.engine.impl.cmd.DeleteMultiInstanceExecutionCmd; +import org.flowable.engine.repository.ProcessDefinition; +import org.flowable.engine.runtime.Execution; +import org.flowable.engine.runtime.ProcessInstance; +import org.flowable.engine.task.Comment; +import org.flowable.identitylink.api.history.HistoricIdentityLink; +import org.flowable.image.ProcessDiagramGenerator; +import org.flowable.task.api.DelegationState; +import org.flowable.task.api.Task; +import org.flowable.task.api.TaskQuery; +import org.flowable.task.api.history.HistoricTaskInstance; +import org.flowable.task.api.history.HistoricTaskInstanceQuery; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.io.InputStream; +import java.lang.reflect.Field; +import java.nio.charset.StandardCharsets; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; /** * @author system diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/SysDeployFormServiceImpl.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/SysDeployFormServiceImpl.java index b0b0c870..34c0647a 100644 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/SysDeployFormServiceImpl.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/SysDeployFormServiceImpl.java @@ -1,15 +1,14 @@ package com.core.flowable.service.impl; -import java.util.List; -import java.util.Objects; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.core.flowable.service.ISysDeployFormService; import com.core.system.domain.SysDeployForm; import com.core.system.domain.SysForm; import com.core.system.mapper.SysDeployFormMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Objects; /** * 流程实例关联表单Service业务层处理 diff --git a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/SysFormServiceImpl.java b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/SysFormServiceImpl.java index 42c9e21e..53696690 100644 --- a/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/SysFormServiceImpl.java +++ b/openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/SysFormServiceImpl.java @@ -1,14 +1,13 @@ package com.core.flowable.service.impl; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.core.common.utils.DateUtils; import com.core.flowable.service.ISysFormService; import com.core.system.domain.SysForm; import com.core.system.mapper.SysFormMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 流程表单Service业务层处理 diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/DataScopeAspect.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/DataScopeAspect.java index 973d473e..bcfae5a2 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/DataScopeAspect.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/DataScopeAspect.java @@ -1,13 +1,5 @@ package com.core.framework.aspectj; -import java.util.ArrayList; -import java.util.List; - -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; -import org.springframework.stereotype.Component; - import com.core.common.annotation.DataScope; import com.core.common.constant.UserConstants; import com.core.common.core.domain.BaseEntity; @@ -18,6 +10,13 @@ import com.core.common.core.text.Convert; import com.core.common.utils.SecurityUtils; import com.core.common.utils.StringUtils; import com.core.framework.security.context.PermissionContextHolder; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.List; /** * 数据过滤处理 diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/DataSourceAspect.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/DataSourceAspect.java index 50fdf6f5..095f1102 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/DataSourceAspect.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/DataSourceAspect.java @@ -1,7 +1,8 @@ package com.core.framework.aspectj; -import java.util.Objects; - +import com.core.common.annotation.DataSource; +import com.core.common.utils.StringUtils; +import com.core.framework.datasource.DynamicDataSourceContextHolder; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -13,9 +14,7 @@ import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; -import com.core.common.annotation.DataSource; -import com.core.common.utils.StringUtils; -import com.core.framework.datasource.DynamicDataSourceContextHolder; +import java.util.Objects; /** * 多数据源处理 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 ae0277d5..1afd25df 100644 --- 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 @@ -1,24 +1,5 @@ package com.core.framework.aspectj; -import java.util.Collection; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.lang3.ArrayUtils; -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.AfterReturning; -import org.aspectj.lang.annotation.AfterThrowing; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.core.NamedThreadLocal; -import org.springframework.stereotype.Component; -import org.springframework.validation.BindingResult; -import org.springframework.web.multipart.MultipartFile; - import com.alibaba.fastjson2.JSON; import com.core.common.annotation.Log; import com.core.common.core.domain.entity.SysUser; @@ -33,6 +14,23 @@ import com.core.common.utils.ip.IpUtils; import com.core.framework.manager.AsyncManager; import com.core.framework.manager.factory.AsyncFactory; import com.core.system.domain.SysOperLog; +import org.apache.commons.lang3.ArrayUtils; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.AfterReturning; +import org.aspectj.lang.annotation.AfterThrowing; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.core.NamedThreadLocal; +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 java.util.Collection; +import java.util.Map; /** * 操作日志记录处理 diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/RateLimiterAspect.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/RateLimiterAspect.java index 3aa026ae..1f9d955b 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/RateLimiterAspect.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/RateLimiterAspect.java @@ -1,9 +1,10 @@ package com.core.framework.aspectj; -import java.lang.reflect.Method; -import java.util.Collections; -import java.util.List; - +import com.core.common.annotation.RateLimiter; +import com.core.common.enums.LimitType; +import com.core.common.exception.ServiceException; +import com.core.common.utils.StringUtils; +import com.core.common.utils.ip.IpUtils; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; @@ -15,11 +16,9 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.script.RedisScript; import org.springframework.stereotype.Component; -import com.core.common.annotation.RateLimiter; -import com.core.common.enums.LimitType; -import com.core.common.exception.ServiceException; -import com.core.common.utils.StringUtils; -import com.core.common.utils.ip.IpUtils; +import java.lang.reflect.Method; +import java.util.Collections; +import java.util.List; /** * 限流处理 diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ApplicationConfig.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ApplicationConfig.java index 8df37e75..2a699eed 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ApplicationConfig.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ApplicationConfig.java @@ -1,13 +1,13 @@ package com.core.framework.config; -import java.util.TimeZone; - import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.EnableAspectJAutoProxy; +import java.util.TimeZone; + /** * 程序注解配置 * diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/CaptchaConfig.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/CaptchaConfig.java index fc13fe28..06f2d668 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/CaptchaConfig.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/CaptchaConfig.java @@ -1,14 +1,13 @@ package com.core.framework.config; -import static com.google.code.kaptcha.Constants.*; - -import java.util.Properties; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - import com.google.code.kaptcha.impl.DefaultKaptcha; import com.google.code.kaptcha.util.Config; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.Properties; + +import static com.google.code.kaptcha.Constants.*; /** * 验证码配置 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 efc7cea1..3eb029ca 100644 --- 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,19 +1,5 @@ package com.core.framework.config; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.*; -import javax.sql.DataSource; - -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.web.servlet.FilterRegistrationBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder; import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties; @@ -22,6 +8,18 @@ import com.core.common.enums.DataSourceType; import com.core.common.utils.spring.SpringUtils; import com.core.framework.config.properties.DruidProperties; import com.core.framework.datasource.DynamicDataSource; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; + +import javax.servlet.*; +import javax.sql.DataSource; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; /** * druid 配置多数据源 diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/FastJson2JsonRedisSerializer.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/FastJson2JsonRedisSerializer.java index d872163d..02b4b8f7 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/FastJson2JsonRedisSerializer.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/FastJson2JsonRedisSerializer.java @@ -1,15 +1,14 @@ package com.core.framework.config; -import java.nio.charset.Charset; - -import org.springframework.data.redis.serializer.RedisSerializer; -import org.springframework.data.redis.serializer.SerializationException; - import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONReader; import com.alibaba.fastjson2.JSONWriter; import com.alibaba.fastjson2.filter.Filter; import com.core.common.constant.Constants; +import org.springframework.data.redis.serializer.RedisSerializer; +import org.springframework.data.redis.serializer.SerializationException; + +import java.nio.charset.Charset; /** * Redis使用FastJson序列化 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 f4fa0a26..d085ff9e 100644 --- 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 @@ -1,19 +1,17 @@ package com.core.framework.config; -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.DispatcherType; - +import com.core.common.filter.RepeatableFilter; +import com.core.common.filter.XssFilter; +import com.core.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.core.common.filter.RepeatableFilter; -import com.core.common.filter.XssFilter; -import com.core.common.utils.StringUtils; +import javax.servlet.DispatcherType; +import java.util.HashMap; +import java.util.Map; /** * Filter配置 diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/I18nConfig.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/I18nConfig.java index 83b93580..d297ac63 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/I18nConfig.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/I18nConfig.java @@ -1,5 +1,6 @@ package com.core.framework.config; +import com.core.common.constant.Constants; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.LocaleResolver; @@ -8,8 +9,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.i18n.LocaleChangeInterceptor; import org.springframework.web.servlet.i18n.SessionLocaleResolver; -import com.core.common.constant.Constants; - /** * 资源文件配置加载 * diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/KaptchaTextCreator.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/KaptchaTextCreator.java index 28b2a234..66196a3c 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/KaptchaTextCreator.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/KaptchaTextCreator.java @@ -1,9 +1,9 @@ package com.core.framework.config; -import java.util.Random; - import com.google.code.kaptcha.text.impl.DefaultTextCreator; +import java.util.Random; + /** * 验证码文本生成器 * 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 32e0bb40..16b55543 100644 --- 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 @@ -1,17 +1,5 @@ package com.core.framework.config; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.transaction.annotation.EnableTransactionManagement; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler; @@ -20,9 +8,18 @@ import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInt import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; import com.core.common.utils.SecurityUtils; - import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.LongValue; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +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 java.util.Arrays; +import java.util.HashSet; +import java.util.Set; @EnableTransactionManagement(proxyTargetClass = true) @Configuration diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ResourcesConfig.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ResourcesConfig.java index 18dd71a9..cfbd421a 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ResourcesConfig.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ResourcesConfig.java @@ -1,7 +1,8 @@ package com.core.framework.config; -import java.util.concurrent.TimeUnit; - +import com.core.common.config.CoreConfig; +import com.core.common.constant.Constants; +import com.core.framework.interceptor.RepeatSubmitInterceptor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -13,9 +14,7 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import com.core.common.config.CoreConfig; -import com.core.common.constant.Constants; -import com.core.framework.interceptor.RepeatSubmitInterceptor; +import java.util.concurrent.TimeUnit; /** * 通用配置 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 c3c69412..cce46c80 100644 --- 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 @@ -1,5 +1,9 @@ package com.core.framework.config; +import com.core.framework.config.properties.PermitAllUrlProperties; +import com.core.framework.security.filter.JwtAuthenticationTokenFilter; +import com.core.framework.security.handle.AuthenticationEntryPointImpl; +import com.core.framework.security.handle.LogoutSuccessHandlerImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -17,11 +21,6 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic import org.springframework.security.web.authentication.logout.LogoutFilter; import org.springframework.web.filter.CorsFilter; -import com.core.framework.config.properties.PermitAllUrlProperties; -import com.core.framework.security.filter.JwtAuthenticationTokenFilter; -import com.core.framework.security.handle.AuthenticationEntryPointImpl; -import com.core.framework.security.handle.LogoutSuccessHandlerImpl; - /** * spring security配置 * 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 e5b3473b..6e460cf5 100644 --- 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 @@ -1,10 +1,9 @@ package com.core.framework.config; -import javax.servlet.http.HttpServletRequest; - +import com.core.common.utils.ServletUtils; import org.springframework.stereotype.Component; -import com.core.common.utils.ServletUtils; +import javax.servlet.http.HttpServletRequest; /** * 服务相关配置 diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ThreadPoolConfig.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ThreadPoolConfig.java index 0f82cd0b..536ded97 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ThreadPoolConfig.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/ThreadPoolConfig.java @@ -1,15 +1,14 @@ package com.core.framework.config; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledThreadPoolExecutor; -import java.util.concurrent.ThreadPoolExecutor; - +import com.core.common.utils.Threads; import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; -import com.core.common.utils.Threads; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.ThreadPoolExecutor; /** * 线程池配置 diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/properties/DruidProperties.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/properties/DruidProperties.java index 952d61db..19317444 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/properties/DruidProperties.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/properties/DruidProperties.java @@ -1,10 +1,9 @@ package com.core.framework.config.properties; +import com.alibaba.druid.pool.DruidDataSource; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; -import com.alibaba.druid.pool.DruidDataSource; - /** * druid 配置属性 * diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/properties/PermitAllUrlProperties.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/properties/PermitAllUrlProperties.java index 2ef770e4..53c30ac0 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/properties/PermitAllUrlProperties.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/properties/PermitAllUrlProperties.java @@ -1,8 +1,6 @@ package com.core.framework.config.properties; -import java.util.*; -import java.util.regex.Pattern; - +import com.core.common.annotation.Anonymous; import org.apache.commons.lang3.RegExUtils; import org.springframework.beans.BeansException; import org.springframework.beans.factory.InitializingBean; @@ -14,7 +12,8 @@ import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.mvc.method.RequestMappingInfo; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; -import com.core.common.annotation.Anonymous; +import java.util.*; +import java.util.regex.Pattern; /** * 设置Anonymous注解允许匿名访问的url diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/datasource/DynamicDataSource.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/datasource/DynamicDataSource.java index 87fca056..41ee9c53 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/datasource/DynamicDataSource.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/datasource/DynamicDataSource.java @@ -1,10 +1,9 @@ package com.core.framework.datasource; -import java.util.Map; +import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; import javax.sql.DataSource; - -import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; +import java.util.Map; /** * 动态数据源 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 1146b8ab..18ce531c 100644 --- 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 @@ -1,18 +1,16 @@ package com.core.framework.handler; -import java.util.Date; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.ibatis.reflection.MetaObject; -import org.springframework.stereotype.Component; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.core.common.core.domain.model.LoginUser; import com.core.common.utils.SecurityUtils; import com.core.framework.config.TenantContext; +import org.apache.ibatis.reflection.MetaObject; +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 java.util.Date; @Component public class MybastisColumnsHandler implements MetaObjectHandler { 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 c3b6243c..e2204b7a 100644 --- 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 @@ -1,18 +1,16 @@ package com.core.framework.interceptor; -import java.lang.reflect.Method; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.stereotype.Component; -import org.springframework.web.method.HandlerMethod; -import org.springframework.web.servlet.HandlerInterceptor; - import com.alibaba.fastjson2.JSON; import com.core.common.annotation.RepeatSubmit; import com.core.common.core.domain.AjaxResult; import com.core.common.utils.ServletUtils; +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 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 302c0999..f38cd20e 100644 --- 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 @@ -1,15 +1,5 @@ package com.core.framework.interceptor.impl; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.TimeUnit; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - import com.alibaba.fastjson2.JSON; import com.core.common.annotation.RepeatSubmit; import com.core.common.constant.CacheConstants; @@ -18,6 +8,14 @@ import com.core.common.filter.RepeatedlyRequestWrapper; import com.core.common.utils.StringUtils; import com.core.common.utils.http.HttpHelper; import com.core.framework.interceptor.RepeatSubmitInterceptor; +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 java.util.HashMap; +import java.util.Map; +import java.util.concurrent.TimeUnit; /** * 判断请求url和数据是否和上一次相同， 如果和上次相同，则是重复提交表单。 有效时间为10秒内。 diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/manager/AsyncManager.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/manager/AsyncManager.java index 329acc2b..7fe2fcd3 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/manager/AsyncManager.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/manager/AsyncManager.java @@ -1,12 +1,12 @@ package com.core.framework.manager; +import com.core.common.utils.Threads; +import com.core.common.utils.spring.SpringUtils; + import java.util.TimerTask; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import com.core.common.utils.Threads; -import com.core.common.utils.spring.SpringUtils; - /** * 异步任务管理器 * 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 35ceca4c..8d4058fe 100644 --- 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 @@ -1,11 +1,11 @@ package com.core.framework.manager; -import javax.annotation.PreDestroy; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import javax.annotation.PreDestroy; + /** * 确保应用退出时能关闭后台线程 * diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/manager/factory/AsyncFactory.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/manager/factory/AsyncFactory.java index 1a893712..c3f7b876 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/manager/factory/AsyncFactory.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/manager/factory/AsyncFactory.java @@ -1,10 +1,5 @@ package com.core.framework.manager.factory; -import java.util.TimerTask; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.core.common.constant.Constants; import com.core.common.utils.LogUtils; import com.core.common.utils.ServletUtils; @@ -16,8 +11,11 @@ import com.core.system.domain.SysLogininfor; import com.core.system.domain.SysOperLog; import com.core.system.service.ISysLogininforService; import com.core.system.service.ISysOperLogService; - import eu.bitwalker.useragentutils.UserAgent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.TimerTask; /** * 异步工厂（产生任务用） diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/security/context/PermissionContextHolder.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/security/context/PermissionContextHolder.java index bf10d1c7..b9e5536d 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/security/context/PermissionContextHolder.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/security/context/PermissionContextHolder.java @@ -1,10 +1,9 @@ package com.core.framework.security.context; +import com.core.common.core.text.Convert; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; -import com.core.common.core.text.Convert; - /** * 权限信息 * 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 ca722cba..a33174af 100644 --- 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 @@ -1,12 +1,9 @@ package com.core.framework.security.filter; -import java.io.IOException; - -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.core.common.core.domain.model.LoginUser; +import com.core.common.utils.SecurityUtils; +import com.core.common.utils.StringUtils; +import com.core.framework.web.service.TokenService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; @@ -14,10 +11,11 @@ import org.springframework.security.web.authentication.WebAuthenticationDetailsS import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; -import com.core.common.core.domain.model.LoginUser; -import com.core.common.utils.SecurityUtils; -import com.core.common.utils.StringUtils; -import com.core.framework.web.service.TokenService; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; /** * token过滤器 验证token有效性 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 de092d67..5cffae16 100644 --- 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 @@ -1,20 +1,18 @@ package com.core.framework.security.handle; -import java.io.IOException; -import java.io.Serializable; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.security.core.AuthenticationException; -import org.springframework.security.web.AuthenticationEntryPoint; -import org.springframework.stereotype.Component; - import com.alibaba.fastjson2.JSON; import com.core.common.constant.HttpStatus; import com.core.common.core.domain.AjaxResult; import com.core.common.utils.ServletUtils; import com.core.common.utils.StringUtils; +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 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 51cb73c0..63f5db58 100644 --- 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 @@ -1,16 +1,5 @@ package com.core.framework.security.handle; -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.core.Authentication; -import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; - import com.alibaba.fastjson2.JSON; import com.core.common.constant.Constants; import com.core.common.core.domain.AjaxResult; @@ -21,6 +10,15 @@ import com.core.common.utils.StringUtils; import com.core.framework.manager.AsyncManager; import com.core.framework.manager.factory.AsyncFactory; import com.core.framework.web.service.TokenService; +import org.springframework.beans.factory.annotation.Autowired; +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 java.io.IOException; /** * 自定义退出处理类 返回成功 diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/Server.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/Server.java index afa24353..6dacda0c 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/Server.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/Server.java @@ -1,14 +1,8 @@ package com.core.framework.web.domain; -import java.net.UnknownHostException; -import java.util.LinkedList; -import java.util.List; -import java.util.Properties; - import com.core.common.utils.Arith; import com.core.common.utils.ip.IpUtils; import com.core.framework.web.domain.server.*; - import oshi.SystemInfo; import oshi.hardware.CentralProcessor; import oshi.hardware.CentralProcessor.TickType; @@ -19,6 +13,11 @@ import oshi.software.os.OSFileStore; import oshi.software.os.OperatingSystem; import oshi.util.Util; +import java.net.UnknownHostException; +import java.util.LinkedList; +import java.util.List; +import java.util.Properties; + /** * 服务器相关信息 * diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/Jvm.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/Jvm.java index 9faca8e2..b97dcfe5 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/Jvm.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/Jvm.java @@ -1,10 +1,10 @@ package com.core.framework.web.domain.server; -import java.lang.management.ManagementFactory; - import com.core.common.utils.Arith; import com.core.common.utils.DateUtils; +import java.lang.management.ManagementFactory; + /** * JVM相关信息 * 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 53a904f3..e43a30f8 100644 --- 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 @@ -1,7 +1,13 @@ package com.core.framework.web.exception; -import javax.servlet.http.HttpServletRequest; - +import com.core.common.constant.HttpStatus; +import com.core.common.core.domain.AjaxResult; +import com.core.common.core.text.Convert; +import com.core.common.exception.DemoModeException; +import com.core.common.exception.NonCaptureException; +import com.core.common.exception.ServiceException; +import com.core.common.utils.StringUtils; +import com.core.common.utils.html.EscapeUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.access.AccessDeniedException; @@ -13,14 +19,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; -import com.core.common.constant.HttpStatus; -import com.core.common.core.domain.AjaxResult; -import com.core.common.core.text.Convert; -import com.core.common.exception.DemoModeException; -import com.core.common.exception.NonCaptureException; -import com.core.common.exception.ServiceException; -import com.core.common.utils.StringUtils; -import com.core.common.utils.html.EscapeUtil; +import javax.servlet.http.HttpServletRequest; /** * 全局异常处理器 diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/PermissionService.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/PermissionService.java index 2dc173c6..f7161bb3 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/PermissionService.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/PermissionService.java @@ -1,16 +1,15 @@ package com.core.framework.web.service; -import java.util.Set; - -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - import com.core.common.constant.Constants; import com.core.common.core.domain.entity.SysRole; import com.core.common.core.domain.model.LoginUser; import com.core.common.utils.SecurityUtils; import com.core.common.utils.StringUtils; import com.core.framework.security.context.PermissionContextHolder; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.util.Set; /** * 首创 自定义权限实现，ss取自SpringSecurity首字母 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 cc3127c9..1499126e 100644 --- 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 @@ -1,19 +1,5 @@ package com.core.framework.web.service; -import java.util.List; -import java.util.Map; -import java.util.Optional; - -import javax.annotation.Resource; - -import com.core.common.enums.DelFlag; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.authentication.BadCredentialsException; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.Authentication; -import org.springframework.stereotype.Component; - import com.alibaba.fastjson2.JSONObject; import com.core.common.constant.CacheConstants; import com.core.common.constant.Constants; @@ -24,6 +10,7 @@ import com.core.common.core.domain.entity.SysUser; import com.core.common.core.domain.model.LoginUser; import com.core.common.core.domain.model.LoginUserExtend; import com.core.common.core.redis.RedisCache; +import com.core.common.enums.DelFlag; import com.core.common.enums.TenantStatus; import com.core.common.exception.ServiceException; import com.core.common.exception.user.*; @@ -39,6 +26,17 @@ import com.core.system.service.ISysConfigService; import com.core.system.service.ISysTenantOptionService; import com.core.system.service.ISysTenantService; import com.core.system.service.ISysUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.stereotype.Component; + +import javax.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/SysPasswordService.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysPasswordService.java index 8d54cf61..0560f007 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysPasswordService.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysPasswordService.java @@ -1,12 +1,5 @@ package com.core.framework.web.service; -import java.util.concurrent.TimeUnit; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.security.core.Authentication; -import org.springframework.stereotype.Component; - import com.core.common.constant.CacheConstants; import com.core.common.core.domain.entity.SysUser; import com.core.common.core.redis.RedisCache; @@ -14,6 +7,12 @@ import com.core.common.exception.user.UserPasswordNotMatchException; import com.core.common.exception.user.UserPasswordRetryLimitExceedException; import com.core.common.utils.SecurityUtils; import com.core.framework.security.context.AuthenticationContextHolder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.security.core.Authentication; +import org.springframework.stereotype.Component; + +import java.util.concurrent.TimeUnit; /** * 登录密码方法 diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysPermissionService.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysPermissionService.java index f8815c02..278ddd9b 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysPermissionService.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysPermissionService.java @@ -1,19 +1,18 @@ package com.core.framework.web.service; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.springframework.util.CollectionUtils; - import com.core.common.constant.UserConstants; import com.core.common.core.domain.entity.SysRole; import com.core.common.core.domain.entity.SysUser; import com.core.common.utils.StringUtils; import com.core.system.service.ISysMenuService; import com.core.system.service.ISysRoleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; + +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * 用户权限处理 diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysRegisterService.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysRegisterService.java index 9c4f1f64..3d53647a 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysRegisterService.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysRegisterService.java @@ -1,8 +1,5 @@ package com.core.framework.web.service; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - import com.core.common.constant.CacheConstants; import com.core.common.constant.Constants; import com.core.common.constant.UserConstants; @@ -18,6 +15,8 @@ import com.core.framework.manager.AsyncManager; import com.core.framework.manager.factory.AsyncFactory; import com.core.system.service.ISysConfigService; import com.core.system.service.ISysUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; /** * 注册校验方法 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 0c77847f..f728e45c 100644 --- 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 @@ -1,17 +1,5 @@ package com.core.framework.web.service; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.TimeUnit; - -import javax.servlet.http.HttpServletRequest; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - import com.core.common.constant.CacheConstants; import com.core.common.constant.Constants; import com.core.common.core.domain.model.LoginUser; @@ -21,11 +9,20 @@ import com.core.common.utils.StringUtils; import com.core.common.utils.ip.AddressUtils; import com.core.common.utils.ip.IpUtils; import com.core.common.utils.uuid.IdUtils; - import eu.bitwalker.useragentutils.UserAgent; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +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 java.util.HashMap; +import java.util.Map; +import java.util.concurrent.TimeUnit; /** * token验证处理 diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/UserDetailsServiceImpl.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/UserDetailsServiceImpl.java index ac8684b2..b6a6e044 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/UserDetailsServiceImpl.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/UserDetailsServiceImpl.java @@ -1,13 +1,5 @@ package com.core.framework.web.service; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.stereotype.Service; - import com.core.common.core.domain.entity.SysUser; import com.core.common.core.domain.model.LoginUser; import com.core.common.enums.UserStatus; @@ -15,6 +7,13 @@ import com.core.common.exception.ServiceException; import com.core.common.utils.MessageUtils; import com.core.common.utils.StringUtils; import com.core.system.service.ISysUserService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; /** * 用户验证处理 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 5145d3b7..e7e66445 100644 --- 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 @@ -1,24 +1,5 @@ package com.core.generator.controller; -import java.io.BufferedWriter; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.io.IOUtils; -import org.apache.poi.ss.usermodel.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -36,6 +17,23 @@ import com.core.generator.domain.GenTable; import com.core.generator.domain.GenTableColumn; import com.core.generator.service.IGenTableColumnService; import com.core.generator.service.IGenTableService; +import org.apache.commons.io.IOUtils; +import org.apache.poi.ss.usermodel.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.BufferedWriter; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 代码生成 操作处理 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 b57d6210..c474ea23 100644 --- 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 @@ -1,15 +1,13 @@ package com.core.generator.domain; -import java.util.List; - -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; - -import org.apache.commons.lang3.ArrayUtils; - import com.core.common.constant.GenConstants; 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 java.util.List; /** * 业务表 gen_table 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 265ebcec..d004c489 100644 --- 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 @@ -1,10 +1,10 @@ package com.core.generator.domain; -import javax.validation.constraints.NotBlank; - import com.core.common.core.domain.BaseEntity; import com.core.common.utils.StringUtils; +import javax.validation.constraints.NotBlank; + /** * 代码生成业务字段表 gen_table_column * diff --git a/openhis-server-new/core-generator/src/main/java/com/core/generator/mapper/GenTableColumnMapper.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/mapper/GenTableColumnMapper.java index 201a4471..97d10fc3 100644 --- a/openhis-server-new/core-generator/src/main/java/com/core/generator/mapper/GenTableColumnMapper.java +++ b/openhis-server-new/core-generator/src/main/java/com/core/generator/mapper/GenTableColumnMapper.java @@ -1,9 +1,9 @@ package com.core.generator.mapper; -import java.util.List; - import com.core.generator.domain.GenTableColumn; +import java.util.List; + /** * 业务字段 数据层 * diff --git a/openhis-server-new/core-generator/src/main/java/com/core/generator/mapper/GenTableMapper.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/mapper/GenTableMapper.java index fb450e52..0e1bde10 100644 --- a/openhis-server-new/core-generator/src/main/java/com/core/generator/mapper/GenTableMapper.java +++ b/openhis-server-new/core-generator/src/main/java/com/core/generator/mapper/GenTableMapper.java @@ -1,9 +1,9 @@ package com.core.generator.mapper; -import java.util.List; - import com.core.generator.domain.GenTable; +import java.util.List; + /** * 业务 数据层 * diff --git a/openhis-server-new/core-generator/src/main/java/com/core/generator/service/GenTableColumnServiceImpl.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/service/GenTableColumnServiceImpl.java index 61fb2627..65fce1db 100644 --- a/openhis-server-new/core-generator/src/main/java/com/core/generator/service/GenTableColumnServiceImpl.java +++ b/openhis-server-new/core-generator/src/main/java/com/core/generator/service/GenTableColumnServiceImpl.java @@ -1,13 +1,12 @@ package com.core.generator.service; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.core.common.core.text.Convert; import com.core.generator.domain.GenTableColumn; import com.core.generator.mapper.GenTableColumnMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 业务字段 服务层实现 diff --git a/openhis-server-new/core-generator/src/main/java/com/core/generator/service/GenTableServiceImpl.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/service/GenTableServiceImpl.java index 38d033af..2a16fffd 100644 --- a/openhis-server-new/core-generator/src/main/java/com/core/generator/service/GenTableServiceImpl.java +++ b/openhis-server-new/core-generator/src/main/java/com/core/generator/service/GenTableServiceImpl.java @@ -1,28 +1,5 @@ package com.core.generator.service; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.StringWriter; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; - -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.Velocity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.core.common.constant.Constants; @@ -37,6 +14,28 @@ import com.core.generator.mapper.GenTableMapper; import com.core.generator.util.GenUtils; import com.core.generator.util.VelocityInitializer; import com.core.generator.util.VelocityUtils; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.Velocity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.StringWriter; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; /** * 业务 服务层实现 diff --git a/openhis-server-new/core-generator/src/main/java/com/core/generator/service/IGenTableColumnService.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/service/IGenTableColumnService.java index cb3829ab..1796ba5f 100644 --- a/openhis-server-new/core-generator/src/main/java/com/core/generator/service/IGenTableColumnService.java +++ b/openhis-server-new/core-generator/src/main/java/com/core/generator/service/IGenTableColumnService.java @@ -1,9 +1,9 @@ package com.core.generator.service; -import java.util.List; - import com.core.generator.domain.GenTableColumn; +import java.util.List; + /** * 业务字段 服务层 * diff --git a/openhis-server-new/core-generator/src/main/java/com/core/generator/service/IGenTableService.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/service/IGenTableService.java index 03e9063e..175b69cd 100644 --- a/openhis-server-new/core-generator/src/main/java/com/core/generator/service/IGenTableService.java +++ b/openhis-server-new/core-generator/src/main/java/com/core/generator/service/IGenTableService.java @@ -1,10 +1,10 @@ package com.core.generator.service; +import com.core.generator.domain.GenTable; + import java.util.List; import java.util.Map; -import com.core.generator.domain.GenTable; - /** * 业务 服务层 * diff --git a/openhis-server-new/core-generator/src/main/java/com/core/generator/util/GenUtils.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/util/GenUtils.java index 82319b3a..6039952e 100644 --- a/openhis-server-new/core-generator/src/main/java/com/core/generator/util/GenUtils.java +++ b/openhis-server-new/core-generator/src/main/java/com/core/generator/util/GenUtils.java @@ -1,14 +1,13 @@ package com.core.generator.util; -import java.util.Arrays; - -import org.apache.commons.lang3.RegExUtils; - import com.core.common.constant.GenConstants; import com.core.common.utils.StringUtils; import com.core.generator.config.GenConfig; import com.core.generator.domain.GenTable; import com.core.generator.domain.GenTableColumn; +import org.apache.commons.lang3.RegExUtils; + +import java.util.Arrays; /** * 代码生成器 工具类 diff --git a/openhis-server-new/core-generator/src/main/java/com/core/generator/util/VelocityInitializer.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/util/VelocityInitializer.java index 4e434e1b..88894a7b 100644 --- a/openhis-server-new/core-generator/src/main/java/com/core/generator/util/VelocityInitializer.java +++ b/openhis-server-new/core-generator/src/main/java/com/core/generator/util/VelocityInitializer.java @@ -1,10 +1,9 @@ package com.core.generator.util; -import java.util.Properties; - +import com.core.common.constant.Constants; import org.apache.velocity.app.Velocity; -import com.core.common.constant.Constants; +import java.util.Properties; /** * VelocityEngine工厂 diff --git a/openhis-server-new/core-generator/src/main/java/com/core/generator/util/VelocityUtils.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/util/VelocityUtils.java index cdb24cea..66c85a28 100644 --- a/openhis-server-new/core-generator/src/main/java/com/core/generator/util/VelocityUtils.java +++ b/openhis-server-new/core-generator/src/main/java/com/core/generator/util/VelocityUtils.java @@ -1,12 +1,5 @@ package com.core.generator.util; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.apache.velocity.VelocityContext; - import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.core.common.constant.GenConstants; @@ -14,6 +7,12 @@ import com.core.common.utils.DateUtils; import com.core.common.utils.StringUtils; import com.core.generator.domain.GenTable; import com.core.generator.domain.GenTableColumn; +import org.apache.velocity.VelocityContext; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * 模板处理工具类 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 b97d26fe..61fb3e15 100644 --- 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 @@ -1,13 +1,5 @@ package com.core.quartz.domain; -import java.util.Date; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - import com.core.common.annotation.Excel; import com.core.common.annotation.Excel.ColumnType; import com.core.common.constant.ScheduleConstants; @@ -15,6 +7,12 @@ import com.core.common.core.domain.BaseEntity; import com.core.common.utils.StringUtils; import com.core.quartz.util.CronUtils; 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 java.util.Date; /** * 定时任务调度表 sys_job diff --git a/openhis-server-new/core-quartz/src/main/java/com/core/quartz/domain/SysJobLog.java b/openhis-server-new/core-quartz/src/main/java/com/core/quartz/domain/SysJobLog.java index 7737c6a5..0c30b09f 100644 --- a/openhis-server-new/core-quartz/src/main/java/com/core/quartz/domain/SysJobLog.java +++ b/openhis-server-new/core-quartz/src/main/java/com/core/quartz/domain/SysJobLog.java @@ -1,12 +1,11 @@ package com.core.quartz.domain; -import java.util.Date; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - import com.core.common.annotation.Excel; import com.core.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; /** * 定时任务调度日志表 sys_job_log diff --git a/openhis-server-new/core-quartz/src/main/java/com/core/quartz/mapper/SysJobLogMapper.java b/openhis-server-new/core-quartz/src/main/java/com/core/quartz/mapper/SysJobLogMapper.java index d0460bfe..aa552dca 100644 --- a/openhis-server-new/core-quartz/src/main/java/com/core/quartz/mapper/SysJobLogMapper.java +++ b/openhis-server-new/core-quartz/src/main/java/com/core/quartz/mapper/SysJobLogMapper.java @@ -1,9 +1,9 @@ package com.core.quartz.mapper; -import java.util.List; - import com.core.quartz.domain.SysJobLog; +import java.util.List; + /** * 调度任务日志信息 数据层 * diff --git a/openhis-server-new/core-quartz/src/main/java/com/core/quartz/mapper/SysJobMapper.java b/openhis-server-new/core-quartz/src/main/java/com/core/quartz/mapper/SysJobMapper.java index 11e26a73..1fed0847 100644 --- a/openhis-server-new/core-quartz/src/main/java/com/core/quartz/mapper/SysJobMapper.java +++ b/openhis-server-new/core-quartz/src/main/java/com/core/quartz/mapper/SysJobMapper.java @@ -1,9 +1,9 @@ package com.core.quartz.mapper; -import java.util.List; - import com.core.quartz.domain.SysJob; +import java.util.List; + /** * 调度任务信息 数据层 * diff --git a/openhis-server-new/core-quartz/src/main/java/com/core/quartz/util/JobInvokeUtil.java b/openhis-server-new/core-quartz/src/main/java/com/core/quartz/util/JobInvokeUtil.java index 86c0b7eb..cfe36c13 100644 --- a/openhis-server-new/core-quartz/src/main/java/com/core/quartz/util/JobInvokeUtil.java +++ b/openhis-server-new/core-quartz/src/main/java/com/core/quartz/util/JobInvokeUtil.java @@ -1,14 +1,14 @@ package com.core.quartz.util; +import com.core.common.utils.StringUtils; +import com.core.common.utils.spring.SpringUtils; +import com.core.quartz.domain.SysJob; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.LinkedList; import java.util.List; -import com.core.common.utils.StringUtils; -import com.core.common.utils.spring.SpringUtils; -import com.core.quartz.domain.SysJob; - /** * 任务执行工具 * 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 8ca1cee8..18b9b0bb 100644 --- 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,16 +1,15 @@ package com.core.system.domain; -import java.io.Serializable; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.util.Date; + /** *

* 流程定义 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 25a2b34f..8ff0ee4e 100644 --- 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 @@ -1,14 +1,13 @@ package com.core.system.domain; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - import com.core.common.annotation.Excel; import com.core.common.annotation.Excel.ColumnType; 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; /** * 参数配置表 sys_config diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysDeployForm.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysDeployForm.java index 8a604cce..8f9648ec 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysDeployForm.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysDeployForm.java @@ -1,10 +1,9 @@ package com.core.system.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - import com.core.common.annotation.Excel; import com.core.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 流程实例关联表单对象 sys_instance_form diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysExpression.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysExpression.java index 5c477ed2..2f9f9d6b 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysExpression.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysExpression.java @@ -1,10 +1,9 @@ package com.core.system.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - import com.core.common.annotation.Excel; import com.core.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 流程达式对象 sys_expression diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysForm.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysForm.java index ac6c967d..a36a691b 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysForm.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysForm.java @@ -1,10 +1,9 @@ package com.core.system.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - import com.core.common.annotation.Excel; import com.core.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 流程表单对象 sys_task_form diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysListener.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysListener.java index 745bf359..ad21d805 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysListener.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysListener.java @@ -1,10 +1,9 @@ package com.core.system.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - import com.core.common.annotation.Excel; import com.core.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 流程监听对象 sys_listener diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysLogininfor.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysLogininfor.java index ec1fcdfe..38fabdd9 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysLogininfor.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysLogininfor.java @@ -1,12 +1,12 @@ package com.core.system.domain; -import java.util.Date; - import com.core.common.annotation.Excel; import com.core.common.annotation.Excel.ColumnType; import com.core.common.core.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; + /** * 系统访问记录表 sys_logininfor * 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 d8461496..1ad62207 100644 --- 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 @@ -1,13 +1,12 @@ package com.core.system.domain; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - import com.core.common.core.domain.BaseEntity; 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; /** * 通知公告表 sys_notice @@ -32,6 +31,15 @@ public class SysNotice extends BaseEntity { /** 公告状态（0正常 1关闭） */ private String status; + /** 发布状态（0未发布 1已发布） */ + private String publishStatus; + + /** 优先级（1高 2中 3低） */ + private String priority; + + /** 是否已读（前端展示用，不映射到数据库） */ + private Boolean isRead; + public Long getNoticeId() { return noticeId; } @@ -75,6 +83,30 @@ public class SysNotice extends BaseEntity { this.status = status; } + public String getPublishStatus() { + return publishStatus; + } + + public void setPublishStatus(String publishStatus) { + this.publishStatus = publishStatus; + } + + public String getPriority() { + return priority; + } + + public void setPriority(String priority) { + this.priority = priority; + } + + public Boolean getIsRead() { + return isRead; + } + + public void setIsRead(Boolean isRead) { + this.isRead = isRead; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("noticeId", getNoticeId()) diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysNoticeRead.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysNoticeRead.java new file mode 100644 index 00000000..01b265dc --- /dev/null +++ b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysNoticeRead.java @@ -0,0 +1,61 @@ +package com.core.system.domain; + +import com.core.common.core.domain.BaseEntity; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; + +/** + * 公告/通知已读记录 sys_notice_read + * + * @author system + */ +public class SysNoticeRead extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 阅读ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long readId; + + /** 公告/通知ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long noticeId; + + /** 用户ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long userId; + + /** 阅读时间 */ + private String readTime; + + public Long getReadId() { + return readId; + } + + public void setReadId(Long readId) { + this.readId = readId; + } + + public Long getNoticeId() { + return noticeId; + } + + public void setNoticeId(Long noticeId) { + this.noticeId = noticeId; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getReadTime() { + return readTime; + } + + public void setReadTime(String readTime) { + this.readTime = readTime; + } +} diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysOperLog.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysOperLog.java index 5c289257..868c86f7 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysOperLog.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysOperLog.java @@ -1,12 +1,12 @@ package com.core.system.domain; -import java.util.Date; - import com.core.common.annotation.Excel; import com.core.common.annotation.Excel.ColumnType; import com.core.common.core.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; + /** * 操作日志记录表 oper_log * 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 01f00eb1..c56113c1 100644 --- 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 @@ -1,15 +1,14 @@ package com.core.system.domain; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - import com.core.common.annotation.Excel; import com.core.common.annotation.Excel.ColumnType; 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; /** * 岗位表 sys_post diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTaskForm.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTaskForm.java index 840521aa..5dc7ee3b 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTaskForm.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTaskForm.java @@ -1,10 +1,9 @@ package com.core.system.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - import com.core.common.annotation.Excel; import com.core.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 流程任务关联单对象 sys_task_form diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTenant.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTenant.java index 596274ff..16724124 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTenant.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTenant.java @@ -1,14 +1,13 @@ package com.core.system.domain; -import java.io.Serializable; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.*; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; + /** * 租户信息表 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTenantOption.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTenantOption.java index 5adc708a..600b5538 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTenantOption.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTenantOption.java @@ -1,14 +1,13 @@ package com.core.system.domain; -import java.io.Serializable; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.*; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; + /** * 租户配置项表 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysUserTenant.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysUserTenant.java index afdea430..3a04e5ad 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysUserTenant.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysUserTenant.java @@ -1,15 +1,14 @@ package com.core.system.domain; -import java.io.Serializable; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * 用户租户绑定表 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/domain/dto/SaveTenantOptionDetailDto.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/dto/SaveTenantOptionDetailDto.java index 22cfee11..7e00b19e 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/domain/dto/SaveTenantOptionDetailDto.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/domain/dto/SaveTenantOptionDetailDto.java @@ -1,11 +1,11 @@ package com.core.system.domain.dto; -import java.util.List; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.List; + /** * 保存租户配置项详情Dto * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/domain/vo/RouterVo.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/vo/RouterVo.java index ead08347..a5e6317e 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/domain/vo/RouterVo.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/domain/vo/RouterVo.java @@ -1,9 +1,9 @@ package com.core.system.domain.vo; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonInclude; +import java.util.List; + /** * 路由配置信息 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/FlowDeployMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/FlowDeployMapper.java index 0ea53fc0..5b96ff0a 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/FlowDeployMapper.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/FlowDeployMapper.java @@ -1,9 +1,9 @@ package com.core.system.mapper; -import java.util.List; - import com.core.system.domain.FlowProcDefDto; +import java.util.List; + /** * 流程定义查询 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysConfigMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysConfigMapper.java index 1ce817f8..0198b662 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysConfigMapper.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysConfigMapper.java @@ -1,9 +1,9 @@ package com.core.system.mapper; -import java.util.List; - import com.core.system.domain.SysConfig; +import java.util.List; + /** * 参数配置 数据层 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysDeployFormMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysDeployFormMapper.java index 9bd76bd1..eec11596 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysDeployFormMapper.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysDeployFormMapper.java @@ -1,10 +1,10 @@ package com.core.system.mapper; -import java.util.List; - import com.core.system.domain.SysDeployForm; import com.core.system.domain.SysForm; +import java.util.List; + /** * 流程实例关联表单Mapper接口 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysDeptMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysDeptMapper.java index 279a96b3..18697e38 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysDeptMapper.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysDeptMapper.java @@ -1,10 +1,9 @@ package com.core.system.mapper; -import java.util.List; - +import com.core.common.core.domain.entity.SysDept; import org.apache.ibatis.annotations.Param; -import com.core.common.core.domain.entity.SysDept; +import java.util.List; /** * 部门管理 数据层 diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysDictDataMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysDictDataMapper.java index 79a92898..09de745f 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysDictDataMapper.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysDictDataMapper.java @@ -1,10 +1,9 @@ package com.core.system.mapper; -import java.util.List; - +import com.core.common.core.domain.entity.SysDictData; import org.apache.ibatis.annotations.Param; -import com.core.common.core.domain.entity.SysDictData; +import java.util.List; /** * 字典表 数据层 diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysDictTypeMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysDictTypeMapper.java index 317ff956..83a90d4e 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysDictTypeMapper.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysDictTypeMapper.java @@ -1,9 +1,9 @@ package com.core.system.mapper; -import java.util.List; - import com.core.common.core.domain.entity.SysDictType; +import java.util.List; + /** * 字典表 数据层 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysExpressionMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysExpressionMapper.java index e137b25d..b81e28c2 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysExpressionMapper.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysExpressionMapper.java @@ -1,9 +1,9 @@ package com.core.system.mapper; -import java.util.List; - import com.core.system.domain.SysExpression; +import java.util.List; + /** * 流程达式Mapper接口 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysFormMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysFormMapper.java index 9e3b0401..cf118041 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysFormMapper.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysFormMapper.java @@ -1,9 +1,9 @@ package com.core.system.mapper; -import java.util.List; - import com.core.system.domain.SysForm; +import java.util.List; + /** * 流程表单Mapper接口 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysListenerMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysListenerMapper.java index 2369bac5..1c24d74f 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysListenerMapper.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysListenerMapper.java @@ -1,9 +1,9 @@ package com.core.system.mapper; -import java.util.List; - import com.core.system.domain.SysListener; +import java.util.List; + /** * 流程监听Mapper接口 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysLogininforMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysLogininforMapper.java index a4ad61b1..e19d2f6d 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysLogininforMapper.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysLogininforMapper.java @@ -1,9 +1,9 @@ package com.core.system.mapper; -import java.util.List; - import com.core.system.domain.SysLogininfor; +import java.util.List; + /** * 系统访问日志情况信息 数据层 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysMenuMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysMenuMapper.java index 65374950..104528d8 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysMenuMapper.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysMenuMapper.java @@ -1,10 +1,9 @@ package com.core.system.mapper; -import java.util.List; - +import com.core.common.core.domain.entity.SysMenu; import org.apache.ibatis.annotations.Param; -import com.core.common.core.domain.entity.SysMenu; +import java.util.List; /** * 菜单表 数据层 diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysNoticeMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysNoticeMapper.java index c3135b07..3eecf982 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysNoticeMapper.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysNoticeMapper.java @@ -1,9 +1,9 @@ package com.core.system.mapper; -import java.util.List; - import com.core.system.domain.SysNotice; +import java.util.List; + /** * 通知公告表 数据层 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysNoticeReadMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysNoticeReadMapper.java new file mode 100644 index 00000000..4e8ec0a9 --- /dev/null +++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysNoticeReadMapper.java @@ -0,0 +1,70 @@ +package com.core.system.mapper; + +import com.core.system.domain.SysNoticeRead; + +import java.util.List; + +/** + * 公告/通知已读记录 Mapper接口 + * + * @author system + */ +public interface SysNoticeReadMapper { + + /** + * 查询公告/通知已读记录 + * + * @param readId 阅读ID + * @return 公告/通知已读记录 + */ + public SysNoticeRead selectNoticeReadById(Long readId); + + /** + * 查询用户的已读公告/通知ID列表 + * + * @param userId 用户ID + * @return 已读公告/通知ID列表 + */ + public List selectReadNoticeIdsByUserId(Long userId); + + /** + * 查询公告/通知的已读用户数量 + * + * @param noticeId 公告/通知ID + * @return 已读用户数量 + */ + public int countReadByNoticeId(Long noticeId); + + /** + * 新增公告/通知已读记录 + * + * @param noticeRead 公告/通知已读记录 + * @return 结果 + */ + public int insertNoticeRead(SysNoticeRead noticeRead); + + /** + * 删除公告/通知已读记录 + * + * @param readId 阅读ID + * @return 结果 + */ + public int deleteNoticeReadById(Long readId); + + /** + * 批量删除公告/通知已读记录 + * + * @param readIds 需要删除的阅读ID + * @return 结果 + */ + public int deleteNoticeReadByIds(Long[] readIds); + + /** + * 检查用户是否已阅读公告/通知 + * + * @param noticeId 公告/通知ID + * @param userId 用户ID + * @return 是否已阅读 + */ + public boolean checkNoticeRead(Long noticeId, Long userId); +} diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysOperLogMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysOperLogMapper.java index 3f95a9d0..62cbf3b4 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysOperLogMapper.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysOperLogMapper.java @@ -1,9 +1,9 @@ package com.core.system.mapper; -import java.util.List; - import com.core.system.domain.SysOperLog; +import java.util.List; + /** * 操作日志 数据层 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysPostMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysPostMapper.java index a567911d..2cab2c50 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysPostMapper.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysPostMapper.java @@ -1,9 +1,9 @@ package com.core.system.mapper; -import java.util.List; - import com.core.system.domain.SysPost; +import java.util.List; + /** * 岗位信息 数据层 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysRoleDeptMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysRoleDeptMapper.java index 51022c3b..5377e1c4 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysRoleDeptMapper.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysRoleDeptMapper.java @@ -1,9 +1,9 @@ package com.core.system.mapper; -import java.util.List; - import com.core.system.domain.SysRoleDept; +import java.util.List; + /** * 角色与部门关联表 数据层 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysRoleMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysRoleMapper.java index b4492dcb..5e0143cc 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysRoleMapper.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysRoleMapper.java @@ -1,9 +1,9 @@ package com.core.system.mapper; -import java.util.List; - import com.core.common.core.domain.entity.SysRole; +import java.util.List; + /** * 角色表 数据层 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysRoleMenuMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysRoleMenuMapper.java index 06019e47..93853ed7 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysRoleMenuMapper.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysRoleMenuMapper.java @@ -1,9 +1,9 @@ package com.core.system.mapper; -import java.util.List; - import com.core.system.domain.SysRoleMenu; +import java.util.List; + /** * 角色与菜单关联表 数据层 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysTaskFormMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysTaskFormMapper.java index 95e9e2d4..251cb1b7 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysTaskFormMapper.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysTaskFormMapper.java @@ -1,9 +1,9 @@ package com.core.system.mapper; -import java.util.List; - import com.core.system.domain.SysTaskForm; +import java.util.List; + /** * 流程任务关联单Mapper接口 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysTenantMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysTenantMapper.java index ebe73880..d6e31f9f 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysTenantMapper.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysTenantMapper.java @@ -1,9 +1,8 @@ package com.core.system.mapper; -import org.apache.ibatis.annotations.Mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.core.system.domain.SysTenant; +import org.apache.ibatis.annotations.Mapper; /** * 租户信息表Mapper接口 diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysTenantOptionMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysTenantOptionMapper.java index 458df210..d4a7f75c 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysTenantOptionMapper.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysTenantOptionMapper.java @@ -1,9 +1,8 @@ package com.core.system.mapper; -import org.apache.ibatis.annotations.Mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.core.system.domain.SysTenantOption; +import org.apache.ibatis.annotations.Mapper; /** * 租户配置项表Mapper接口 diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserMapper.java index 409028ec..1e32ed31 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserMapper.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserMapper.java @@ -1,15 +1,14 @@ package com.core.system.mapper; -import java.util.List; -import java.util.Map; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.core.common.core.domain.entity.SysRole; +import com.core.common.core.domain.entity.SysUser; +import com.core.common.core.domain.model.LoginUserExtend; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.core.common.core.domain.entity.SysUser; -import com.core.common.core.domain.model.LoginUserExtend; +import java.util.List; +import java.util.Map; /** * 用户表 数据层 diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserPostMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserPostMapper.java index c396e1d6..6469471b 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserPostMapper.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserPostMapper.java @@ -1,9 +1,9 @@ package com.core.system.mapper; -import java.util.List; - import com.core.system.domain.SysUserPost; +import java.util.List; + /** * 用户与岗位关联表 数据层 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserRoleMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserRoleMapper.java index 99d6a7b4..76f41995 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserRoleMapper.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserRoleMapper.java @@ -1,10 +1,9 @@ package com.core.system.mapper; -import java.util.List; - +import com.core.system.domain.SysUserRole; import org.apache.ibatis.annotations.Param; -import com.core.system.domain.SysUserRole; +import java.util.List; /** * 用户与角色关联表 数据层 diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserTenantMapper.java b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserTenantMapper.java index 35b8fa63..7b58c344 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserTenantMapper.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/mapper/SysUserTenantMapper.java @@ -1,9 +1,8 @@ package com.core.system.mapper; -import org.apache.ibatis.annotations.Mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.core.system.domain.SysUserTenant; +import org.apache.ibatis.annotations.Mapper; /** * 用户租户绑定表Mapper接口 diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysConfigService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysConfigService.java index 98869ae5..fb350e19 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysConfigService.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysConfigService.java @@ -1,9 +1,9 @@ package com.core.system.service; -import java.util.List; - import com.core.system.domain.SysConfig; +import java.util.List; + /** * 参数配置 服务层 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysDeptService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysDeptService.java index 2aa29e92..19527dc9 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysDeptService.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysDeptService.java @@ -1,10 +1,10 @@ package com.core.system.service; -import java.util.List; - import com.core.common.core.domain.TreeSelect; import com.core.common.core.domain.entity.SysDept; +import java.util.List; + /** * 部门管理 服务层 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysDictDataService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysDictDataService.java index 0acdd86b..401840da 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysDictDataService.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysDictDataService.java @@ -1,9 +1,9 @@ package com.core.system.service; -import java.util.List; - import com.core.common.core.domain.entity.SysDictData; +import java.util.List; + /** * 字典 业务层 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysDictTypeService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysDictTypeService.java index ff6e9ab2..4ad97ac5 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysDictTypeService.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysDictTypeService.java @@ -1,10 +1,10 @@ package com.core.system.service; -import java.util.List; - import com.core.common.core.domain.entity.SysDictData; import com.core.common.core.domain.entity.SysDictType; +import java.util.List; + /** * 字典 业务层 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysExpressionService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysExpressionService.java index c94ef16f..9bb6d963 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysExpressionService.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysExpressionService.java @@ -1,9 +1,9 @@ package com.core.system.service; -import java.util.List; - import com.core.system.domain.SysExpression; +import java.util.List; + /** * 流程达式Service接口 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysListenerService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysListenerService.java index ee75aee6..c473f05f 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysListenerService.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysListenerService.java @@ -1,9 +1,9 @@ package com.core.system.service; -import java.util.List; - import com.core.system.domain.SysListener; +import java.util.List; + /** * 流程监听Service接口 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysLogininforService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysLogininforService.java index 99733a02..6ae7fb0b 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysLogininforService.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysLogininforService.java @@ -1,9 +1,9 @@ package com.core.system.service; -import java.util.List; - import com.core.system.domain.SysLogininfor; +import java.util.List; + /** * 系统访问日志情况信息 服务层 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysMenuService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysMenuService.java index 88ab5803..845119e1 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysMenuService.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysMenuService.java @@ -1,12 +1,12 @@ package com.core.system.service; -import java.util.List; -import java.util.Set; - import com.core.common.core.domain.TreeSelect; import com.core.common.core.domain.entity.SysMenu; import com.core.system.domain.vo.RouterVo; +import java.util.List; +import java.util.Set; + /** * 菜单 业务层 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysNoticeReadService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysNoticeReadService.java new file mode 100644 index 00000000..fbb6bf2d --- /dev/null +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysNoticeReadService.java @@ -0,0 +1,57 @@ +package com.core.system.service; + +import com.core.common.core.domain.AjaxResult; +import com.core.system.domain.SysNotice; + +import java.util.List; + +/** + * 公告/通知已读记录 服务层 + * + * @author system + */ +public interface ISysNoticeReadService { + + /** + * 查询用户的未读公告/通知数量 + * + * @param userId 用户ID + * @return 未读数量 + */ + public int getUnreadCount(Long userId); + + /** + * 标记公告/通知为已读 + * + * @param noticeId 公告/通知ID + * @param userId 用户ID + * @return 结果 + */ + public AjaxResult markAsRead(Long noticeId, Long userId); + + /** + * 批量标记公告/通知为已读 + * + * @param noticeIds 公告/通知ID列表 + * @param userId 用户ID + * @return 结果 + */ + public AjaxResult markAllAsRead(Long[] noticeIds, Long userId); + + /** + * 查询用户的已读公告/通知ID列表 + * + * @param userId 用户ID + * @return 已读公告/通知ID列表 + */ + public List selectReadNoticeIdsByUserId(Long userId); + + /** + * 查询带已读状态的公告列表 + * + * @param notice 公告信息 + * @param userId 用户ID + * @return 公告集合 + */ + public List selectNoticeListWithReadStatus(SysNotice notice, Long userId); +} diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysNoticeService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysNoticeService.java index 86147060..d2284f45 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysNoticeService.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysNoticeService.java @@ -1,9 +1,9 @@ package com.core.system.service; -import java.util.List; - import com.core.system.domain.SysNotice; +import java.util.List; + /** * 公告 服务层 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysOperLogService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysOperLogService.java index 8a778a05..236430f2 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysOperLogService.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysOperLogService.java @@ -1,9 +1,9 @@ package com.core.system.service; -import java.util.List; - import com.core.system.domain.SysOperLog; +import java.util.List; + /** * 操作日志 服务层 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysPostService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysPostService.java index bf77f062..e2d6d09c 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysPostService.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysPostService.java @@ -1,9 +1,9 @@ package com.core.system.service; -import java.util.List; - import com.core.system.domain.SysPost; +import java.util.List; + /** * 岗位信息 服务层 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysRoleService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysRoleService.java index cf6d36fc..216c6c44 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysRoleService.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysRoleService.java @@ -1,11 +1,11 @@ package com.core.system.service; -import java.util.List; -import java.util.Set; - import com.core.common.core.domain.entity.SysRole; import com.core.system.domain.SysUserRole; +import java.util.List; +import java.util.Set; + /** * 角色业务层 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysTenantOptionService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysTenantOptionService.java index 060fc923..cea900e8 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysTenantOptionService.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysTenantOptionService.java @@ -1,14 +1,14 @@ package com.core.system.service; -import java.util.List; -import java.util.Map; - import com.baomidou.mybatisplus.extension.service.IService; import com.core.common.core.domain.R; import com.core.system.domain.SysTenantOption; import com.core.system.domain.dto.SaveTenantOptionDetailDto; import com.core.system.domain.dto.TenantOptionDto; +import java.util.List; +import java.util.Map; + /** * 租户配置项表Service接口 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysTenantService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysTenantService.java index 552981f2..dd550f23 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysTenantService.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysTenantService.java @@ -1,13 +1,13 @@ package com.core.system.service; -import java.util.List; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.core.common.core.domain.R; import com.core.common.core.domain.entity.SysUser; import com.core.system.domain.SysTenant; +import java.util.List; + /** * 租户信息表Service接口 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysUserService.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysUserService.java index 574744fe..63eddbb6 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysUserService.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/ISysUserService.java @@ -1,13 +1,12 @@ package com.core.system.service; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.core.common.core.domain.entity.SysRole; import com.core.common.core.domain.entity.SysUser; import com.core.common.core.domain.model.LoginUserExtend; +import java.util.List; +import java.util.Map; + /** * 用户 业务层 * 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 e21f039b..024a0ecc 100644 --- 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 @@ -1,13 +1,5 @@ package com.core.system.service.impl; -import java.util.Collection; -import java.util.List; - -import javax.annotation.PostConstruct; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.core.common.annotation.DataSource; import com.core.common.constant.CacheConstants; import com.core.common.constant.UserConstants; @@ -19,6 +11,12 @@ import com.core.common.utils.StringUtils; import com.core.system.domain.SysConfig; import com.core.system.mapper.SysConfigMapper; import com.core.system.service.ISysConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.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/SysDeptServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysDeptServiceImpl.java index acda57e7..8f9365cf 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysDeptServiceImpl.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysDeptServiceImpl.java @@ -1,13 +1,5 @@ package com.core.system.service.impl; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.stream.Collectors; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.core.common.annotation.DataScope; import com.core.common.constant.UserConstants; import com.core.common.core.domain.TreeSelect; @@ -22,6 +14,13 @@ import com.core.common.utils.spring.SpringUtils; import com.core.system.mapper.SysDeptMapper; import com.core.system.mapper.SysRoleMapper; import com.core.system.service.ISysDeptService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.stream.Collectors; /** * 部门管理 服务实现 diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysDictDataServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysDictDataServiceImpl.java index 6683d60b..e83c6eb0 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysDictDataServiceImpl.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysDictDataServiceImpl.java @@ -1,15 +1,14 @@ package com.core.system.service.impl; -import java.util.List; - +import com.core.common.core.domain.entity.SysDictData; +import com.core.common.utils.ChineseConvertUtils; +import com.core.common.utils.DictUtils; +import com.core.system.mapper.SysDictDataMapper; +import com.core.system.service.ISysDictDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.core.common.core.domain.entity.SysDictData; -import com.core.common.utils.DictUtils; -import com.core.system.mapper.SysDictDataMapper; -import com.core.common.utils.ChineseConvertUtils; -import com.core.system.service.ISysDictDataService; +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 874e7ea7..b127c5dd 100644 --- 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 @@ -1,16 +1,5 @@ package com.core.system.service.impl; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import javax.annotation.PostConstruct; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.core.common.constant.UserConstants; import com.core.common.core.domain.entity.SysDictData; import com.core.common.core.domain.entity.SysDictType; @@ -20,6 +9,15 @@ import com.core.common.utils.StringUtils; import com.core.system.mapper.SysDictDataMapper; import com.core.system.mapper.SysDictTypeMapper; import com.core.system.service.ISysDictTypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.PostConstruct; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 字典 业务层处理 diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysExpressionServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysExpressionServiceImpl.java index 4d85f735..eb3eff77 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysExpressionServiceImpl.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysExpressionServiceImpl.java @@ -1,14 +1,13 @@ package com.core.system.service.impl; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.core.common.utils.DateUtils; import com.core.system.domain.SysExpression; import com.core.system.mapper.SysExpressionMapper; import com.core.system.service.ISysExpressionService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 流程达式Service业务层处理 diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysListenerServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysListenerServiceImpl.java index d90038ca..5d19b55b 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysListenerServiceImpl.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysListenerServiceImpl.java @@ -1,14 +1,13 @@ package com.core.system.service.impl; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.core.common.utils.DateUtils; import com.core.system.domain.SysListener; import com.core.system.mapper.SysListenerMapper; import com.core.system.service.ISysListenerService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 流程监听Service业务层处理 diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysLogininforServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysLogininforServiceImpl.java index d6bdfe15..4bfcefc9 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysLogininforServiceImpl.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysLogininforServiceImpl.java @@ -1,13 +1,12 @@ package com.core.system.service.impl; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.core.system.domain.SysLogininfor; import com.core.system.mapper.SysLogininforMapper; import com.core.system.service.ISysLogininforService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 系统访问日志情况信息 服务层处理 diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysMenuServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysMenuServiceImpl.java index 4730aa07..f4025cab 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysMenuServiceImpl.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysMenuServiceImpl.java @@ -1,12 +1,5 @@ package com.core.system.service.impl; -import java.util.*; -import java.util.stream.Collectors; - -import com.core.common.core.domain.R; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.core.common.constant.Constants; import com.core.common.constant.UserConstants; import com.core.common.core.domain.TreeSelect; @@ -21,6 +14,11 @@ import com.core.system.mapper.SysMenuMapper; import com.core.system.mapper.SysRoleMapper; import com.core.system.mapper.SysRoleMenuMapper; import com.core.system.service.ISysMenuService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; +import java.util.stream.Collectors; /** * 菜单 业务层处理 diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysNoticeReadServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysNoticeReadServiceImpl.java new file mode 100644 index 00000000..3004953b --- /dev/null +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysNoticeReadServiceImpl.java @@ -0,0 +1,129 @@ +package com.core.system.service.impl; + +import com.core.common.core.domain.AjaxResult; +import com.core.system.domain.SysNotice; +import com.core.system.domain.SysNoticeRead; +import com.core.system.mapper.SysNoticeMapper; +import com.core.system.mapper.SysNoticeReadMapper; +import com.core.system.service.ISysNoticeReadService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 公告/通知已读记录 服务层实现 + * + * @author system + */ +@Service +public class SysNoticeReadServiceImpl implements ISysNoticeReadService { + + @Autowired + private SysNoticeReadMapper noticeReadMapper; + + @Autowired + private SysNoticeMapper noticeMapper; + + /** + * 查询用户的未读公告/通知数量 + * + * @param userId 用户ID + * @return 未读数量 + */ + @Override + public int getUnreadCount(Long userId) { + // 查询所有状态为正常（0）的公告/通知 + SysNotice notice = new SysNotice(); + notice.setStatus("0"); + List allNotices = noticeMapper.selectNoticeList(notice); + + // 查询用户已读的公告/通知ID + List readNoticeIds = noticeReadMapper.selectReadNoticeIdsByUserId(userId); + + // 计算未读数量 + int unreadCount = 0; + for (SysNotice n : allNotices) { + if (!readNoticeIds.contains(n.getNoticeId())) { + unreadCount++; + } + } + + return unreadCount; + } + + /** + * 标记公告/通知为已读 + * + * @param noticeId 公告/通知ID + * @param userId 用户ID + * @return 结果 + */ + @Override + public AjaxResult markAsRead(Long noticeId, Long userId) { + // 检查是否已读 + boolean isRead = noticeReadMapper.checkNoticeRead(noticeId, userId); + if (isRead) { + return AjaxResult.success("已标记为已读"); + } + + // 插入已读记录 + SysNoticeRead noticeRead = new SysNoticeRead(); + noticeRead.setNoticeId(noticeId); + noticeRead.setUserId(userId); + + int result = noticeReadMapper.insertNoticeRead(noticeRead); + if (result > 0) { + return AjaxResult.success("标记成功"); + } + return AjaxResult.error("标记失败"); + } + + /** + * 批量标记公告/通知为已读 + * + * @param noticeIds 公告/通知ID列表 + * @param userId 用户ID + * @return 结果 + */ + @Override + public AjaxResult markAllAsRead(Long[] noticeIds, Long userId) { + int successCount = 0; + for (Long noticeId : noticeIds) { + boolean isRead = noticeReadMapper.checkNoticeRead(noticeId, userId); + if (!isRead) { + SysNoticeRead noticeRead = new SysNoticeRead(); + noticeRead.setNoticeId(noticeId); + noticeRead.setUserId(userId); + noticeReadMapper.insertNoticeRead(noticeRead); + successCount++; + } + } + return AjaxResult.success("成功标记" + successCount + "条记录为已读"); + } + + /** + * 查询用户的已读公告/通知ID列表 + * + * @param userId 用户ID + * @return 已读公告/通知ID列表 + */ + @Override + public List selectReadNoticeIdsByUserId(Long userId) { + return noticeReadMapper.selectReadNoticeIdsByUserId(userId); + } + + /** + * 查询带已读状态的公告列表 + * + * @param notice 公告信息 + * @param userId 用户ID + * @return 公告集合 + */ + @Override + public List selectNoticeListWithReadStatus(SysNotice notice, Long userId) { + // 这里可以扩展为在查询结果中添加已读状态标记 + // 暂时返回普通列表 + return noticeMapper.selectNoticeList(notice); + } +} diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysNoticeServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysNoticeServiceImpl.java index 72f9134b..2434fff9 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysNoticeServiceImpl.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysNoticeServiceImpl.java @@ -1,13 +1,12 @@ package com.core.system.service.impl; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.core.system.domain.SysNotice; import com.core.system.mapper.SysNoticeMapper; import com.core.system.service.ISysNoticeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 公告 服务层实现 diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysOperLogServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysOperLogServiceImpl.java index b69aa56b..4488acab 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysOperLogServiceImpl.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysOperLogServiceImpl.java @@ -1,13 +1,12 @@ package com.core.system.service.impl; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.core.system.domain.SysOperLog; import com.core.system.mapper.SysOperLogMapper; import com.core.system.service.ISysOperLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 操作日志 服务层处理 diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysPostServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysPostServiceImpl.java index d39f4165..92647b35 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysPostServiceImpl.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysPostServiceImpl.java @@ -1,10 +1,5 @@ package com.core.system.service.impl; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.core.common.constant.UserConstants; import com.core.common.exception.ServiceException; import com.core.common.utils.StringUtils; @@ -12,6 +7,10 @@ import com.core.system.domain.SysPost; import com.core.system.mapper.SysPostMapper; import com.core.system.mapper.SysUserPostMapper; import com.core.system.service.ISysPostService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 岗位信息 服务层处理 diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysRoleServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysRoleServiceImpl.java index c9333fb6..34b057f6 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysRoleServiceImpl.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysRoleServiceImpl.java @@ -1,11 +1,5 @@ package com.core.system.service.impl; -import java.util.*; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.core.common.annotation.DataScope; import com.core.common.constant.UserConstants; import com.core.common.core.domain.entity.SysRole; @@ -22,6 +16,11 @@ import com.core.system.mapper.SysRoleMapper; import com.core.system.mapper.SysRoleMenuMapper; import com.core.system.mapper.SysUserRoleMapper; import com.core.system.service.ISysRoleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; /** * 角色 业务层处理 diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysTenantOptionServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysTenantOptionServiceImpl.java index d29d704c..2d142435 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysTenantOptionServiceImpl.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysTenantOptionServiceImpl.java @@ -1,11 +1,5 @@ package com.core.system.service.impl; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.core.common.core.domain.R; @@ -15,6 +9,11 @@ import com.core.system.domain.dto.SaveTenantOptionDetailDto; import com.core.system.domain.dto.TenantOptionDto; import com.core.system.mapper.SysTenantOptionMapper; import com.core.system.service.ISysTenantOptionService; +import org.springframework.stereotype.Service; + +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; /** * 租户配置项表Service业务层处理 diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysTenantServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysTenantServiceImpl.java index e9b26bde..67a47bda 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysTenantServiceImpl.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysTenantServiceImpl.java @@ -1,14 +1,5 @@ package com.core.system.service.impl; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.stream.Collectors; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -29,6 +20,14 @@ import com.core.system.mapper.SysTenantMapper; import com.core.system.mapper.SysUserMapper; import com.core.system.mapper.SysUserTenantMapper; import com.core.system.service.ISysTenantService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; /** * 租户信息表Service业务层处理 diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysUserOnlineServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysUserOnlineServiceImpl.java index 04aa25fd..62645f1d 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysUserOnlineServiceImpl.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysUserOnlineServiceImpl.java @@ -1,11 +1,10 @@ package com.core.system.service.impl; -import org.springframework.stereotype.Service; - import com.core.common.core.domain.model.LoginUser; import com.core.common.utils.StringUtils; import com.core.system.domain.SysUserOnline; import com.core.system.service.ISysUserOnlineService; +import org.springframework.stereotype.Service; /** * 在线用户 服务层处理 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 74372424..967a33ac 100644 --- 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 @@ -1,19 +1,5 @@ package com.core.system.service.impl; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import javax.validation.Validator; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; - import com.core.common.annotation.DataScope; import com.core.common.constant.UserConstants; import com.core.common.core.domain.entity.SysRole; @@ -31,6 +17,18 @@ import com.core.system.mapper.*; import com.core.system.service.ISysConfigService; import com.core.system.service.ISysDeptService; import com.core.system.service.ISysUserService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import javax.validation.Validator; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 用户 业务层处理 diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysUserTenantServiceImpl.java b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysUserTenantServiceImpl.java index 376b8fc1..3e4ff94f 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysUserTenantServiceImpl.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysUserTenantServiceImpl.java @@ -1,11 +1,10 @@ package com.core.system.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.core.system.domain.SysUserTenant; import com.core.system.mapper.SysUserTenantMapper; import com.core.system.service.ISysUserTenantService; +import org.springframework.stereotype.Service; /** * 用户租户绑定表Service业务层处理 diff --git a/openhis-server-new/core-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysNoticeMapper.xml index e18284ef..a4da59b2 100644 --- a/openhis-server-new/core-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/openhis-server-new/core-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -10,6 +10,8 @@ + + @@ -21,8 +23,10 @@ select notice_id, notice_title, notice_type, - cast(notice_content as char) as notice_content, + convert_from(notice_content, 'UTF8') as notice_content, status, + publish_status, + priority, create_by, create_time, update_by, @@ -48,23 +52,34 @@ AND create_by like concat('%', #{createBy}, '%') + + AND status = #{status} + + + AND publish_status = #{publishStatus} + + order by create_time desc insert into sys_notice ( + notice_id, notice_title, notice_type, notice_content, status, + priority, remark, create_by, create_time )values( + (SELECT COALESCE(MAX(notice_id), 0) + 1 FROM sys_notice), #{noticeTitle}, #{noticeType}, - #{noticeContent}, + cast(#{noticeContent} as bytea), #{status}, + #{priority}, #{remark}, #{createBy}, now() @@ -76,8 +91,10 @@ notice_title = #{noticeTitle}, notice_type = #{noticeType}, - notice_content = #{noticeContent}, + notice_content = cast(#{noticeContent} as bytea), status = #{status}, + publish_status = #{publishStatus}, + priority = #{priority}, update_by = #{updateBy}, update_time = now() diff --git a/openhis-server-new/core-system/src/main/resources/mapper/system/SysNoticeReadMapper.xml b/openhis-server-new/core-system/src/main/resources/mapper/system/SysNoticeReadMapper.xml new file mode 100644 index 00000000..e7ea7683 --- /dev/null +++ b/openhis-server-new/core-system/src/main/resources/mapper/system/SysNoticeReadMapper.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + insert into sys_notice_read ( + read_id, + notice_id, + user_id, + read_time + ) values ( + (SELECT COALESCE(MAX(read_id), 0) + 1 FROM sys_notice_read), + #{noticeId}, + #{userId}, + now() + ) + + + + delete from sys_notice_read where read_id = #{readId} + + + + delete from sys_notice_read where read_id in + + #{readId} + + + + diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/OpenHisApplication.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/OpenHisApplication.java index 92084baf..9ddc3714 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/OpenHisApplication.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/OpenHisApplication.java @@ -1,9 +1,6 @@ package com.openhis; -import java.net.InetAddress; -import java.net.UnknownHostException; - -import com.alibaba.fastjson2.JSONObject; +import com.openhis.web.ybmanage.config.YbServiceConfig; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; @@ -12,8 +9,8 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.env.Environment; import org.springframework.scheduling.annotation.EnableAsync; -import com.openhis.web.ybmanage.config.YbServiceConfig; -import com.openhis.administration.domain.Instrument; +import java.net.InetAddress; +import java.net.UnknownHostException; /** * 启动程序 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/config/HttpConfig.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/config/HttpConfig.java index 1765fd1d..b4d2ecbf 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/config/HttpConfig.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/config/HttpConfig.java @@ -1,8 +1,6 @@ package com.openhis.config; import lombok.Data; -import lombok.Getter; -import lombok.Setter; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.PropertySource; import org.springframework.stereotype.Component; 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 09e797f8..407bc296 100644 --- 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 @@ -1,14 +1,5 @@ package com.openhis.quartz.controller; -import java.util.List; - -import javax.servlet.http.HttpServletResponse; - -import org.quartz.SchedulerException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - import com.core.common.annotation.Log; import com.core.common.constant.Constants; import com.core.common.core.controller.BaseController; @@ -22,6 +13,13 @@ import com.core.quartz.domain.SysJob; import com.core.quartz.util.CronUtils; import com.openhis.quartz.service.ISysJobService; import com.openhis.quartz.util.ScheduleUtils; +import org.quartz.SchedulerException; +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 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 d4886a54..b6657175 100644 --- 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 @@ -1,13 +1,5 @@ package com.openhis.quartz.controller; -import java.util.List; - -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - import com.core.common.annotation.Log; import com.core.common.core.controller.BaseController; import com.core.common.core.domain.AjaxResult; @@ -16,6 +8,12 @@ import com.core.common.enums.BusinessType; import com.core.common.utils.poi.ExcelUtil; import com.core.quartz.domain.SysJobLog; import com.openhis.quartz.service.ISysJobLogService; +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 java.util.List; /** * 调度日志操作处理 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobLogService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobLogService.java index fd60d906..8a01512d 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobLogService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobLogService.java @@ -1,9 +1,9 @@ package com.openhis.quartz.service; -import java.util.List; - import com.core.quartz.domain.SysJobLog; +import java.util.List; + /** * 定时任务调度日志信息信息 服务层 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobService.java index d54359c4..b95a201d 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/ISysJobService.java @@ -1,11 +1,10 @@ package com.openhis.quartz.service; -import java.util.List; - -import org.quartz.SchedulerException; - import com.core.common.exception.job.TaskException; import com.core.quartz.domain.SysJob; +import org.quartz.SchedulerException; + +import java.util.List; /** * 定时任务调度信息信息 服务层 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobLogServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobLogServiceImpl.java index 65cddcf8..af8bb676 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobLogServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/service/impl/SysJobLogServiceImpl.java @@ -1,13 +1,12 @@ package com.openhis.quartz.service.impl; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.core.quartz.domain.SysJobLog; import com.core.quartz.mapper.SysJobLogMapper; import com.openhis.quartz.service.ISysJobLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +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 30fcd39b..6b19a109 100644 --- 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 @@ -1,17 +1,5 @@ package com.openhis.quartz.service.impl; -import java.util.List; - -import javax.annotation.PostConstruct; - -import org.quartz.JobDataMap; -import org.quartz.JobKey; -import org.quartz.Scheduler; -import org.quartz.SchedulerException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.core.common.constant.ScheduleConstants; import com.core.common.exception.job.TaskException; import com.core.quartz.domain.SysJob; @@ -19,6 +7,16 @@ import com.core.quartz.mapper.SysJobMapper; import com.core.quartz.util.CronUtils; import com.openhis.quartz.service.ISysJobService; import com.openhis.quartz.util.ScheduleUtils; +import org.quartz.JobDataMap; +import org.quartz.JobKey; +import org.quartz.Scheduler; +import org.quartz.SchedulerException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.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 34031c2a..9503dfca 100644 --- 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 @@ -3,14 +3,12 @@ */ package com.openhis.quartz.task; -import javax.annotation.Resource; - -import org.springframework.stereotype.Component; - import com.core.framework.config.TenantContext; import com.openhis.web.inhospitalnursestation.appservice.IEncounterAutoRollAppService; - import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; /** * 自动滚方定时任务（每日执行） diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/ExampleTask.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/ExampleTask.java index b50ecb95..a425cfb1 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/ExampleTask.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/task/ExampleTask.java @@ -1,13 +1,11 @@ package com.openhis.quartz.task; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - import com.core.common.core.domain.R; import com.core.common.utils.DateUtils; import com.openhis.web.basedatamanage.appservice.IOrganizationAppService; - import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; /** * 定时任务例子 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 219fb4ce..0dbee9b0 100644 --- 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 @@ -3,16 +3,6 @@ */ package com.openhis.quartz.task; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.atomic.AtomicBoolean; - -import javax.annotation.Resource; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.enums.DelFlag; @@ -25,8 +15,15 @@ import com.openhis.document.service.IDocInventoryItemStaticService; import com.openhis.web.inventorymanage.appservice.IProductDetailAppService; import com.openhis.web.inventorymanage.dto.ProductDetailPageDto; import com.openhis.web.inventorymanage.dto.ProductDetailSearchParam; - import lombok.extern.slf4j.Slf4j; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.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 caed4d7f..a1963e57 100644 --- 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 @@ -1,15 +1,13 @@ package com.openhis.quartz.task; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Component; - import com.core.common.utils.StringUtils; import com.core.framework.config.TenantContext; import com.openhis.administration.domain.Location; import com.openhis.administration.service.ILocationService; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.List; /** * 定时任务调度测试 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/AbstractQuartzJob.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/AbstractQuartzJob.java index 47903160..793af2d6 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/AbstractQuartzJob.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/AbstractQuartzJob.java @@ -1,13 +1,5 @@ package com.openhis.quartz.util; -import java.util.Date; - -import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.core.common.constant.Constants; import com.core.common.constant.ScheduleConstants; import com.core.common.utils.ExceptionUtil; @@ -17,6 +9,13 @@ import com.core.common.utils.spring.SpringUtils; import com.core.quartz.domain.SysJob; import com.core.quartz.domain.SysJobLog; import com.openhis.quartz.service.ISysJobLogService; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Date; /** * 抽象quartz调用 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/QuartzDisallowConcurrentExecution.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/QuartzDisallowConcurrentExecution.java index 3f606dfa..cfda80a5 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/QuartzDisallowConcurrentExecution.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/QuartzDisallowConcurrentExecution.java @@ -1,10 +1,9 @@ package com.openhis.quartz.util; -import org.quartz.DisallowConcurrentExecution; -import org.quartz.JobExecutionContext; - import com.core.quartz.domain.SysJob; import com.core.quartz.util.JobInvokeUtil; +import org.quartz.DisallowConcurrentExecution; +import org.quartz.JobExecutionContext; /** * 定时任务处理（禁止并发执行） diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/QuartzJobExecution.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/QuartzJobExecution.java index df899b24..f47ac8cf 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/QuartzJobExecution.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/QuartzJobExecution.java @@ -1,9 +1,8 @@ package com.openhis.quartz.util; -import org.quartz.JobExecutionContext; - import com.core.quartz.domain.SysJob; import com.core.quartz.util.JobInvokeUtil; +import org.quartz.JobExecutionContext; /** * 定时任务处理（允许并发执行） diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/ScheduleUtils.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/ScheduleUtils.java index 446bf92d..f1897a3e 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/ScheduleUtils.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/quartz/util/ScheduleUtils.java @@ -1,7 +1,5 @@ package com.openhis.quartz.util; -import org.quartz.*; - import com.core.common.constant.Constants; import com.core.common.constant.ScheduleConstants; import com.core.common.exception.job.TaskException; @@ -10,6 +8,7 @@ import com.core.common.utils.StringUtils; import com.core.common.utils.spring.SpringUtils; import com.core.quartz.domain.SysJob; import com.core.quartz.util.CronUtils; +import org.quartz.*; /** * 定时任务工具类 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/ACmp.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/ACmp.java index e30d628a..c1c853b8 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/ACmp.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/ACmp.java @@ -1,8 +1,7 @@ package com.openhis.rule.component; -import org.springframework.stereotype.Component; - import com.yomahub.liteflow.core.NodeComponent; +import org.springframework.stereotype.Component; @Component("a") public class ACmp extends NodeComponent { diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/BCmp.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/BCmp.java index 5314fa6f..d0aca2e8 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/BCmp.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/BCmp.java @@ -1,8 +1,7 @@ package com.openhis.rule.component; -import org.springframework.stereotype.Component; - import com.yomahub.liteflow.core.NodeComponent; +import org.springframework.stereotype.Component; @Component("b") public class BCmp extends NodeComponent { diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/CCmp.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/CCmp.java index 21551d2f..93518197 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/CCmp.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/rule/component/CCmp.java @@ -1,8 +1,7 @@ package com.openhis.rule.component; -import org.springframework.stereotype.Component; - import com.yomahub.liteflow.core.NodeComponent; +import org.springframework.stereotype.Component; @Component("c") public class CCmp extends NodeComponent { 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 087b7f07..fbec9a98 100644 --- 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 @@ -1,7 +1,6 @@ package com.openhis.web.Inspection.appservice; import com.core.common.core.domain.R; -import com.openhis.administration.domain.Device; import com.openhis.administration.domain.Instrument; import com.openhis.web.Inspection.dto.InstrumentSelParam; 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 0c342838..7b4074fb 100644 --- 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 @@ -2,8 +2,6 @@ package com.openhis.web.Inspection.appservice; import com.core.common.core.domain.R; import com.openhis.web.Inspection.dto.ReportResultManageDto; -import com.openhis.web.Inspection.dto.SampleCollectManageDto; -import com.openhis.web.Inspection.dto.SampleCollectStatusRequest; import javax.servlet.http.HttpServletRequest; 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 41b85420..cb0ee4fc 100644 --- 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 @@ -28,13 +28,11 @@ import com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto; import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam; import com.openhis.web.datadictionary.mapper.ActivityDefinitionManageMapper; import lombok.RequiredArgsConstructor; -import lombok.val; import org.springframework.stereotype.Service; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.Arrays; -import java.util.Date; 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 c876c052..5ba9923d 100644 --- 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 @@ -4,7 +4,7 @@ package com.openhis.web.Inspection.appservice.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; - +import com.core.common.enums.DelFlag; import com.core.common.utils.MessageUtils; import com.core.common.utils.bean.BeanUtils; import com.openhis.administration.domain.ObservationDefinition; @@ -12,7 +12,6 @@ import com.openhis.administration.mapper.ObservationDefinitionMapper; import com.openhis.administration.service.IInstrumentService; import com.openhis.administration.service.IObservationDefinitionService; import com.openhis.common.constant.PromptMsgConstant; -import com.core.common.enums.DelFlag; import com.openhis.common.enums.ObservationType; import com.openhis.common.enums.PublicationStatus; import com.openhis.common.utils.EnumUtils; @@ -22,8 +21,6 @@ import com.openhis.web.Inspection.appservice.IObservationManageAppService; import com.openhis.web.Inspection.dto.ObservationDefManageDto; import com.openhis.web.Inspection.dto.ObservationDefManageInitDto; import com.openhis.web.Inspection.dto.ObservationDefSelParam; - - import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; 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 c8480bf4..f78009ec 100644 --- 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 @@ -1,8 +1,8 @@ package com.openhis.web.Inspection.controller; import com.core.common.core.domain.R; -import com.openhis.administration.domain.Instrument; import com.core.common.enums.DelFlag; +import com.openhis.administration.domain.Instrument; import com.openhis.common.enums.PublicationStatus; import com.openhis.web.Inspection.appservice.IInstrumentManageAppService; import com.openhis.web.Inspection.dto.InstrumentSelParam; 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 d9742611..11294e9d 100644 --- 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 @@ -3,7 +3,6 @@ package com.openhis.web.Inspection.controller; import com.core.common.core.domain.R; import com.openhis.web.Inspection.appservice.ILaboratoryManageAppService; import com.openhis.web.Inspection.dto.ReportResultManageDto; -import com.openhis.web.Inspection.dto.SampleCollectManageDto; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; 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 fe2eb274..92dc6890 100644 --- 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 @@ -1,8 +1,8 @@ package com.openhis.web.Inspection.controller; import com.core.common.core.domain.R; -import com.openhis.administration.domain.ObservationDefinition; import com.core.common.enums.DelFlag; +import com.openhis.administration.domain.ObservationDefinition; import com.openhis.common.enums.PublicationStatus; import com.openhis.web.Inspection.appservice.IObservationManageAppService; import com.openhis.web.Inspection.dto.ObservationDefSelParam; @@ -11,6 +11,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; + import javax.servlet.http.HttpServletRequest; /** 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 3f286cc4..51185cc7 100644 --- 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 @@ -1,7 +1,6 @@ package com.openhis.web.Inspection.controller; import com.core.common.core.domain.R; -import com.openhis.common.enums.PublicationStatus; import com.openhis.web.Inspection.appservice.ISampleCollectAppManageAppService; import com.openhis.web.Inspection.dto.SampleCollectManageDto; import com.openhis.web.Inspection.dto.SampleCollectStatusRequest; 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 0bb303dd..c676bebc 100644 --- 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 @@ -1,8 +1,8 @@ package com.openhis.web.Inspection.controller; import com.core.common.core.domain.R; -import com.openhis.administration.domain.SpecimenDefinition; import com.core.common.enums.DelFlag; +import com.openhis.administration.domain.SpecimenDefinition; import com.openhis.common.enums.PublicationStatus; import com.openhis.web.Inspection.appservice.ISpecimenManageAppService; import com.openhis.web.Inspection.dto.SpecimenDefSelParam; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageDto.java index 0031565f..7a720caa 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageDto.java @@ -1,16 +1,15 @@ package com.openhis.web.Inspection.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * @Description 分页返回 * @Author diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageInitDto.java index a3832f71..1aaef7a0 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageInitDto.java @@ -3,7 +3,6 @@ package com.openhis.web.Inspection.dto; import lombok.Data; import lombok.experimental.Accessors; -import java.util.ArrayList; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/LisConfigManageInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/LisConfigManageInitDto.java index fad81023..d597daa1 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/LisConfigManageInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/LisConfigManageInitDto.java @@ -1,11 +1,8 @@ package com.openhis.web.Inspection.dto; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.openhis.administration.domain.DeviceDefinition; import com.openhis.administration.domain.ObservationDefinition; import com.openhis.administration.domain.SpecimenDefinition; -import com.openhis.web.datadictionary.dto.DeviceManageDto; -import com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ReportResultManageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ReportResultManageDto.java index ffdb0c8e..02378857 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ReportResultManageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/ReportResultManageDto.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; -import java.util.Date; - /** * @Description TODO * @Author diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SampleCollectManageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SampleCollectManageDto.java index cdf0b020..f189c075 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SampleCollectManageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/SampleCollectManageDto.java @@ -1,14 +1,11 @@ package com.openhis.web.Inspection.dto; -import com.core.common.core.domain.entity.SysMenu; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; -import java.util.ArrayList; import java.util.Date; -import java.util.List; /** * @Description TODO 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 7e9f733b..660d6b1c 100644 --- 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 @@ -1,13 +1,12 @@ package com.openhis.web.adjustprice.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - 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 java.util.List; + /** * Desc: 调价业务接口 * 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 36c8daae..35d4f488 100644 --- 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 @@ -1,16 +1,5 @@ package com.openhis.web.adjustprice.appservice.impl; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; @@ -44,6 +33,15 @@ import com.openhis.workflow.dto.ActivityDto; import com.openhis.workflow.dto.AdjustPriceDto; import com.openhis.workflow.service.IActivityDefinitionService; 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 java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; /** * @ClassName AdjustPriceServiceImpl 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 f1ec5561..8b61442b 100644 --- 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 @@ -1,17 +1,15 @@ package com.openhis.web.adjustprice.controller; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.core.common.utils.StringUtils; import com.openhis.web.adjustprice.appservice.IAdjustPriceService; 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 java.util.List; /** * @ClassName ChangePriceListPageController diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/AdjustPriceDataVo.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/AdjustPriceDataVo.java index 70ad133b..2c632ec0 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/AdjustPriceDataVo.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/AdjustPriceDataVo.java @@ -1,9 +1,9 @@ package com.openhis.web.adjustprice.dto; -import java.math.BigDecimal; - import lombok.Data; +import java.math.BigDecimal; + /** * @ClassName AdjustPriceDataVo * @Description TODO diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/AdjustPriceManagerSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/AdjustPriceManagerSearchParam.java index b90c1a6e..6735637a 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/AdjustPriceManagerSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/AdjustPriceManagerSearchParam.java @@ -1,12 +1,12 @@ package com.openhis.web.adjustprice.dto; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; + /** * @ClassName AdjustPriceManagerSearchParam * @Description 改价管理 查询条件 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/ChangePriceDataDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/ChangePriceDataDto.java index a2db0277..410234c7 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/ChangePriceDataDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/ChangePriceDataDto.java @@ -1,13 +1,12 @@ package com.openhis.web.adjustprice.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; +import java.math.BigDecimal; +import java.util.Date; + /** * @ClassName ChangePricePageDto * @Description TODO diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/ChangePricePageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/ChangePricePageDto.java index a6c24741..59c3e797 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/ChangePricePageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/ChangePricePageDto.java @@ -1,14 +1,12 @@ package com.openhis.web.adjustprice.dto; -import java.math.BigDecimal; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.fasterxml.jackson.annotation.JsonFormat; import com.openhis.common.annotation.Dict; - import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; /** * @ClassName ChangePricePageDto diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/mapper/AdjustPriceMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/mapper/AdjustPriceMapper.java index c295cdb7..3cae0122 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/mapper/AdjustPriceMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/mapper/AdjustPriceMapper.java @@ -1,15 +1,14 @@ package com.openhis.web.adjustprice.mapper; -import com.openhis.web.adjustprice.dto.ChangePriceDataDto; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Component; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.openhis.web.adjustprice.dto.ChangePriceDataDto; import com.openhis.web.adjustprice.dto.ChangePricePageDto; import com.openhis.web.inventorymanage.dto.InventorySearchParam; import com.openhis.web.inventorymanage.dto.ReceiptPageDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Component; import java.util.List; 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 7bd52d94..53e81c6a 100644 --- 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 @@ -2,7 +2,6 @@ package com.openhis.web.appointmentmanage.controller; import com.core.common.core.domain.R; -import com.openhis.appointmentmanage.domain.SchedulePool; import com.openhis.web.appointmentmanage.appservice.ISchedulePoolAppService; import com.openhis.web.appointmentmanage.dto.SchedulePoolDto; import org.springframework.web.bind.annotation.RequestBody; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/SchedulePoolDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/SchedulePoolDto.java index 90012ce0..9834331b 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/SchedulePoolDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/SchedulePoolDto.java @@ -1,8 +1,6 @@ package com.openhis.web.appointmentmanage.dto; -import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import lombok.experimental.Accessors; import java.time.LocalDate; import java.time.LocalDateTime; 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 859b02a1..760d853b 100644 --- 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 @@ -1,11 +1,10 @@ package com.openhis.web.basedatamanage.appservice; -import javax.servlet.http.HttpServletRequest; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.openhis.web.basedatamanage.dto.BodyStructureDto; -import com.openhis.web.basedatamanage.dto.OrganizationDto; + +import javax.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 9a0c96a2..010a1b3a 100644 --- 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 @@ -1,12 +1,10 @@ package com.openhis.web.basedatamanage.appservice; -import javax.servlet.http.HttpServletRequest; - import com.core.common.core.domain.R; import com.openhis.web.basedatamanage.dto.LocationAddOrEditDto; import com.openhis.web.basedatamanage.dto.LocationPageParam; -import com.openhis.web.common.dto.LocationDto; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** 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 c8a5d535..094d9023 100644 --- 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 @@ -1,11 +1,11 @@ package com.openhis.web.basedatamanage.appservice; -import javax.servlet.http.HttpServletRequest; - 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; + /** * Organization 应该服务类 */ @@ -15,11 +15,16 @@ public interface IOrganizationAppService { * * @param pageNo 当前页码 * @param pageSize 查询条数 + * @param name 科室名称 + * @param typeEnum 科室类型 + * @param classEnum 科室分类 + * @param sortField 排序字段 + * @param sortOrder 排序方向 * @param request 请求数据 * @return 机构树分页列表 */ - Page getOrganizationTree(Integer pageNo, Integer pageSize, String sortField, String sortOrder, - HttpServletRequest request); + Page getOrganizationTree(Integer pageNo, Integer pageSize, String name, Integer typeEnum, Integer classEnum, + String sortField, String sortOrder, HttpServletRequest request); /** * 机构信息详情 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 1671482f..c493a643 100644 --- 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 @@ -1,11 +1,11 @@ package com.openhis.web.basedatamanage.appservice; -import javax.servlet.http.HttpServletRequest; - 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; + /** * 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 e9cdde54..0e16e8cb 100644 --- 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 @@ -1,11 +1,11 @@ package com.openhis.web.basedatamanage.appservice; -import javax.servlet.http.HttpServletRequest; - 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; + /** * 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 f620478e..f80828df 100644 --- 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 @@ -1,14 +1,5 @@ package com.openhis.web.basedatamanage.appservice.impl; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -24,6 +15,13 @@ import com.openhis.common.enums.PublicationStatus; import com.openhis.common.utils.EnumUtils; import com.openhis.web.basedatamanage.appservice.IBodyStructureAppService; 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 java.util.*; +import java.util.stream.Collectors; @Service public class BodyStructureAppServiceImpl implements IBodyStructureAppService { 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 4019864e..039b0849 100644 --- 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 @@ -1,14 +1,5 @@ package com.openhis.web.basedatamanage.appservice.impl; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -30,6 +21,13 @@ import com.openhis.common.utils.HisQueryUtils; import com.openhis.web.basedatamanage.appservice.ILocationAppService; import com.openhis.web.basedatamanage.dto.*; 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 java.util.*; +import java.util.stream.Collectors; @Service public class LocationAppServiceImpl implements ILocationAppService { 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 9414c8e5..257d5400 100644 --- 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 @@ -1,15 +1,6 @@ package com.openhis.web.basedatamanage.appservice.impl; -import java.lang.reflect.Field; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; @@ -27,6 +18,14 @@ import com.openhis.common.enums.OrganizationType; import com.openhis.common.utils.EnumUtils; import com.openhis.web.basedatamanage.appservice.IOrganizationAppService; 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 java.lang.reflect.Field; +import java.util.*; +import java.util.stream.Collectors; import static com.baomidou.mybatisplus.core.toolkit.StringUtils.camelToUnderline; @@ -40,24 +39,27 @@ public class OrganizationAppServiceImpl implements IOrganizationAppService { private AssignSeqUtil assignSeqUtil; @Override - public Page getOrganizationTree(Integer pageNo, Integer pageSize, String sortField, - String sortOrder, HttpServletRequest request) { - // 查询机构列表 + public Page getOrganizationTree(Integer pageNo, Integer pageSize, String name, Integer typeEnum, Integer classEnum, + String sortField, String sortOrder, HttpServletRequest request) { + // 创建查询条件 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + // 添加查询条件 + if (StringUtils.isNotEmpty(name)) { + queryWrapper.like(Organization::getName, name); + } + if (typeEnum != null) { + queryWrapper.eq(Organization::getTypeEnum, typeEnum); + } + if (classEnum != null) { + queryWrapper.eq(Organization::getClassEnum, classEnum); + } + // 创建Page对象 Page page = new Page<>(pageNo, pageSize); - // 处理动态排序（仅当排序字段有效时才添加排序条件） - if (sortField != null && !sortField.isEmpty()) { - // 校验排序字段是否为Organization实体中的有效字段（防止非法字段） - if (isValidField(Organization.class, sortField)) { - // 驼峰转下划线处理 - String underlineField = camelToUnderline(sortField); - // 默认为升序，若指定desc则按降序 - boolean isAsc = sortOrder == null || "asc".equalsIgnoreCase(sortOrder); - page.addOrder(isAsc ? OrderItem.asc(underlineField) : OrderItem.desc(underlineField)); - } - } - // 执行分页查询（此时排序条件会被应用） - page = organizationService.page(page); + + // 执行分页查询 + page = organizationService.page(page, queryWrapper); List organizationList = page.getRecords(); // 将机构列表转为树结构 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 b7ccd7b0..3f1c1553 100644 --- 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 @@ -1,18 +1,5 @@ package com.openhis.web.basedatamanage.appservice.impl; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import javax.servlet.http.HttpServletRequest; - -import com.openhis.common.constant.CommonConstants; -import com.openhis.common.utils.DateTimeUtils; -import com.openhis.workflow.mapper.ActivityDefinitionMapper; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; @@ -24,15 +11,26 @@ import com.openhis.administration.mapper.OrganizationLocationMapper; import com.openhis.administration.service.ILocationService; import com.openhis.administration.service.IOrganizationLocationService; import com.openhis.administration.service.IOrganizationService; +import com.openhis.common.constant.CommonConstants; import com.openhis.common.constant.PromptMsgConstant; import com.openhis.common.enums.LocationForm; import com.openhis.common.enums.OrganizationType; +import com.openhis.common.utils.DateTimeUtils; import com.openhis.common.utils.HisPageUtils; import com.openhis.common.utils.HisQueryUtils; import com.openhis.web.basedatamanage.appservice.IOrganizationLocationAppService; import com.openhis.web.basedatamanage.dto.OrgLocInitDto; import com.openhis.web.basedatamanage.dto.OrgLocQueryDto; import com.openhis.web.basedatamanage.dto.OrgLocQueryParam; +import com.openhis.workflow.mapper.ActivityDefinitionMapper; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; @Service public class OrganizationLocationAppServiceImpl implements IOrganizationLocationAppService { 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 edb56b88..3c576fab 100644 --- 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 @@ -1,14 +1,5 @@ package com.openhis.web.basedatamanage.appservice.impl; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -39,6 +30,13 @@ import com.openhis.web.basedatamanage.dto.PractitionerRolesDto; import com.openhis.web.basedatamanage.dto.SelectableOrgDto; import com.openhis.web.basedatamanage.dto.UserAndPractitionerDto; import com.openhis.web.basedatamanage.mapper.PractitionerAppAppMapper; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.stream.Collectors; @Service public class PractitionerAppServiceImpl implements IPractitionerAppService { 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 4c7a9205..01966e0b 100644 --- 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 @@ -1,14 +1,5 @@ package com.openhis.web.basedatamanage.appservice.impl; -import java.util.Arrays; -import java.util.HashSet; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; @@ -22,6 +13,13 @@ import com.openhis.common.utils.HisQueryUtils; import com.openhis.web.basedatamanage.appservice.IPractitionerRoleAppService; import com.openhis.web.basedatamanage.dto.PractRoleSearchParam; import com.openhis.web.basedatamanage.dto.PractitionerRoleDto; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletRequest; +import java.util.Arrays; +import java.util.HashSet; @Service public class PractitionerRoleAppServiceImpl implements IPractitionerRoleAppService { 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 8ba0f608..d308b062 100644 --- 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 @@ -3,20 +3,18 @@ */ package com.openhis.web.basedatamanage.controller; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.MessageUtils; import com.openhis.common.constant.PromptMsgConstant; import com.openhis.web.basedatamanage.appservice.IBodyStructureAppService; import com.openhis.web.basedatamanage.dto.BodyStructureDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.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 3d2ed964..3f17d520 100644 --- 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 @@ -10,11 +10,7 @@ import com.core.common.utils.MessageUtils; import com.openhis.administration.domain.Frequency; import com.openhis.administration.service.IFrequencyService; import com.openhis.common.constant.PromptMsgConstant; -import com.openhis.web.basedatamanage.appservice.IOrganizationAppService; import com.openhis.web.basedatamanage.dto.FrequencyDto; -import com.openhis.web.basedatamanage.dto.OrgLocQueryDto; -import com.openhis.web.basedatamanage.dto.OrganizationDto; -import com.openhis.web.basedatamanage.dto.OrganizationInitDto; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; 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 3ad9df17..81fbe45c 100644 --- 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 @@ -3,22 +3,18 @@ */ package com.openhis.web.basedatamanage.controller; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import com.openhis.web.common.dto.LocationDto; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.basedatamanage.appservice.ILocationAppService; import com.openhis.web.basedatamanage.dto.LocationAddOrEditDto; import com.openhis.web.basedatamanage.dto.LocationPageParam; - import lombok.AllArgsConstructor; 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 java.util.List; /** * 位置管理Controller业务层处理 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 a53fa793..6f2be234 100644 --- 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 @@ -3,11 +3,6 @@ */ package com.openhis.web.basedatamanage.controller; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.MessageUtils; @@ -15,9 +10,12 @@ import com.openhis.common.constant.PromptMsgConstant; import com.openhis.web.basedatamanage.appservice.IOrganizationAppService; import com.openhis.web.basedatamanage.dto.OrganizationDto; import com.openhis.web.basedatamanage.dto.OrganizationInitDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; /** * 机构管理controller @@ -43,15 +41,24 @@ public class OrganizationController { * * @param pageNo 当前页码 * @param pageSize 查询条数 + * @param name 科室名称 + * @param typeEnum 科室类型 + * @param classEnum 科室分类 + * @param sortField 排序字段 + * @param sortOrder 排序方向 + * @param request 请求对象 * @return 机构分页列表 */ @GetMapping(value = "/organization") public R getOrganizationPage(@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(value = "pageSize", defaultValue = "100") Integer pageSize, + @RequestParam(value = "name", required = false) String name, + @RequestParam(value = "typeEnum", required = false) Integer typeEnum, + @RequestParam(value = "classEnum", required = false) Integer classEnum, @RequestParam(value = "sortField", required = false) String sortField, @RequestParam(value = "sortOrder", required = false) String sortOrder, HttpServletRequest request) { Page organizationTree = - iOrganizationAppService.getOrganizationTree(pageNo, pageSize, sortField, sortOrder, request); + iOrganizationAppService.getOrganizationTree(pageNo, pageSize, name, typeEnum, classEnum, sortField, sortOrder, request); return R.ok(organizationTree, MessageUtils.createMessage(PromptMsgConstant.Common.M00009, new Object[] {"机构信息"})); } 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 db77f5de..e1329d05 100644 --- 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 @@ -3,19 +3,17 @@ */ package com.openhis.web.basedatamanage.controller; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.basedatamanage.appservice.IOrganizationLocationAppService; import com.openhis.web.basedatamanage.dto.OrgLocQueryDto; import com.openhis.web.basedatamanage.dto.OrgLocQueryParam; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; /** * 机构位置关系controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerController.java index ab8792bc..1df22754 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/PractitionerController.java @@ -3,15 +3,13 @@ */ package com.openhis.web.basedatamanage.controller; -import org.springframework.web.bind.annotation.*; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.core.common.core.domain.R; import com.openhis.web.basedatamanage.appservice.IPractitionerAppService; import com.openhis.web.basedatamanage.dto.UserAndPractitionerDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; /** * 参与者 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 08607452..14b63c5d 100644 --- 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 @@ -3,19 +3,17 @@ */ package com.openhis.web.basedatamanage.controller; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.basedatamanage.appservice.IPractitionerRoleAppService; import com.openhis.web.basedatamanage.dto.PractRoleSearchParam; import com.openhis.web.basedatamanage.dto.PractitionerRoleDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; /** * 岗位管理Controller业务层处理 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/BodyStructureDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/BodyStructureDto.java index e49eefae..fee592da 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/BodyStructureDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/BodyStructureDto.java @@ -3,15 +3,14 @@ */ package com.openhis.web.basedatamanage.dto; -import java.util.ArrayList; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.ArrayList; +import java.util.List; + /** * @author liuhr * @date 2025-07-23 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 f6adc4e2..50448acd 100644 --- 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 @@ -5,11 +5,9 @@ package com.openhis.web.basedatamanage.dto; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; - import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; /** 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 e5cdacbf..c08c8101 100644 --- 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 @@ -3,17 +3,15 @@ */ package com.openhis.web.basedatamanage.dto; -import java.util.ArrayList; -import java.util.List; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +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 com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - -import lombok.Data; -import lombok.experimental.Accessors; +import java.util.ArrayList; +import java.util.List; /** * @author diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInfoDto.java index d4039825..bd52fee8 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInfoDto.java @@ -6,7 +6,6 @@ package com.openhis.web.basedatamanage.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInitDto.java index 2f9a8782..c49ea3da 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationInitDto.java @@ -3,11 +3,11 @@ */ package com.openhis.web.basedatamanage.dto; -import java.util.List; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 位置信息初始化dto * 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 023545b7..150065e3 100644 --- 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 @@ -3,13 +3,12 @@ */ package com.openhis.web.basedatamanage.dto; -import java.util.List; - -import javax.validation.constraints.NotEmpty; - import lombok.Data; import lombok.experimental.Accessors; +import javax.validation.constraints.NotEmpty; +import java.util.List; + /** * 位置信息分页查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocInitDto.java index bb16f2db..99979806 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocInitDto.java @@ -3,14 +3,13 @@ */ package com.openhis.web.basedatamanage.dto; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 科室位置关系初始化 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryDto.java index bf920c43..8d858302 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryDto.java @@ -3,15 +3,14 @@ */ package com.openhis.web.basedatamanage.dto; -import java.sql.Time; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.sql.Time; + /** * @author * @date 2025-02-21 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryParam.java index 45bb88a0..54012639 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryParam.java @@ -3,11 +3,11 @@ */ package com.openhis.web.basedatamanage.dto; -import java.io.Serializable; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * 科室分页查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationDto.java index dc2fd0d5..8a2f8bcd 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationDto.java @@ -3,15 +3,14 @@ */ package com.openhis.web.basedatamanage.dto; -import java.util.ArrayList; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.openhis.common.enums.OrganizationClass; - import lombok.Data; import lombok.experimental.Accessors; +import lombok.ToString; + +import java.util.ArrayList; +import java.util.List; /** * @author @@ -59,6 +58,7 @@ public class OrganizationDto { private Integer displayOrder; /** 子集合 */ + @ToString.Exclude private List children = new ArrayList<>(); /** 挂号科室标记 */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationInitDto.java index d7a76971..95d6871c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationInitDto.java @@ -3,14 +3,13 @@ */ package com.openhis.web.basedatamanage.dto; -import java.util.List; - import com.openhis.common.enums.OrganizationClass; import com.openhis.common.enums.OrganizationType; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 科室初始化 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractRoleSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractRoleSearchParam.java index 033422e3..0c795217 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractRoleSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractRoleSearchParam.java @@ -3,11 +3,11 @@ */ package com.openhis.web.basedatamanage.dto; -import java.io.Serializable; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * 岗位分页查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractSearchParam.java index b4374f5e..0e2ed7c4 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractSearchParam.java @@ -3,11 +3,11 @@ */ package com.openhis.web.basedatamanage.dto; -import java.io.Serializable; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * 员工分页查询条件 * 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 3cb8820a..356c8f45 100644 --- 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 @@ -3,16 +3,14 @@ */ package com.openhis.web.basedatamanage.dto; -import java.util.Date; - -import javax.validation.constraints.NotBlank; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import javax.validation.constraints.NotBlank; +import java.util.Date; + /** * @author * @date 2025-02-21 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerOrgAndLocationDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerOrgAndLocationDto.java index c3057f78..057c41ac 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerOrgAndLocationDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerOrgAndLocationDto.java @@ -3,7 +3,6 @@ package com.openhis.web.basedatamanage.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; 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 f4a32c82..ae71044e 100644 --- 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 @@ -3,15 +3,14 @@ */ package com.openhis.web.basedatamanage.dto; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; 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; + /** * @author * @date 2025-02-21 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRolesDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRolesDto.java index bb70bb01..1a87bd87 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRolesDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/PractitionerRolesDto.java @@ -2,7 +2,6 @@ package com.openhis.web.basedatamanage.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/SelectableOrgDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/SelectableOrgDto.java index 5aff6dde..b8175a0e 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/SelectableOrgDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/SelectableOrgDto.java @@ -5,7 +5,6 @@ package com.openhis.web.basedatamanage.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/UserAndPractitionerDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/UserAndPractitionerDto.java index 23fbd246..f3baf023 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/UserAndPractitionerDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/UserAndPractitionerDto.java @@ -1,15 +1,14 @@ package com.openhis.web.basedatamanage.dto; -import java.util.Date; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; +import java.util.List; + /** * 用户 及 参与者 dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/mapper/PractitionerAppAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/mapper/PractitionerAppAppMapper.java index 0f295904..3245fea5 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/mapper/PractitionerAppAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/mapper/PractitionerAppAppMapper.java @@ -1,18 +1,17 @@ package com.openhis.web.basedatamanage.mapper; -import java.util.List; - -import com.openhis.web.basedatamanage.dto.SelectableOrgDto; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.basedatamanage.dto.PractitionerOrgAndLocationDto; import com.openhis.web.basedatamanage.dto.PractitionerRolesDto; +import com.openhis.web.basedatamanage.dto.SelectableOrgDto; import com.openhis.web.basedatamanage.dto.UserAndPractitionerDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 参与者 应用Mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/controller/OutpatientNoSegmentController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/controller/OutpatientNoSegmentController.java index ac0e61c7..00b1201c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/controller/OutpatientNoSegmentController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicmanage/controller/OutpatientNoSegmentController.java @@ -11,8 +11,6 @@ import com.openhis.administration.service.IOutpatientNoSegmentService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.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 c2383746..54f41994 100644 --- 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 @@ -3,18 +3,6 @@ */ package com.openhis.web.basicservice.controller; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -32,7 +20,6 @@ import com.openhis.administration.service.IHealthcareServiceService; import com.openhis.common.constant.CommonConstants; import com.openhis.common.constant.PromptMsgConstant; import com.openhis.common.enums.AccountStatus; -import com.openhis.common.enums.AssignSeqEnum; import com.openhis.common.enums.PublicationStatus; import com.openhis.common.enums.Whether; import com.openhis.common.utils.EnumUtils; @@ -40,9 +27,18 @@ import com.openhis.common.utils.HisQueryUtils; import com.openhis.web.basicservice.dto.*; import com.openhis.web.basicservice.mapper.HealthcareServiceBizMapper; import com.openhis.yb.service.YbManager; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 服务管理 controller 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 ad4913b2..eeb19574 100644 --- 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 @@ -1,6 +1,5 @@ package com.openhis.web.basicservice.dto; -import com.openhis.common.enums.PublicationStatus; import lombok.Data; import javax.validation.constraints.NotBlank; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceDto.java index e624ca08..ba10bcbf 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceDto.java @@ -1,14 +1,13 @@ package com.openhis.web.basicservice.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 服务管理 Dto */ 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 b5e9bd23..682a880d 100644 --- 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 @@ -1,9 +1,9 @@ package com.openhis.web.basicservice.dto; -import javax.validation.constraints.NotBlank; - import lombok.Data; +import javax.validation.constraints.NotBlank; + /** * 服务项目管理表单数据 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/mapper/HealthcareServiceBizMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/mapper/HealthcareServiceBizMapper.java index 99983ba8..1e014764 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/mapper/HealthcareServiceBizMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basicservice/mapper/HealthcareServiceBizMapper.java @@ -1,13 +1,12 @@ package com.openhis.web.basicservice.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.basicservice.dto.HealthcareServiceDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; /** * 服务管理 自定义Mapper 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 261efaa1..6c40f269 100644 --- 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 @@ -3,11 +3,7 @@ */ package com.openhis.web.catalogmanage.appservice; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; -import com.openhis.ybcatalog.domain.CatalogZySyndrome; import javax.servlet.http.HttpServletRequest; 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 5c3ec3d4..060033e4 100644 --- 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 @@ -3,21 +3,19 @@ */ package com.openhis.web.catalogmanage.controller; -import javax.servlet.http.HttpServletRequest; - +import com.core.common.annotation.Anonymous; +import com.core.common.core.domain.R; +import com.openhis.web.catalogmanage.appservice.ICatalogService; +import com.openhis.web.ybmanage.config.YbServiceConfig; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.core.common.annotation.Anonymous; -import com.core.common.core.domain.R; -import com.openhis.web.catalogmanage.appservice.ICatalogService; -import com.openhis.web.ybmanage.config.YbServiceConfig; - -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; /** * 医保目录 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/PatientCardRenewalController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/PatientCardRenewalController.java index 125f05b8..18e9d9a1 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/PatientCardRenewalController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/PatientCardRenewalController.java @@ -1,14 +1,13 @@ package com.openhis.web.charge.patientcardrenewal; +import com.core.common.core.domain.R; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.core.common.core.domain.R; -import lombok.extern.slf4j.Slf4j; - /** * 患者换卡控制器 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/PatientCardRenewalServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/PatientCardRenewalServiceImpl.java index ec6f6e1a..0ba7517d 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/PatientCardRenewalServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/charge/patientcardrenewal/PatientCardRenewalServiceImpl.java @@ -1,17 +1,14 @@ package com.openhis.web.charge.patientcardrenewal; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.openhis.administration.domain.PatientIdentifier; +import com.openhis.administration.service.IPatientIdentifierService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; -import com.openhis.administration.domain.PatientIdentifier; -import com.openhis.administration.service.IPatientIdentifierService; -import com.openhis.common.enums.IdentifierStatusEnum; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; - -import lombok.extern.slf4j.Slf4j; - import java.util.List; /** 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 dfb0d24c..830f7735 100644 --- 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 @@ -3,14 +3,13 @@ */ package com.openhis.web.chargemanage.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - 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 java.util.List; + /** * 门诊收费 service * 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 c5880b52..5d9c9eeb 100644 --- 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 @@ -3,14 +3,13 @@ */ package com.openhis.web.chargemanage.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - 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 java.util.List; + /** * 门诊收费 service * 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 d5a5defe..f5c80ec2 100644 --- 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 @@ -3,12 +3,12 @@ */ package com.openhis.web.chargemanage.appservice; -import javax.servlet.http.HttpServletRequest; - 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; + /** * 门诊划价 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 9ed70df6..e9c081dc 100644 --- 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 @@ -3,14 +3,13 @@ */ package com.openhis.web.chargemanage.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - 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 java.util.List; + /** * 门诊退费 service * 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 0497e04e..528c24d0 100644 --- 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 @@ -1,15 +1,17 @@ package com.openhis.web.chargemanage.appservice; -import java.util.List; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.openhis.web.basicservice.dto.HealthcareServiceDto; -import com.openhis.web.chargemanage.dto.*; +import com.openhis.web.chargemanage.dto.CurrentDayEncounterDto; +import com.openhis.web.chargemanage.dto.OrgMetadata; +import com.openhis.web.chargemanage.dto.PatientMetadata; +import com.openhis.web.chargemanage.dto.PractitionerMetadata; import com.openhis.web.paymentmanage.dto.CancelRegPaymentDto; import javax.servlet.http.HttpServletRequest; +import java.util.List; /** * 门诊挂号 应用Service 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 30108c02..d7e61b22 100644 --- 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 @@ -3,16 +3,6 @@ */ package com.openhis.web.chargemanage.appservice.impl; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; @@ -31,6 +21,14 @@ import com.openhis.web.chargemanage.dto.EncounterPatientPageParam; import com.openhis.web.chargemanage.dto.EncounterPatientPrescriptionDto; import com.openhis.web.chargemanage.dto.OutpatientInitDto; 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 java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; /** * 门诊收费 impl 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 420feab4..dc5b52a7 100644 --- 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 @@ -3,19 +3,6 @@ */ package com.openhis.web.chargemanage.appservice.impl; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.text.DecimalFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; @@ -38,6 +25,17 @@ import com.openhis.web.chargemanage.dto.EncounterPatientPageParam; import com.openhis.web.chargemanage.dto.EncounterPatientPrescriptionDto; import com.openhis.web.chargemanage.dto.OutpatientInitDto; 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 java.math.BigDecimal; +import java.math.RoundingMode; +import java.text.DecimalFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; /** * 门诊收费 impl 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 7cab7228..75880ced 100644 --- 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 @@ -3,11 +3,6 @@ */ package com.openhis.web.chargemanage.appservice.impl; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.openhis.common.enums.Whether; import com.openhis.web.chargemanage.appservice.IOutpatientPricingAppService; @@ -16,7 +11,10 @@ import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService; import com.openhis.web.doctorstation.appservice.IDoctorStationMainAppService; 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 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 f59c11b4..362e0c52 100644 --- 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 @@ -3,15 +3,6 @@ */ package com.openhis.web.chargemanage.appservice.impl; -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -43,6 +34,13 @@ import com.openhis.workflow.domain.ServiceRequest; import com.openhis.workflow.service.IDeviceDispenseService; 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 java.math.BigDecimal; +import java.util.*; +import java.util.stream.Collectors; /** * 门诊退费 impl 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 c1f57927..2eba0576 100644 --- 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 @@ -1,17 +1,5 @@ package com.openhis.web.chargemanage.appservice.impl; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import com.core.common.core.domain.model.LoginUser; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -45,6 +33,15 @@ import com.openhis.web.paymentmanage.dto.CancelPaymentDto; import com.openhis.web.paymentmanage.dto.CancelRegPaymentDto; 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 java.util.ArrayList; +import java.util.Arrays; +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/chargemanage/controller/InpatientChargeController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/InpatientChargeController.java index fb34b157..aa0d3e38 100644 --- 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 @@ -3,17 +3,15 @@ */ package com.openhis.web.chargemanage.controller; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.chargemanage.appservice.IInpatientChargeAppService; import com.openhis.web.chargemanage.dto.EncounterPatientPageParam; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.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 302c0950..9bc34b65 100644 --- 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 @@ -3,17 +3,15 @@ */ package com.openhis.web.chargemanage.controller; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.chargemanage.appservice.IOutpatientChargeAppService; import com.openhis.web.chargemanage.dto.EncounterPatientPageParam; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.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 0b11a63d..a9dc09c3 100644 --- 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 @@ -1,19 +1,17 @@ package com.openhis.web.chargemanage.controller; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - import com.core.common.core.domain.R; import com.openhis.web.chargemanage.appservice.IOutpatientPricingAppService; import com.openhis.web.doctorstation.dto.AdviceBaseDto; import com.openhis.web.doctorstation.dto.PatientInfoDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +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; /** * 门诊划价 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 eb751a9c..474e9ea4 100644 --- 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 @@ -3,21 +3,17 @@ */ package com.openhis.web.chargemanage.controller; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.chargemanage.appservice.IOutpatientRefundAppService; import com.openhis.web.chargemanage.dto.EncounterPatientPageParam; import com.openhis.web.chargemanage.dto.RefundItemParam; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; /** * 门诊退费 controller 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 d2f72db4..7733a7f9 100644 --- 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 @@ -3,15 +3,6 @@ */ package com.openhis.web.chargemanage.controller; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.common.enums.PriorityLevel; import com.openhis.financial.domain.PaymentReconciliation; @@ -19,9 +10,15 @@ import com.openhis.web.chargemanage.appservice.IOutpatientRegistrationAppService import com.openhis.web.chargemanage.dto.OutpatientRegistrationInitDto; import com.openhis.web.paymentmanage.appservice.IEleInvoiceService; import com.openhis.web.paymentmanage.dto.CancelRegPaymentDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 门诊挂号 controller 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 1c44341e..c33d75d1 100644 --- 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 @@ -1,18 +1,16 @@ package com.openhis.web.chargemanage.dto; -import java.math.BigDecimal; - -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.constant.CommonConstants; import com.openhis.common.enums.AccountBillingStatus; import com.openhis.common.enums.AccountStatus; - import lombok.Data; import lombok.experimental.Accessors; +import javax.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 70ecae7f..1d2e9c6f 100644 --- 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 @@ -1,21 +1,18 @@ package com.openhis.web.chargemanage.dto; -import java.math.BigDecimal; -import java.util.Date; - -import javax.validation.constraints.NotNull; - import com.core.common.utils.SecurityUtils; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.constant.CommonConstants; import com.openhis.common.enums.ChargeItemContext; import com.openhis.common.enums.ChargeItemStatus; -import com.openhis.common.enums.EncounterClass; - import lombok.Data; import lombok.experimental.Accessors; +import javax.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/CurrentDayEncounterDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java index 092445ae..6936eb87 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java @@ -1,14 +1,13 @@ package com.openhis.web.chargemanage.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +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 ef1b92a4..21166617 100644 --- 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 @@ -2,7 +2,6 @@ package com.openhis.web.chargemanage.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; 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 3c234236..c75000fd 100644 --- 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 @@ -1,14 +1,13 @@ package com.openhis.web.chargemanage.dto; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.enums.*; - import lombok.Data; import lombok.experimental.Accessors; +import javax.validation.constraints.NotNull; + /** * 就诊 表单数据 */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterLocationFormData.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterLocationFormData.java index 1af32042..5ae3dd85 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterLocationFormData.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterLocationFormData.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.enums.EncounterActivityStatus; import com.openhis.common.enums.LocationForm; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterParticipantFormData.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterParticipantFormData.java index cae3c7e4..b88f7dad 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterParticipantFormData.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterParticipantFormData.java @@ -3,7 +3,6 @@ package com.openhis.web.chargemanage.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.enums.ParticipantType; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageDto.java index cb894e0c..eafeae80 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageDto.java @@ -3,17 +3,15 @@ */ package com.openhis.web.chargemanage.dto; -import java.math.BigDecimal; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; /** * 就诊患者分页dto diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageParam.java index 734cd4ac..00b16daf 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPageParam.java @@ -3,11 +3,11 @@ */ package com.openhis.web.chargemanage.dto; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 就诊患者分页查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPaymentDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPaymentDto.java index 6a1e7680..9c647452 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPaymentDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPaymentDto.java @@ -3,18 +3,17 @@ */ package com.openhis.web.chargemanage.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 就诊患者账单 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPrescriptionDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPrescriptionDto.java index 380f3291..8debe787 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPrescriptionDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPrescriptionDto.java @@ -3,16 +3,15 @@ */ package com.openhis.web.chargemanage.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 就诊患者处方 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientRefundDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientRefundDto.java index c074d5a6..f4b596af 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientRefundDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientRefundDto.java @@ -3,19 +3,18 @@ */ package com.openhis.web.chargemanage.dto; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import com.openhis.yb.dto.PaymentDetailDto; import lombok.Data; import lombok.experimental.Accessors; +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/chargemanage/dto/OutpatientPricingInventoryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientPricingInventoryDto.java index e347501f..a85472b2 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientPricingInventoryDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientPricingInventoryDto.java @@ -1,14 +1,13 @@ package com.openhis.web.chargemanage.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 门诊划价库存 dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientPricingPriceDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientPricingPriceDto.java index 1daaab5b..f150b26a 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientPricingPriceDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientPricingPriceDto.java @@ -1,14 +1,13 @@ package com.openhis.web.chargemanage.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 门诊划价价格 dto */ 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 26eb6dd7..56850ac5 100644 --- 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 @@ -1,14 +1,12 @@ package com.openhis.web.chargemanage.dto; -import java.util.List; - -import javax.validation.Valid; - import com.openhis.yb.dto.Info5301SpecialConditionResult; - import lombok.Data; import lombok.experimental.Accessors; +import javax.validation.Valid; +import java.util.List; + /** * 门诊挂号 新增参数 */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationSettleParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationSettleParam.java index 78bc2dd5..85285360 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationSettleParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationSettleParam.java @@ -1,12 +1,11 @@ package com.openhis.web.chargemanage.dto; -import java.util.List; - import com.openhis.yb.dto.PaymentDetailDto; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + @Data @Accessors(chain = true) public class OutpatientRegistrationSettleParam { diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PractitionerMetadata.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PractitionerMetadata.java index c48ab73f..fb50dc34 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PractitionerMetadata.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/PractitionerMetadata.java @@ -2,7 +2,6 @@ package com.openhis.web.chargemanage.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemDto.java index 6c32b4bb..ade0312b 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemDto.java @@ -3,15 +3,14 @@ */ package com.openhis.web.chargemanage.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 退款项目 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/InpatientChargeAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/InpatientChargeAppMapper.java index 7638b5ea..fc5e4639 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/InpatientChargeAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/InpatientChargeAppMapper.java @@ -3,17 +3,16 @@ */ package com.openhis.web.chargemanage.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.chargemanage.dto.EncounterPatientPageDto; import com.openhis.web.chargemanage.dto.EncounterPatientPageParam; import com.openhis.web.chargemanage.dto.EncounterPatientPrescriptionDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 门诊收费 appMapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientChargeAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientChargeAppMapper.java index 086607cc..3718c47a 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientChargeAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientChargeAppMapper.java @@ -3,17 +3,16 @@ */ package com.openhis.web.chargemanage.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.chargemanage.dto.EncounterPatientPageDto; import com.openhis.web.chargemanage.dto.EncounterPatientPageParam; import com.openhis.web.chargemanage.dto.EncounterPatientPrescriptionDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 门诊收费 appMapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRefundAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRefundAppMapper.java index 3de5c0d3..2f9bb411 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRefundAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRefundAppMapper.java @@ -3,15 +3,14 @@ */ package com.openhis.web.chargemanage.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.chargemanage.dto.*; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 门诊退费 appMapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRegistrationAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRegistrationAppMapper.java index 684ea5a3..ba648028 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRegistrationAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRegistrationAppMapper.java @@ -1,10 +1,5 @@ package com.openhis.web.chargemanage.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; @@ -12,6 +7,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.chargemanage.dto.CurrentDayEncounterDto; import com.openhis.web.chargemanage.dto.PractitionerMetadata; import com.openhis.web.personalization.dto.ActivityDeviceDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 门诊挂号 应用Mapper 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 0c550274..37582307 100644 --- 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 @@ -3,7 +3,6 @@ package com.openhis.web.check.appservice; import com.core.common.core.domain.R; import com.openhis.check.domain.CheckMethod; -import io.swagger.models.auth.In; import javax.servlet.http.HttpServletResponse; 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 5bb45338..6eb7f4cb 100644 --- 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 @@ -1,9 +1,9 @@ package com.openhis.web.check.controller; import com.core.common.core.domain.R; +import com.openhis.check.domain.LisGroupInfo; import com.openhis.web.check.appservice.ILisGroupInfoAppService; import org.springframework.web.bind.annotation.*; -import com.openhis.check.domain.LisGroupInfo; import javax.annotation.Resource; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/ISurgeryAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/ISurgeryAppService.java new file mode 100644 index 00000000..affd14f0 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/ISurgeryAppService.java @@ -0,0 +1,65 @@ +package com.openhis.web.clinicalmanage.appservice; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.core.common.core.domain.R; +import com.openhis.web.clinicalmanage.dto.SurgeryDto; + +/** + * 手术管理应用Service接口 + * + * @author system + * @date 2025-12-30 + */ +public interface ISurgeryAppService { + + /** + * 分页查询手术列表 + * + * @param surgeryDto 查询条件 + * @param pageNo 当前页 + * @param pageSize 每页条数 + * @return 手术列表 + */ + IPage getSurgeryPage(SurgeryDto surgeryDto, Integer pageNo, Integer pageSize); + + /** + * 根据ID查询手术详情 + * + * @param id 手术ID + * @return 手术详情 + */ + R getSurgeryDetail(Long id); + + /** + * 新增手术信息 + * + * @param surgeryDto 手术信息 + * @return 结果 + */ + R addSurgery(SurgeryDto surgeryDto); + + /** + * 修改手术信息 + * + * @param surgeryDto 手术信息 + * @return 结果 + */ + R updateSurgery(SurgeryDto surgeryDto); + + /** + * 删除手术信息 + * + * @param id 手术ID + * @return 结果 + */ + R deleteSurgery(Long id); + + /** + * 更新手术状态 + * + * @param id 手术ID + * @param statusEnum 状态 + * @return 结果 + */ + R updateSurgeryStatus(Long id, Integer statusEnum); +} 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 new file mode 100644 index 00000000..292929e1 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java @@ -0,0 +1,166 @@ +package com.openhis.web.clinicalmanage.appservice.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.core.common.core.domain.R; +import com.core.common.utils.MessageUtils; +import com.openhis.administration.domain.Patient; +import com.openhis.administration.service.IPatientService; +import com.openhis.common.constant.PromptMsgConstant; +import com.openhis.clinical.domain.Surgery; +import com.openhis.clinical.service.ISurgeryService; +import com.openhis.common.utils.HisQueryUtils; +import com.openhis.web.clinicalmanage.appservice.ISurgeryAppService; +import com.openhis.web.clinicalmanage.dto.SurgeryDto; +import com.openhis.web.clinicalmanage.mapper.SurgeryAppMapper; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.HashSet; + +/** + * 手术管理应用Service业务层处理 + * + * @author system + * @date 2025-12-30 + */ +@Service +public class SurgeryAppServiceImpl implements ISurgeryAppService { + + @Resource + private SurgeryAppMapper surgeryAppMapper; + + @Resource + private ISurgeryService surgeryService; + + @Resource + private IPatientService patientService; + + /** + * 分页查询手术列表 + * + * @param surgeryDto 查询条件 + * @param pageNo 当前页 + * @param pageSize 每页条数 + * @return 手术列表 + */ + @Override + public IPage getSurgeryPage(SurgeryDto surgeryDto, Integer pageNo, Integer pageSize) { + QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(surgeryDto, null, + new HashSet() {{ + add("surgery_no"); + add("surgery_name"); + add("patient_name"); + add("main_surgeon_name"); + add("anesthetist_name"); + add("org_name"); + }}, null); + queryWrapper.orderByDesc("create_time"); + return surgeryAppMapper.getSurgeryPage(new Page<>(pageNo, pageSize), queryWrapper); + } + + /** + * 根据ID查询手术详情 + * + * @param id 手术ID + * @return 手术详情 + */ + @Override + public R getSurgeryDetail(Long id) { + SurgeryDto surgeryDto = surgeryAppMapper.getSurgeryDetail(id); + if (surgeryDto == null) { + return R.fail("手术信息不存在"); + } + return R.ok(surgeryDto); + } + + /** + * 新增手术信息 + * + * @param surgeryDto 手术信息 + * @return 结果 + */ + @Override + public R addSurgery(SurgeryDto surgeryDto) { + // 校验患者是否存在 + Patient patient = patientService.getById(surgeryDto.getPatientId()); + if (patient == null) { + return R.fail("患者信息不存在"); + } + + // 转换为实体对象 + Surgery surgery = new Surgery(); + BeanUtils.copyProperties(surgeryDto, surgery); + + Long surgeryId = surgeryService.insertSurgery(surgery); + return R.ok(surgeryId, MessageUtils.createMessage(PromptMsgConstant.Common.M00001, new Object[]{"手术信息"})); + } + + /** + * 修改手术信息 + * + * @param surgeryDto 手术信息 + * @return 结果 + */ + @Override + public R updateSurgery(SurgeryDto surgeryDto) { + // 校验手术是否存在 + Surgery existSurgery = surgeryService.getById(surgeryDto.getId()); + if (existSurgery == null) { + return R.fail("手术信息不存在"); + } + + // 转换为实体对象 + Surgery surgery = new Surgery(); + BeanUtils.copyProperties(surgeryDto, surgery); + + surgeryService.updateSurgery(surgery); + return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[]{"手术信息"})); + } + + /** + * 删除手术信息 + * + * @param id 手术ID + * @return 结果 + */ + @Override + public R deleteSurgery(Long id) { + // 校验手术是否存在 + Surgery existSurgery = surgeryService.getById(id); + if (existSurgery == null) { + return R.fail("手术信息不存在"); + } + + // 已完成的手术不能删除 + if (existSurgery.getStatusEnum() == 3) { + return R.fail("已完成的手术不能删除"); + } + + surgeryService.deleteSurgery(id); + return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00005, new Object[]{"手术信息"})); + } + + /** + * 更新手术状态 + * + * @param id 手术ID + * @param statusEnum 状态 + * @return 结果 + */ + @Override + public R updateSurgeryStatus(Long id, Integer statusEnum) { + // 校验手术是否存在 + Surgery existSurgery = surgeryService.getById(id); + if (existSurgery == null) { + return R.fail("手术信息不存在"); + } + + surgeryService.updateSurgeryStatus(id, statusEnum); + return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[]{"手术状态"})); + } +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/controller/SurgeryController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/controller/SurgeryController.java new file mode 100644 index 00000000..ea935d39 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/controller/SurgeryController.java @@ -0,0 +1,96 @@ +package com.openhis.web.clinicalmanage.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.core.common.core.domain.R; +import com.openhis.web.clinicalmanage.appservice.ISurgeryAppService; +import com.openhis.web.clinicalmanage.dto.SurgeryDto; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +/** + * 手术管理Controller业务层处理 + * + * @author system + * @date 2025-12-30 + */ +@RestController +@RequestMapping("/clinical-manage/surgery") +@Slf4j +@AllArgsConstructor +public class SurgeryController { + + private final ISurgeryAppService surgeryAppService; + + /** + * 分页查询手术列表 + * + * @param surgeryDto 查询条件 + * @param pageNo 当前页 + * @param pageSize 每页条数 + * @return 手术列表 + */ + @GetMapping(value = "/surgery-page") + public R> getSurgeryPage(SurgeryDto surgeryDto, + @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { + IPage page = surgeryAppService.getSurgeryPage(surgeryDto, pageNo, pageSize); + return R.ok(page); + } + + /** + * 根据ID查询手术详情 + * + * @param id 手术ID + * @return 手术详情 + */ + @GetMapping(value = "/surgery-detail") + public R getSurgeryDetail(@RequestParam Long id) { + return surgeryAppService.getSurgeryDetail(id); + } + + /** + * 新增手术信息 + * + * @param surgeryDto 手术信息 + * @return 结果 + */ + @PostMapping(value = "/surgery") + public R addSurgery(@RequestBody SurgeryDto surgeryDto) { + return surgeryAppService.addSurgery(surgeryDto); + } + + /** + * 修改手术信息 + * + * @param surgeryDto 手术信息 + * @return 结果 + */ + @PutMapping(value = "/surgery") + public R updateSurgery(@RequestBody SurgeryDto surgeryDto) { + return surgeryAppService.updateSurgery(surgeryDto); + } + + /** + * 删除手术信息 + * + * @param id 手术ID + * @return 结果 + */ + @DeleteMapping(value = "/surgery") + public R deleteSurgery(@RequestParam Long id) { + return surgeryAppService.deleteSurgery(id); + } + + /** + * 更新手术状态 + * + * @param id 手术ID + * @param statusEnum 状态 + * @return 结果 + */ + @PutMapping(value = "/surgery-status") + public R updateSurgeryStatus(@RequestParam Long id, @RequestParam Integer statusEnum) { + return surgeryAppService.updateSurgeryStatus(id, statusEnum); + } +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/SurgeryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/SurgeryDto.java new file mode 100644 index 00000000..5455885c --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/SurgeryDto.java @@ -0,0 +1,175 @@ +package com.openhis.web.clinicalmanage.dto; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.openhis.common.annotation.Dict; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 手术管理DTO + */ +@Data +@Accessors(chain = true) +public class SurgeryDto { + + /** ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** 手术编号 */ + private String surgeryNo; + + /** 患者ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long patientId; + + /** 患者姓名 */ + private String patientName; + + /** 患者性别 */ + private String patientGender; + + /** 患者年龄 */ + private String patientAge; + + /** 就诊ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long encounterId; + + /** 就诊流水号 */ + private String encounterNo; + + /** 手术名称 */ + private String surgeryName; + + /** 手术编码 */ + private String surgeryCode; + + /** 手术类型编码 */ + @Dict(dictCode = "surgery_type") + private Integer surgeryTypeEnum; + private String surgeryTypeEnum_dictText; + + /** 手术等级 */ + @Dict(dictCode = "surgery_level") + private Integer surgeryLevel; + private String surgeryLevel_dictText; + + /** 手术状态 */ + @Dict(dictCode = "surgery_status") + private Integer statusEnum; + private String statusEnum_dictText; + + /** 计划手术时间 */ + private Date plannedTime; + + /** 实际开始时间 */ + private Date actualStartTime; + + /** 实际结束时间 */ + private Date actualEndTime; + + /** 主刀医生ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long mainSurgeonId; + + /** 主刀医生姓名 */ + private String mainSurgeonName; + + /** 助手1 ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long assistant1Id; + + /** 助手1 姓名 */ + private String assistant1Name; + + /** 助手2 ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long assistant2Id; + + /** 助手2 姓名 */ + private String assistant2Name; + + /** 麻醉医生ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long anesthetistId; + + /** 麻醉医生姓名 */ + private String anesthetistName; + + /** 巡回护士ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long scrubNurseId; + + /** 巡回护士姓名 */ + private String scrubNurseName; + + /** 麻醉方式编码 */ + @Dict(dictCode = "anesthesia_type") + private Integer anesthesiaTypeEnum; + private String anesthesiaTypeEnum_dictText; + + /** 手术部位 */ + private String bodySite; + + /** 手术切口等级 */ + @Dict(dictCode = "incision_level") + private Integer incisionLevel; + private String incisionLevel_dictText; + + /** 手术切口愈合等级 */ + @Dict(dictCode = "healing_level") + private Integer healingLevel; + private String healingLevel_dictText; + + /** 手术室 */ + @JsonSerialize(using = ToStringSerializer.class) + private Long operatingRoomId; + + /** 手术室名称 */ + private String operatingRoomName; + + /** 执行科室ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long orgId; + + /** 执行科室名称 */ + private String orgName; + + /** 术前诊断 */ + private String preoperativeDiagnosis; + + /** 术后诊断 */ + private String postoperativeDiagnosis; + + /** 手术经过描述 */ + private String surgeryDescription; + + /** 术后医嘱 */ + private String postoperativeAdvice; + + /** 并发症描述 */ + private String complications; + + /** 手术费用 */ + private BigDecimal surgeryFee; + + /** 麻醉费用 */ + private BigDecimal anesthesiaFee; + + /** 总费用 */ + private BigDecimal totalFee; + + /** 备注信息 */ + private String remark; + + /** 创建时间 */ + private Date createTime; + + /** 更新时间 */ + private Date updateTime; +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/mapper/SurgeryAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/mapper/SurgeryAppMapper.java new file mode 100644 index 00000000..7ac808ed --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/mapper/SurgeryAppMapper.java @@ -0,0 +1,34 @@ +package com.openhis.web.clinicalmanage.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.openhis.web.clinicalmanage.dto.SurgeryDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +/** + * 手术管理应用Mapper + */ +@Repository +public interface SurgeryAppMapper { + + /** + * 分页查询手术列表 + * + * @param page 分页参数 + * @param queryWrapper 查询条件 + * @return 手术列表 + */ + IPage getSurgeryPage(@Param("page") Page page, + @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + /** + * 根据ID查询手术详情 + * + * @param id 手术ID + * @return 手术详情 + */ + SurgeryDto getSurgeryDetail(@Param("id") Long id); +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/ICommonService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/ICommonService.java index 0f59b19d..d812c3c1 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/ICommonService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/ICommonService.java @@ -3,14 +3,14 @@ */ package com.openhis.web.common.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.administration.domain.Organization; import com.openhis.web.common.dto.InventoryItemParam; import com.openhis.web.common.dto.LocationDto; import com.openhis.web.common.dto.SearchTraceNoParam; +import java.util.List; + /** * app常用接口 * 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 0d0e6933..29521d9c 100644 --- 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 @@ -3,16 +3,6 @@ */ package com.openhis.web.common.appservice.impl; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -52,6 +42,13 @@ import com.openhis.workflow.domain.DeviceDispense; import com.openhis.workflow.domain.InventoryItem; import com.openhis.workflow.service.IDeviceDispenseService; import com.openhis.workflow.service.IInventoryItemService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.*; +import java.util.stream.Collectors; /** * app常用接口 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 17f524df..1fd3b92c 100644 --- 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 @@ -3,23 +3,20 @@ */ package com.openhis.web.common.controller; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - import com.core.common.core.domain.R; import com.openhis.web.common.appservice.ICommonService; import com.openhis.web.common.dto.InventoryItemParam; import com.openhis.web.common.dto.LocationDto; import com.openhis.web.common.dto.SearchTraceNoParam; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +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 java.util.List; /** * app常用接口 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/ActivityDefinitionDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/ActivityDefinitionDto.java index fef6c9db..2b0b7638 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/ActivityDefinitionDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/ActivityDefinitionDto.java @@ -5,7 +5,6 @@ package com.openhis.web.common.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/AdviceItemPrintInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/AdviceItemPrintInfoDto.java index 963d7ba4..50bfa6b0 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/AdviceItemPrintInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/AdviceItemPrintInfoDto.java @@ -3,13 +3,12 @@ */ package com.openhis.web.common.dto; -import java.math.BigDecimal; - import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 医嘱项目打印信息 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/AdvicePrintInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/AdvicePrintInfoDto.java index 02137886..350bffb7 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/AdvicePrintInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/AdvicePrintInfoDto.java @@ -3,15 +3,14 @@ */ package com.openhis.web.common.dto; -import java.util.Date; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonFormat; - import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; +import java.util.List; + /** * 处方信息 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/InventoryItemDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/InventoryItemDto.java index ad54bb48..ab7df4d1 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/InventoryItemDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/InventoryItemDto.java @@ -3,18 +3,15 @@ */ package com.openhis.web.common.dto; -import java.math.BigDecimal; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; -import lombok.Getter; -import lombok.Setter; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.List; + /** * 库存项目dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/LocationDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/LocationDto.java index d3706dbb..576177dd 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/LocationDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/LocationDto.java @@ -2,7 +2,6 @@ package com.openhis.web.common.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/LocationInventoryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/LocationInventoryDto.java index 65d1526d..e1662c0d 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/LocationInventoryDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/LocationInventoryDto.java @@ -3,15 +3,14 @@ */ package com.openhis.web.common.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 库存项目所在对应库房信息 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformInfoDto.java index 372ce291..c1f30a14 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformInfoDto.java @@ -3,12 +3,8 @@ */ package com.openhis.web.common.dto; -import java.util.Date; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformRecordDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformRecordDto.java index e013d6f8..9a13c38f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformRecordDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformRecordDto.java @@ -3,15 +3,14 @@ */ package com.openhis.web.common.dto; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 执行记录dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PractitionerInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PractitionerInfoDto.java index d60cf89c..c6aa5ce5 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PractitionerInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PractitionerInfoDto.java @@ -5,7 +5,6 @@ package com.openhis.web.common.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/UnitQuantityDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/UnitQuantityDto.java index d44964ab..2373e627 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/UnitQuantityDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/UnitQuantityDto.java @@ -3,11 +3,11 @@ */ package com.openhis.web.common.dto; -import java.math.BigDecimal; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 单位数量列表 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/mapper/CommonAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/mapper/CommonAppMapper.java index 1c65bd2b..9ec03aa8 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/mapper/CommonAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/mapper/CommonAppMapper.java @@ -3,11 +3,6 @@ */ package com.openhis.web.common.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; @@ -15,6 +10,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.administration.domain.TraceNoManage; import com.openhis.web.common.dto.*; import com.openhis.web.pharmacymanage.dto.InventoryDetailDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * app常用接口 mapper 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 adc03874..1406c099 100644 --- 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 @@ -3,18 +3,16 @@ */ package com.openhis.web.datadictionary.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.core.common.core.domain.R; +import com.openhis.web.datadictionary.dto.DeviceManageSelParam; +import com.openhis.web.datadictionary.dto.DeviceManageUpDto; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; -import com.core.common.core.domain.R; -import com.openhis.web.datadictionary.dto.DeviceManageSelParam; -import com.openhis.web.datadictionary.dto.DeviceManageUpDto; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 器材目录 service 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 2b0d07b9..a01659d2 100644 --- 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 @@ -1,15 +1,13 @@ package com.openhis.web.datadictionary.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.web.multipart.MultipartFile; - import com.core.common.core.domain.R; 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 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 ccaa4bda..6ce30f17 100644 --- 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 @@ -1,15 +1,12 @@ package com.openhis.web.datadictionary.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.web.bind.annotation.GetMapping; - 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 java.util.List; + /** * 病种目录 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IItemDefinitionService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IItemDefinitionService.java index b85d22f1..9ab107b4 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IItemDefinitionService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IItemDefinitionService.java @@ -1,11 +1,9 @@ package com.openhis.web.datadictionary.appservice; -import com.openhis.administration.domain.ChargeItemDefDetail; import com.openhis.administration.domain.ChargeItemDefinition; import com.openhis.web.datadictionary.dto.ItemUpFromDirectoryDto; import java.math.BigDecimal; -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 57617d2d..9ceb0849 100644 --- 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 @@ -3,18 +3,16 @@ */ package com.openhis.web.datadictionary.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.core.common.core.domain.R; +import com.openhis.web.datadictionary.dto.MedicationManageUpDto; +import com.openhis.web.datadictionary.dto.MedicationSearchParam; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; -import com.core.common.core.domain.R; -import com.openhis.web.datadictionary.dto.MedicationManageUpDto; -import com.openhis.web.datadictionary.dto.MedicationSearchParam; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 药品目录 service 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 2994c9ec..e6c9e114 100644 --- 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 @@ -3,16 +3,14 @@ */ package com.openhis.web.datadictionary.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestBody; - import com.core.common.core.domain.R; import com.openhis.web.datadictionary.dto.SupplierSearchParam; 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 java.util.List; /** * 厂商/产地 service diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ItemDefinitionAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ItemDefinitionAppService.java index b7b4fe59..d016b6a1 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ItemDefinitionAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ItemDefinitionAppService.java @@ -1,13 +1,13 @@ package com.openhis.web.datadictionary.appservice; -import java.math.BigDecimal; -import java.util.List; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.core.common.core.domain.R; import com.openhis.web.datadictionary.dto.ItemDefinitionDetailDto; import com.openhis.web.datadictionary.dto.ItemDefinitionDto; +import java.math.BigDecimal; +import java.util.List; + /** * 项目定价 应用Service */ 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 02c0ddf4..656afcf5 100644 --- 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 @@ -3,29 +3,13 @@ */ package com.openhis.web.datadictionary.appservice.impl; -import java.math.BigDecimal; -import java.util.*; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.core.common.enums.DelFlag; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.multipart.MultipartFile; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.core.domain.entity.SysDictData; +import com.core.common.enums.DelFlag; import com.core.common.utils.*; import com.core.common.utils.bean.BeanUtils; import com.core.common.utils.poi.ExcelUtil; @@ -53,6 +37,20 @@ import com.openhis.workflow.domain.DeviceRequest; import com.openhis.workflow.service.IDeviceRequestService; import com.openhis.workflow.service.ISupplyRequestService; import com.openhis.yb.service.YbManager; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; +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 java.math.BigDecimal; +import java.util.*; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 器材目录 impl 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 49dd8b4f..b4cff934 100644 --- 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 @@ -1,21 +1,5 @@ package com.openhis.web.datadictionary.appservice.impl; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -46,6 +30,20 @@ import com.openhis.workflow.domain.ServiceRequest; import com.openhis.workflow.service.IActivityDefinitionService; import com.openhis.workflow.service.IServiceRequestService; 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 java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 诊疗实现类 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 69c3cb46..2f2f62a3 100644 --- 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 @@ -1,17 +1,5 @@ package com.openhis.web.datadictionary.appservice.impl; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; @@ -35,6 +23,16 @@ import com.openhis.web.datadictionary.dto.DiseaseManageDto; import com.openhis.web.datadictionary.dto.DiseaseManageInitDto; import com.openhis.web.datadictionary.dto.DiseaseManageSelParam; 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 java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 病种目录 实现 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 f83a19a6..0e17df30 100644 --- 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 @@ -2,41 +2,24 @@ package com.openhis.web.datadictionary.appservice.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.core.common.utils.ChineseConvertUtils; +import com.core.common.core.domain.R; import com.core.common.utils.MessageUtils; -import com.core.common.utils.StringUtils; -import com.openhis.administration.domain.Account; -import com.openhis.administration.domain.Location; -import com.openhis.administration.mapper.LocationMapper; -import com.openhis.administration.service.ILocationService; import com.openhis.clinical.domain.ConditionNoDefinition; import com.openhis.clinical.mapper.ConditionNoDefinitionMapper; import com.openhis.clinical.service.IConditionNoDefinitionService; -import com.openhis.common.constant.CommonConstants; import com.openhis.common.constant.PromptMsgConstant; -import com.openhis.common.enums.*; import com.openhis.common.utils.HisPageUtils; import com.openhis.common.utils.HisQueryUtils; -import com.openhis.web.basedatamanage.dto.LocationAddOrEditDto; -import com.openhis.web.basedatamanage.dto.LocationInfoDto; -import com.openhis.web.datadictionary.dto.DeviceManageDto; +import com.openhis.web.datadictionary.appservice.ICDCodeService; import com.openhis.web.datadictionary.dto.ICDCodeAddDto; import com.openhis.web.datadictionary.dto.ICDCodeDto; import com.openhis.web.datadictionary.dto.ICDCodeUpdateDto; -import com.openhis.workflow.domain.SupplyRequest; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import com.core.common.core.domain.R; -import com.openhis.web.datadictionary.appservice.ICDCodeService; - import javax.annotation.Resource; import java.util.Arrays; import java.util.HashSet; -import java.util.List; @Service public class ICDCodeServiceImpl implements ICDCodeService { 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 29ca363b..158bee11 100644 --- 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 @@ -3,15 +3,6 @@ */ package com.openhis.web.datadictionary.appservice.impl; -import java.math.BigDecimal; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -29,6 +20,13 @@ import com.openhis.web.datadictionary.appservice.ItemDefinitionAppService; import com.openhis.web.datadictionary.dto.ItemDefinitionDetailDto; import com.openhis.web.datadictionary.dto.ItemDefinitionDto; import com.openhis.web.datadictionary.mapper.ItemDefinitionAppMapper; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; /** * 项目定价 应用impl 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 fb071efa..fd6ad908 100644 --- 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 @@ -1,13 +1,5 @@ package com.openhis.web.datadictionary.appservice.impl; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.core.common.utils.bean.BeanUtils; @@ -20,6 +12,12 @@ import com.openhis.common.constant.CommonConstants; import com.openhis.common.enums.ConditionCode; import com.openhis.web.datadictionary.appservice.IItemDefinitionService; import com.openhis.web.datadictionary.dto.ItemUpFromDirectoryDto; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; /** * 项目定价 实现 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 718798ef..89c06f18 100644 --- 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 @@ -3,28 +3,13 @@ */ package com.openhis.web.datadictionary.appservice.impl; -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.core.common.enums.DelFlag; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.multipart.MultipartFile; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.core.domain.entity.SysDictData; +import com.core.common.enums.DelFlag; import com.core.common.utils.*; import com.core.common.utils.bean.BeanUtils; import com.core.common.utils.poi.ExcelUtil; @@ -55,6 +40,19 @@ import com.openhis.web.datadictionary.dto.*; import com.openhis.web.datadictionary.mapper.MedicationManageSearchMapper; import com.openhis.workflow.service.ISupplyRequestService; import com.openhis.yb.service.YbManager; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; +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 java.math.BigDecimal; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * TODO:DTO已UI最小需要值返回 药品目录 impl 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 7520c81b..8e897712 100644 --- 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 @@ -3,22 +3,11 @@ */ package com.openhis.web.datadictionary.appservice.impl; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.servlet.http.HttpServletRequest; - -import com.core.common.exception.ServiceException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; +import com.core.common.enums.DelFlag; +import com.core.common.exception.ServiceException; import com.core.common.utils.AssignSeqUtil; import com.core.common.utils.ChineseConvertUtils; import com.core.common.utils.MessageUtils; @@ -30,7 +19,6 @@ import com.openhis.administration.service.ISupplierService; import com.openhis.common.constant.CommonConstants; import com.openhis.common.constant.PromptMsgConstant; import com.openhis.common.enums.AssignSeqEnum; -import com.core.common.enums.DelFlag; import com.openhis.common.enums.SupplierType; import com.openhis.common.enums.Whether; import com.openhis.common.utils.EnumUtils; @@ -41,6 +29,16 @@ import com.openhis.web.datadictionary.dto.SupplierDto; import com.openhis.web.datadictionary.dto.SupplierInitDto; import com.openhis.web.datadictionary.dto.SupplierSearchParam; 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 java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 厂商/产地 impl 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 942e19ab..caaea705 100644 --- 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 @@ -1,22 +1,19 @@ package com.openhis.web.datadictionary.controller; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - import com.core.common.core.domain.R; import com.openhis.web.datadictionary.appservice.IDeviceManageAppService; import com.openhis.web.datadictionary.dto.DeviceManageSelParam; import com.openhis.web.datadictionary.dto.DeviceManageUpDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +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 java.util.List; /** * TODO:器材目录 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 d456171c..79304e4e 100644 --- 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 @@ -1,22 +1,19 @@ package com.openhis.web.datadictionary.controller; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - import com.core.common.core.domain.R; import com.openhis.web.datadictionary.appservice.IDiagTreatMAppService; import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam; import com.openhis.web.datadictionary.dto.DiagnosisTreatmentUpDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +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 java.util.List; /** * TODO:诊疗目录 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 2eaec499..638e9788 100644 --- 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 @@ -1,13 +1,5 @@ package com.openhis.web.datadictionary.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.core.common.utils.bean.BeanUtils; import com.openhis.clinical.domain.ConditionDefinition; @@ -15,9 +7,14 @@ import com.openhis.web.datadictionary.appservice.IDiseaseManageAppService; import com.openhis.web.datadictionary.dto.DiseaseManageDto; import com.openhis.web.datadictionary.dto.DiseaseManageSelParam; import com.openhis.web.datadictionary.dto.DiseaseManageUpDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +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 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 c2cb0df1..5ad23187 100644 --- 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 @@ -1,19 +1,15 @@ package com.openhis.web.datadictionary.controller; -import javax.annotation.Resource; - -import com.openhis.web.basedatamanage.dto.LocationAddOrEditDto; -import com.openhis.web.datadictionary.dto.ICDCodeAddDto; -import com.openhis.web.datadictionary.dto.ICDCodeDto; -import com.openhis.web.datadictionary.dto.ICDCodeUpdateDto; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.datadictionary.appservice.ICDCodeService; - +import com.openhis.web.datadictionary.dto.ICDCodeAddDto; +import com.openhis.web.datadictionary.dto.ICDCodeUpdateDto; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; @RestController @RequestMapping("/base-data-manage/ICD10") diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java index 9f16e2b9..c5a39102 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java @@ -3,22 +3,20 @@ */ package com.openhis.web.datadictionary.controller; -import java.math.BigDecimal; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.common.enums.ChargeItemContext; import com.openhis.common.enums.PublicationStatus; import com.openhis.web.datadictionary.appservice.ItemDefinitionAppService; import com.openhis.web.datadictionary.dto.ItemDefinitionDto; import com.openhis.web.datadictionary.dto.ItemDefinitionInitDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.math.BigDecimal; +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/datadictionary/controller/MedicationManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/MedicationManageController.java index 89779345..21ba07ae 100644 --- 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 @@ -1,22 +1,19 @@ package com.openhis.web.datadictionary.controller; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - import com.core.common.core.domain.R; import com.openhis.web.datadictionary.appservice.IMedicationManageAppService; import com.openhis.web.datadictionary.dto.MedicationManageUpDto; import com.openhis.web.datadictionary.dto.MedicationSearchParam; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +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 java.util.List; /** * 已评审 TODO:药品目录 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 8e294c41..5b63c97b 100644 --- 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 @@ -3,18 +3,18 @@ */ package com.openhis.web.datadictionary.controller; -import java.util.List; import com.core.common.core.domain.R; import com.openhis.web.datadictionary.appservice.ISupplierManagementAppService; -import com.openhis.web.datadictionary.dto.*; +import com.openhis.web.datadictionary.dto.SupplierSearchParam; +import com.openhis.web.datadictionary.dto.SupplierUpDto; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; - import javax.servlet.http.HttpServletRequest; +import java.util.List; /** * TODO:厂商/产地 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ActivityChildJsonDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ActivityChildJsonDto.java index a177127b..77a25eee 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ActivityChildJsonDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ActivityChildJsonDto.java @@ -2,7 +2,6 @@ package com.openhis.web.datadictionary.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java index 8fa53297..ba1c1bd7 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java @@ -3,13 +3,13 @@ */ package com.openhis.web.datadictionary.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.openhis.common.enums.PublicationStatus; import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 费用定价分页Dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceImportDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceImportDto.java index 66da1990..439ba742 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceImportDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceImportDto.java @@ -1,12 +1,11 @@ package com.openhis.web.datadictionary.dto; -import java.math.BigDecimal; - import com.core.common.annotation.Excel; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 器材目录导入Dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java index 7e136811..b643e41b 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java @@ -1,14 +1,13 @@ package com.openhis.web.datadictionary.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 器材目录分页检索 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageInitDto.java index 17d6abea..e949f639 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageInitDto.java @@ -1,13 +1,13 @@ package com.openhis.web.datadictionary.dto; -import java.util.ArrayList; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; +import java.util.ArrayList; +import java.util.List; + /** * 器材目录初始dto * 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 440744bc..402654cc 100644 --- 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 @@ -1,16 +1,14 @@ package com.openhis.web.datadictionary.dto; -import java.math.BigDecimal; - -import javax.validation.constraints.NotBlank; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import javax.validation.constraints.NotBlank; +import java.math.BigDecimal; + /** * 器材目录更新 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java index fbf2a56e..5155d2ef 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java @@ -1,14 +1,13 @@ package com.openhis.web.datadictionary.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 诊疗目录分页检索 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentImportDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentImportDto.java index 686f25c0..b9c5718e 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentImportDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentImportDto.java @@ -1,12 +1,11 @@ package com.openhis.web.datadictionary.dto; -import java.math.BigDecimal; - import com.core.common.annotation.Excel; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 诊疗目录导入Dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentInitDto.java index 57172737..668cdfa9 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentInitDto.java @@ -1,13 +1,11 @@ package com.openhis.web.datadictionary.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.ArrayList; import java.util.List; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; -import lombok.experimental.Accessors; - /** * 诊疗目录初期查询 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentSelParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentSelParam.java index 653e1aed..99f1a8af 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentSelParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentSelParam.java @@ -1,7 +1,5 @@ package com.openhis.web.datadictionary.dto; -import com.openhis.common.enums.PublicationStatus; - import lombok.Data; import lombok.experimental.Accessors; 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 f9d63abe..de4d2a29 100644 --- 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 @@ -1,16 +1,14 @@ package com.openhis.web.datadictionary.dto; -import java.math.BigDecimal; - -import javax.validation.constraints.NotBlank; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import javax.validation.constraints.NotBlank; +import java.math.BigDecimal; + /** * 诊疗目录分页更新 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageDto.java index d9a74eec..63f3b54c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageDto.java @@ -3,9 +3,6 @@ package com.openhis.web.datadictionary.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; -import com.openhis.common.enums.ConditionDefinitionSource; -import com.openhis.common.enums.PublicationStatus; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageInitDto.java index 5a4aa3b9..aa944d29 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageInitDto.java @@ -1,11 +1,11 @@ package com.openhis.web.datadictionary.dto; -import java.util.ArrayList; -import java.util.List; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.ArrayList; +import java.util.List; + /** * 疾病目录初始dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageSelParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageSelParam.java index e940988c..40d251cd 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageSelParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageSelParam.java @@ -1,8 +1,5 @@ package com.openhis.web.datadictionary.dto; -import com.openhis.common.enums.ConditionDefinitionSource; -import com.openhis.common.enums.PublicationStatus; - import lombok.Data; import lombok.experimental.Accessors; 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 f674cd3f..23bf2f3c 100644 --- 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 @@ -2,8 +2,6 @@ package com.openhis.web.datadictionary.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.openhis.common.enums.ConditionDefinitionSource; -import com.openhis.common.enums.PublicationStatus; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeDto.java index 6574fdfb..82e3c5fb 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeDto.java @@ -2,12 +2,9 @@ package com.openhis.web.datadictionary.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; -import java.math.BigDecimal; - @Data @Accessors(chain = true) public class ICDCodeDto { 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 7b0ee790..5db20901 100644 --- 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 @@ -2,9 +2,7 @@ package com.openhis.web.datadictionary.dto; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import javax.validation.constraints.NotNull; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDetailDto.java index 4a76a3a9..47b8d1c3 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDetailDto.java @@ -3,15 +3,11 @@ */ package com.openhis.web.datadictionary.dto; -import java.math.BigDecimal; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 收费项目详情 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java index dead119b..bbf69415 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java @@ -3,15 +3,14 @@ */ package com.openhis.web.datadictionary.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 收费项目 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionInitDto.java index 211b6f67..6f991368 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionInitDto.java @@ -1,10 +1,10 @@ package com.openhis.web.datadictionary.dto; -import java.util.List; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 项目定价 init基础数据 */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemUpFromDirectoryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemUpFromDirectoryDto.java index 36e2fd39..f903435d 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemUpFromDirectoryDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemUpFromDirectoryDto.java @@ -1,11 +1,11 @@ package com.openhis.web.datadictionary.dto; -import java.math.BigDecimal; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 从目录添加定价表信息用的Dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationImportDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationImportDto.java index 957c7a78..7a45a5ce 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationImportDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationImportDto.java @@ -1,12 +1,11 @@ package com.openhis.web.datadictionary.dto; -import java.math.BigDecimal; - import com.core.common.annotation.Excel; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 药品目录导入Dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java index 619b79c9..766df1d5 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java @@ -1,16 +1,13 @@ package com.openhis.web.datadictionary.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.util.Date; /** * 药品目录Dto diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java index d0a05dbe..4f74b2c4 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java @@ -1,13 +1,13 @@ package com.openhis.web.datadictionary.dto; -import java.util.ArrayList; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; +import java.util.ArrayList; +import java.util.List; + /** * 药品目录初始dto * 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 d5080f2e..2041e192 100644 --- 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 @@ -1,19 +1,16 @@ package com.openhis.web.datadictionary.dto; -import java.math.BigDecimal; -import java.util.Date; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; +import javax.validation.constraints.NotBlank; +import java.math.BigDecimal; +import java.util.Date; + /** * 药品目录Dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java index b2169fd5..83f8e9a6 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java @@ -3,17 +3,12 @@ */ package com.openhis.web.datadictionary.dto; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; -import java.math.BigDecimal; -import java.util.Date; - /** * 供应商保存dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierInitDto.java index b6957a7f..2d805f2e 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierInitDto.java @@ -1,11 +1,10 @@ package com.openhis.web.datadictionary.dto; -import java.util.ArrayList; -import java.util.List; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 厂商/产地初始dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierSearchParam.java index 65f1b91a..6f3b8543 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierSearchParam.java @@ -3,12 +3,12 @@ */ package com.openhis.web.datadictionary.dto; -import java.io.Serializable; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * 厂商/产地分页查询条件 * 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 81124e46..504cf2c5 100644 --- 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 @@ -3,15 +3,14 @@ */ package com.openhis.web.datadictionary.dto; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; 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; + /** * 供应商保存dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ActivityDefinitionManageMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ActivityDefinitionManageMapper.java index 94a1c04f..f0318f37 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ActivityDefinitionManageMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ActivityDefinitionManageMapper.java @@ -1,15 +1,12 @@ package com.openhis.web.datadictionary.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto; - -import java.util.List; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; /** * 诊疗定义管理 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ChargeItemDefSearchMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ChargeItemDefSearchMapper.java index 7566cd11..eec5b50f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ChargeItemDefSearchMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ChargeItemDefSearchMapper.java @@ -1,8 +1,5 @@ package com.openhis.web.datadictionary.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -10,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.administration.domain.ChargeItemDefinition; import com.openhis.web.datadictionary.dto.ChargeItemDefPageDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; /** * 费用定价管理Mapper接口 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/DeviceManageMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/DeviceManageMapper.java index b6cabe7e..157950dd 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/DeviceManageMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/DeviceManageMapper.java @@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.datadictionary.dto.DeviceManageDto; -import com.openhis.web.datadictionary.dto.MedicationManageDto; -import com.openhis.web.outpatientmanage.dto.OutpatientInfusionPatientDto; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ItemDefinitionAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ItemDefinitionAppMapper.java index 66b9a9e0..7aca106f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ItemDefinitionAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ItemDefinitionAppMapper.java @@ -1,16 +1,15 @@ package com.openhis.web.datadictionary.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.datadictionary.dto.ItemDefinitionDetailDto; import com.openhis.web.datadictionary.dto.ItemDefinitionDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 项目定价 应用Mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/MedicationManageSearchMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/MedicationManageSearchMapper.java index 285c4e3d..2f9144bb 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/MedicationManageSearchMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/MedicationManageSearchMapper.java @@ -1,18 +1,16 @@ package com.openhis.web.datadictionary.mapper; -import java.util.List; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.openhis.web.outpatientmanage.dto.OutpatientInfusionRecordDto; +import com.openhis.administration.domain.ChargeItemDefinition; +import com.openhis.web.datadictionary.dto.MedicationManageDto; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.openhis.administration.domain.ChargeItemDefinition; -import com.openhis.web.datadictionary.dto.MedicationManageDto; +import java.util.List; /** * 药品目录管理Mapper接口 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 e5bb470f..6522449a 100644 --- 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 @@ -1,11 +1,11 @@ package com.openhis.web.departmentmanage.appservice; -import javax.servlet.http.HttpServletRequest; - 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; + /** * 科室材料共通方法 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentIssuanceOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentIssuanceOrderService.java index 166021e3..0ec3ed0f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentIssuanceOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentIssuanceOrderService.java @@ -1,9 +1,8 @@ package com.openhis.web.departmentmanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; -import com.openhis.web.departmentmanage.dto.DepartmentDetailDto; + +import java.util.List; /** * 科室材料发出单 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentProfitLossOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentProfitLossOrderService.java index ba09f0c4..b0b4fb4f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentProfitLossOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentProfitLossOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.departmentmanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.departmentmanage.dto.DepartmentDetailDto; +import java.util.List; + /** * 科室材料损益单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentReceiptApprovalService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentReceiptApprovalService.java index 68b0193d..a058eb9c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentReceiptApprovalService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentReceiptApprovalService.java @@ -1,10 +1,10 @@ package com.openhis.web.departmentmanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto; +import java.util.List; + /** * 科室材料审批方法 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentRequisitionOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentRequisitionOrderService.java index a54b42d9..57eafd86 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentRequisitionOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentRequisitionOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.departmentmanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.departmentmanage.dto.DepartmentDetailDto; +import java.util.List; + /** * 科室材料请领单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentReturnToWarehouseOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentReturnToWarehouseOrderService.java index d9a7d8ce..a97b8718 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentReturnToWarehouseOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentReturnToWarehouseOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.departmentmanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.departmentmanage.dto.DepartmentDetailDto; +import java.util.List; + /** * 科室材料退库单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentStockInOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentStockInOrderService.java index fbee5cf2..25bb8e33 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentStockInOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentStockInOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.departmentmanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.departmentmanage.dto.DepartmentDetailDto; +import java.util.List; + /** * 科室材料入库单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentStocktakingOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentStocktakingOrderService.java index 9a0e90a9..affcedc1 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentStocktakingOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentStocktakingOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.departmentmanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.departmentmanage.dto.DepartmentDetailDto; +import java.util.List; + /** * 科室材料盘点单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentTransferInOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentTransferInOrderService.java index 37c4e2a3..0d278a5d 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentTransferInOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentTransferInOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.departmentmanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.departmentmanage.dto.DepartmentDetailDto; +import java.util.List; + /** * 科室材料调入单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentTransferOutOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentTransferOutOrderService.java index d94d01d9..0dc77431 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentTransferOutOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/IDepartmentTransferOutOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.departmentmanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.departmentmanage.dto.DepartmentDetailDto; +import java.util.List; + /** * 科室材料调出单 * 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 7d4285db..f80c7753 100644 --- 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 @@ -1,5 +1,34 @@ package com.openhis.web.departmentmanage.appservice.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.core.common.core.domain.R; +import com.core.common.utils.MessageUtils; +import com.openhis.administration.domain.Organization; +import com.openhis.administration.domain.Practitioner; +import com.openhis.administration.domain.Supplier; +import com.openhis.administration.service.IOrganizationService; +import com.openhis.administration.service.IPractitionerService; +import com.openhis.administration.service.ISupplierService; +import com.openhis.common.constant.CommonConstants; +import com.openhis.common.constant.PromptMsgConstant; +import com.openhis.common.enums.*; +import com.openhis.common.utils.EnumUtils; +import com.openhis.common.utils.HisQueryUtils; +import com.openhis.web.common.appservice.ICommonService; +import com.openhis.web.common.dto.LocationDto; +import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService; +import com.openhis.web.departmentmanage.dto.DepartmentDeviceInfoDto; +import com.openhis.web.departmentmanage.dto.DepartmentDto; +import com.openhis.web.departmentmanage.dto.DepartmentInitDto; +import com.openhis.web.departmentmanage.dto.DepartmentSearchParam; +import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper; +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 java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; @@ -7,37 +36,6 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import com.openhis.administration.domain.Organization; -import com.openhis.administration.service.IOrganizationService; -import com.openhis.common.enums.*; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.core.common.core.domain.R; -import com.core.common.utils.MessageUtils; -import com.openhis.administration.domain.Practitioner; -import com.openhis.administration.domain.Supplier; -import com.openhis.administration.service.IPractitionerService; -import com.openhis.administration.service.ISupplierService; -import com.openhis.common.constant.CommonConstants; -import com.openhis.common.constant.PromptMsgConstant; -import com.openhis.common.utils.EnumUtils; -import com.openhis.common.utils.HisQueryUtils; -import com.openhis.web.common.appservice.ICommonService; -import com.openhis.web.common.dto.LocationDto; -import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService; -import com.openhis.web.departmentmanage.dto.DepartmentDto; -import com.openhis.web.departmentmanage.dto.DepartmentInitDto; -import com.openhis.web.departmentmanage.dto.DepartmentDeviceInfoDto; -import com.openhis.web.departmentmanage.dto.DepartmentSearchParam; -import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper; -import com.openhis.workflow.domain.SupplyRequest; -import com.openhis.workflow.service.ISupplyRequestService; - /** * 科室材料订货单 * 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 300f88bf..a6fe86d2 100644 --- 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 @@ -1,12 +1,5 @@ package com.openhis.web.departmentmanage.appservice.impl; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -23,6 +16,11 @@ import com.openhis.workflow.domain.SupplyDelivery; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyDeliveryService; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.stereotype.Service; + +import javax.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 535521ec..b92a8177 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.departmentmanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -24,10 +14,17 @@ import com.openhis.web.departmentmanage.appservice.IDepartmentProfitLossOrderSer import com.openhis.web.departmentmanage.dto.DepartmentDetailDto; import com.openhis.web.departmentmanage.dto.DepartmentInitDto; import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper; -import com.openhis.web.departmentmanage.mapper.DepartmentProfitLossOrderMapper; import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +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/DepartmentReceiptApprovalServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentReceiptApprovalServiceImpl.java index 4c816e05..c0905701 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.departmentmanage.appservice.impl; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.core.common.core.domain.R; @@ -46,6 +36,14 @@ import com.openhis.yb.dto.MedicalInventory3501Param; import com.openhis.yb.dto.MedicalInventory3502Param; import com.openhis.yb.dto.MedicalPurchase3504Param; import com.openhis.yb.service.YbManager; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.*; +import java.util.stream.Collectors; /** * 科室材料审批 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 75389a63..80d26a1b 100644 --- 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 @@ -1,14 +1,5 @@ package com.openhis.web.departmentmanage.appservice.impl; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -22,10 +13,16 @@ import com.openhis.web.departmentmanage.appservice.IDepartmentRequisitionOrderSe import com.openhis.web.departmentmanage.dto.DepartmentDetailDto; import com.openhis.web.departmentmanage.dto.DepartmentInitDto; import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper; -import com.openhis.web.departmentmanage.mapper.DepartmentRequisitionOrderMapper; import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.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 939dc00f..4aa3f320 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.departmentmanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -27,6 +17,14 @@ import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper; import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +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/DepartmentStockInOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentStockInOrderServiceImpl.java index 4e5dc7f8..d91ab622 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.departmentmanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -27,6 +17,14 @@ import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper; import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +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/DepartmentStocktakingOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentStocktakingOrderServiceImpl.java index f2078be5..4ac7dbee 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.departmentmanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -24,10 +14,17 @@ import com.openhis.web.departmentmanage.appservice.IDepartmentStocktakingOrderSe import com.openhis.web.departmentmanage.dto.DepartmentDetailDto; import com.openhis.web.departmentmanage.dto.DepartmentInitDto; import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper; -import com.openhis.web.departmentmanage.mapper.DepartmentStocktakingOrderMapper; import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +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/DepartmentTransferInOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentTransferInOrderServiceImpl.java index 532367f5..5dede95f 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.departmentmanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -27,6 +17,14 @@ import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper; import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +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/DepartmentTransferOutOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentTransferOutOrderServiceImpl.java index 46f0d740..e4af5226 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.departmentmanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -24,10 +14,17 @@ import com.openhis.web.departmentmanage.appservice.IDepartmentTransferOutOrderSe import com.openhis.web.departmentmanage.dto.DepartmentDetailDto; import com.openhis.web.departmentmanage.dto.DepartmentInitDto; import com.openhis.web.departmentmanage.mapper.DepartmentCommonMapper; -import com.openhis.web.departmentmanage.mapper.DepartmentTransferOutOrderMapper; import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; /** * 科室材料调出单 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 72c4fe79..fa4ca9fc 100644 --- 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 @@ -1,22 +1,19 @@ package com.openhis.web.departmentmanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.common.enums.SupplyType; import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService; -import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalService; import com.openhis.web.departmentmanage.appservice.IDepartmentIssuanceOrderService; -import com.openhis.web.departmentmanage.dto.DepartmentDetailDto; +import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalService; import com.openhis.web.departmentmanage.dto.DepartmentSearchParam; - import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +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; /** * 科室材料发出单 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 7c9d8009..815650ae 100644 --- 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 @@ -1,13 +1,5 @@ package com.openhis.web.departmentmanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.common.enums.SupplyType; import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService; @@ -15,8 +7,13 @@ import com.openhis.web.departmentmanage.appservice.IDepartmentProfitLossOrderSer import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalService; import com.openhis.web.departmentmanage.dto.DepartmentDetailDto; import com.openhis.web.departmentmanage.dto.DepartmentSearchParam; - import lombok.extern.slf4j.Slf4j; +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 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 d4d39b1c..e1399bfb 100644 --- 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 @@ -1,13 +1,5 @@ package com.openhis.web.departmentmanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.common.enums.SupplyType; import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService; @@ -15,8 +7,13 @@ import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalSer import com.openhis.web.departmentmanage.appservice.IDepartmentRequisitionOrderService; import com.openhis.web.departmentmanage.dto.DepartmentDetailDto; import com.openhis.web.departmentmanage.dto.DepartmentSearchParam; - import lombok.extern.slf4j.Slf4j; +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 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 996cbfe0..1a254aea 100644 --- 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 @@ -1,13 +1,5 @@ package com.openhis.web.departmentmanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.common.enums.SupplyType; import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService; @@ -15,8 +7,13 @@ import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalSer import com.openhis.web.departmentmanage.appservice.IDepartmentReturnToWarehouseOrderService; import com.openhis.web.departmentmanage.dto.DepartmentDetailDto; import com.openhis.web.departmentmanage.dto.DepartmentSearchParam; - import lombok.extern.slf4j.Slf4j; +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 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 66a63beb..880503a3 100644 --- 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 @@ -1,13 +1,5 @@ package com.openhis.web.departmentmanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.common.enums.SupplyType; import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService; @@ -15,8 +7,13 @@ import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalSer import com.openhis.web.departmentmanage.appservice.IDepartmentStockInOrderService; import com.openhis.web.departmentmanage.dto.DepartmentDetailDto; import com.openhis.web.departmentmanage.dto.DepartmentSearchParam; - import lombok.extern.slf4j.Slf4j; +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 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 5c200e85..c69284ca 100644 --- 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 @@ -1,13 +1,5 @@ package com.openhis.web.departmentmanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.common.enums.SupplyType; import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService; @@ -15,8 +7,13 @@ import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalSer import com.openhis.web.departmentmanage.appservice.IDepartmentStocktakingOrderService; import com.openhis.web.departmentmanage.dto.DepartmentDetailDto; import com.openhis.web.departmentmanage.dto.DepartmentSearchParam; - import lombok.extern.slf4j.Slf4j; +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 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 31b1c617..74aa01b9 100644 --- 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 @@ -1,13 +1,5 @@ package com.openhis.web.departmentmanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.common.enums.SupplyType; import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService; @@ -15,8 +7,13 @@ import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalSer import com.openhis.web.departmentmanage.appservice.IDepartmentTransferInOrderService; import com.openhis.web.departmentmanage.dto.DepartmentDetailDto; import com.openhis.web.departmentmanage.dto.DepartmentSearchParam; - import lombok.extern.slf4j.Slf4j; +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 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 e508d829..30573d60 100644 --- 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 @@ -1,13 +1,5 @@ package com.openhis.web.departmentmanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.common.enums.SupplyType; import com.openhis.web.departmentmanage.appservice.IDepartmentCommonService; @@ -15,8 +7,13 @@ import com.openhis.web.departmentmanage.appservice.IDepartmentReceiptApprovalSer import com.openhis.web.departmentmanage.appservice.IDepartmentTransferOutOrderService; import com.openhis.web.departmentmanage.dto.DepartmentDetailDto; import com.openhis.web.departmentmanage.dto.DepartmentSearchParam; - import lombok.extern.slf4j.Slf4j; +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 java.util.List; /** * 科室材料调出单 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDetailDto.java index e992b24f..c40cb2bc 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDetailDto.java @@ -3,21 +3,20 @@ */ package com.openhis.web.departmentmanage.dto; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; +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/departmentmanage/dto/DepartmentDeviceInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDeviceInfoDto.java index 462795e8..9ee5b3bb 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDeviceInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDeviceInfoDto.java @@ -3,19 +3,18 @@ */ package com.openhis.web.departmentmanage.dto; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; +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/departmentmanage/dto/DepartmentDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDto.java index 9483ba2a..b6ce4b42 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentDto.java @@ -3,17 +3,16 @@ */ package com.openhis.web.departmentmanage.dto; -import java.io.Serializable; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; + /** * 单据信息 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentInitDto.java index 6aad96ff..09f96d9b 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentInitDto.java @@ -3,17 +3,16 @@ */ package com.openhis.web.departmentmanage.dto; -import java.io.Serializable; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.administration.domain.Organization; import com.openhis.web.common.dto.LocationDto; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.List; + /** * 单据初期信息 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentSearchParam.java index 692d00e0..8792d81f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/dto/DepartmentSearchParam.java @@ -3,14 +3,13 @@ */ package com.openhis.web.departmentmanage.dto; -import java.io.Serializable; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * 单据查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentCommonMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentCommonMapper.java index cf40b097..1194ba7c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentCommonMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/mapper/DepartmentCommonMapper.java @@ -1,15 +1,14 @@ package com.openhis.web.departmentmanage.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.departmentmanage.dto.DepartmentDetailDto; -import com.openhis.web.departmentmanage.dto.DepartmentDto; import com.openhis.web.departmentmanage.dto.DepartmentDeviceInfoDto; +import com.openhis.web.departmentmanage.dto.DepartmentDto; import com.openhis.web.departmentmanage.dto.DepartmentSearchParam; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; /** * 科室材料共通 mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java index 7d92421c..45dde116 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java @@ -1,7 +1,5 @@ package com.openhis.web.doctorstation.appservice; -import java.util.List; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.core.common.core.domain.R; import com.openhis.web.doctorstation.dto.AdviceBaseDto; @@ -9,6 +7,8 @@ import com.openhis.web.doctorstation.dto.AdviceSaveParam; import com.openhis.web.doctorstation.dto.OrderBindInfoDto; import com.openhis.web.doctorstation.dto.UpdateGroupIdParam; +import java.util.List; + /** * 医生站-医嘱/处方 应用Service */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationChineseMedicalAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationChineseMedicalAppService.java index 517a4467..668c10d2 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationChineseMedicalAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationChineseMedicalAppService.java @@ -1,7 +1,5 @@ package com.openhis.web.doctorstation.appservice; -import java.util.List; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; @@ -10,6 +8,8 @@ import com.openhis.web.doctorstation.dto.AdviceSaveParam; import com.openhis.web.doctorstation.dto.ConditionDefinitionMetadata; import com.openhis.web.doctorstation.dto.SaveDiagnosisParam; +import java.util.List; + /** * 医生站-中医 应用Service */ 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 c22cb91d..b959f28f 100644 --- 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 @@ -1,13 +1,13 @@ package com.openhis.web.doctorstation.appservice; -import javax.servlet.http.HttpServletRequest; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.openhis.web.doctorstation.dto.ConditionDefinitionMetadata; import com.openhis.web.doctorstation.dto.DiagnosisBelongBindingDto; import com.openhis.web.doctorstation.dto.SaveDiagnosisParam; +import javax.servlet.http.HttpServletRequest; + /** * 医生站-诊断 应用Service */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationElepPrescriptionService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationElepPrescriptionService.java index 3c5a9c70..219bdbe4 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationElepPrescriptionService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationElepPrescriptionService.java @@ -1,10 +1,6 @@ package com.openhis.web.doctorstation.appservice; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.core.common.core.domain.R; -import com.openhis.common.enums.AssignSeqEnum; -import com.openhis.web.doctorstation.dto.AdviceBaseDto; -import com.openhis.web.doctorstation.dto.AdviceSaveParam; import com.openhis.web.doctorstation.dto.DeletePrescriptionInfoParam; import com.openhis.web.doctorstation.dto.ElepPrescriptionInfoParam; 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 fe6901a8..c29a1fed 100644 --- 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 @@ -1,9 +1,5 @@ package com.openhis.web.doctorstation.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.core.common.core.domain.R; import com.openhis.web.doctorstation.dto.PatientInfoDto; @@ -11,6 +7,9 @@ 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 java.util.List; + /** * 医生站-主页面 应用Service */ 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 5421e073..b6b57efd 100644 --- 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 @@ -1,11 +1,11 @@ package com.openhis.web.doctorstation.appservice; -import javax.servlet.http.HttpServletRequest; - 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; + /** * 医生站-预约记录 应用Service */ 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 470166f9..91257d7a 100644 --- 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 @@ -1,14 +1,5 @@ package com.openhis.web.doctorstation.appservice.impl; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -42,6 +33,13 @@ import com.openhis.web.doctorstation.dto.*; import com.openhis.web.doctorstation.mapper.DoctorStationChineseMedicalAppMapper; import com.openhis.web.doctorstation.utils.AdviceUtils; import com.openhis.workflow.service.IActivityDefinitionService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.*; +import java.util.stream.Collectors; /** * 医生站-中医 应用实现类 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 269e7f05..0b22b6e9 100644 --- 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 @@ -1,13 +1,5 @@ package com.openhis.web.doctorstation.appservice.impl; -import java.util.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -33,6 +25,12 @@ import com.openhis.common.utils.HisQueryUtils; import com.openhis.web.doctorstation.appservice.IDoctorStationDiagnosisAppService; import com.openhis.web.doctorstation.dto.*; import com.openhis.web.doctorstation.mapper.DoctorStationDiagnosisAppMapper; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.*; /** * 医生站-诊断 应用实现类 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 dab16f51..49d37315 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.doctorstation.appservice.impl; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.annotation.Resource; - -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -39,6 +29,14 @@ import com.openhis.ybcatalog.domain.CatalogDrugInfo; import com.openhis.ybcatalog.domain.CatalogDrugInfoUsual; import com.openhis.ybcatalog.mapper.CatalogDrugInfoUsualMapper; import com.openhis.ybcatalog.service.ICatalogDrugInfoUsualService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.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 7013c185..30853a61 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.doctorstation.appservice.impl; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -29,6 +19,14 @@ import com.openhis.document.service.IEmrTemplateService; import com.openhis.web.doctorstation.appservice.IDoctorStationEmrAppService; import com.openhis.web.doctorstation.dto.EmrTemplateDto; import com.openhis.web.doctorstation.dto.PatientEmrDto; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +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/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java index d01bdf24..d13d63b9 100644 --- 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 @@ -1,15 +1,6 @@ package com.openhis.web.doctorstation.appservice.impl; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - import cn.hutool.core.util.ObjectUtil; -import com.openhis.web.doctorstation.appservice.*; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -25,11 +16,18 @@ import com.openhis.common.constant.CommonConstants; import com.openhis.common.enums.*; import com.openhis.common.utils.EnumUtils; import com.openhis.common.utils.HisQueryUtils; +import com.openhis.web.doctorstation.appservice.*; import com.openhis.web.doctorstation.dto.PatientInfoDto; import com.openhis.web.doctorstation.dto.PrescriptionInfoBaseDto; import com.openhis.web.doctorstation.dto.PrescriptionInfoDetailDto; import com.openhis.web.doctorstation.dto.ReceptionStatisticsDto; import com.openhis.web.doctorstation.mapper.DoctorStationMainAppMapper; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import javax.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/doctorstation/appservice/impl/DoctorStationPtDetailsAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationPtDetailsAppServiceImpl.java index 088b2b5a..15eb954f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationPtDetailsAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationPtDetailsAppServiceImpl.java @@ -1,12 +1,5 @@ package com.openhis.web.doctorstation.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.core.common.core.domain.R; import com.core.common.utils.DateUtils; import com.openhis.common.enums.*; @@ -14,6 +7,12 @@ import com.openhis.common.utils.EnumUtils; import com.openhis.web.doctorstation.appservice.IDoctorStationPtDetailsAppService; import com.openhis.web.doctorstation.dto.PatientDetailsDto; import com.openhis.web.doctorstation.mapper.DoctorStationPtDetailsAppMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +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/doctorstation/appservice/impl/ReservationRecordAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/ReservationRecordAppServiceImpl.java index 0034b372..0e080bf9 100644 --- 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 @@ -1,13 +1,5 @@ package com.openhis.web.doctorstation.appservice.impl; -import java.util.Arrays; -import java.util.HashSet; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -21,6 +13,12 @@ import com.openhis.common.utils.HisQueryUtils; import com.openhis.web.doctorstation.appservice.IReservationRecordAppService; 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 java.util.Arrays; +import java.util.HashSet; /** * 医生站-预约记录 应用实现类 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java index 472387ca..f43e761e 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java @@ -3,10 +3,6 @@ */ package com.openhis.web.doctorstation.controller; -import java.util.List; - -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.common.enums.AdviceOpType; import com.openhis.common.enums.Whether; @@ -14,9 +10,11 @@ import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService; import com.openhis.web.doctorstation.dto.AdviceBaseDto; import com.openhis.web.doctorstation.dto.AdviceSaveParam; import com.openhis.web.doctorstation.dto.UpdateGroupIdParam; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 医生站-医嘱/处方 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationChineseMedicalController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationChineseMedicalController.java index 13229802..5cd1dedb 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationChineseMedicalController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationChineseMedicalController.java @@ -3,10 +3,6 @@ */ package com.openhis.web.doctorstation.controller; -import java.util.List; - -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.common.enums.AdviceOpType; import com.openhis.common.enums.Whether; @@ -15,9 +11,11 @@ import com.openhis.web.doctorstation.appservice.IDoctorStationChineseMedicalAppS import com.openhis.web.doctorstation.dto.AdviceBaseDto; import com.openhis.web.doctorstation.dto.AdviceSaveParam; import com.openhis.web.doctorstation.dto.SaveDiagnosisParam; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 医生站-中医 controller 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 8e4dfe9f..70d22ddf 100644 --- 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 @@ -3,15 +3,6 @@ */ package com.openhis.web.doctorstation.controller; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.common.enums.BindingType; import com.openhis.common.enums.ConditionVerificationStatus; @@ -19,9 +10,15 @@ import com.openhis.web.doctorstation.appservice.IDoctorStationDiagnosisAppServic import com.openhis.web.doctorstation.dto.DiagnosisBelongBindingDto; import com.openhis.web.doctorstation.dto.DiagnosisBelongBindingInitDto; import com.openhis.web.doctorstation.dto.SaveDiagnosisParam; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 医生站-诊断 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationElepPrescriptionController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationElepPrescriptionController.java index ead5b4e9..f04dfb5a 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationElepPrescriptionController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationElepPrescriptionController.java @@ -3,20 +3,14 @@ */ package com.openhis.web.doctorstation.controller; -import com.openhis.web.doctorstation.appservice.IDoctorStationElepPrescriptionService; -import com.openhis.web.doctorstation.dto.*; -import com.openhis.web.ybmanage.service.IYbEleHttpService; -import org.apache.ibatis.annotations.Param; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; -import com.openhis.common.enums.AdviceOpType; -import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService; - +import com.openhis.web.doctorstation.appservice.IDoctorStationElepPrescriptionService; +import com.openhis.web.doctorstation.dto.DeletePrescriptionInfoParam; +import com.openhis.web.doctorstation.dto.ElepPrescriptionInfoParam; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationEmrController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationEmrController.java index e3128a14..1d291704 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationEmrController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationEmrController.java @@ -3,16 +3,14 @@ */ package com.openhis.web.doctorstation.controller; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.doctorstation.appservice.IDoctorStationEmrAppService; import com.openhis.web.doctorstation.dto.EmrTemplateDto; import com.openhis.web.doctorstation.dto.PatientEmrDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; /** * 医生站-电子病历 controller 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 d323814d..ce332394 100644 --- 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 @@ -3,22 +3,20 @@ */ package com.openhis.web.doctorstation.controller; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - import com.core.common.core.domain.R; import com.openhis.common.enums.Whether; import com.openhis.web.doctorstation.appservice.IDoctorStationMainAppService; import com.openhis.web.doctorstation.dto.DoctorStationInitDto; import com.openhis.web.doctorstation.dto.PatientInfoDto; import com.openhis.web.doctorstation.dto.PrescriptionInfoBaseDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +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; /** * 医生站-主页面 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationPtDetailsController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationPtDetailsController.java index 2844d42f..1f40dfb5 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationPtDetailsController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationPtDetailsController.java @@ -1,17 +1,15 @@ package com.openhis.web.doctorstation.controller; +import com.core.common.core.domain.R; import com.openhis.web.doctorstation.appservice.IDoctorStationPtDetailsAppService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.core.common.core.domain.R; - -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; - /** * 医生站-患者详情 * 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 d79a2f66..6045bf87 100644 --- 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 @@ -3,16 +3,14 @@ */ package com.openhis.web.doctorstation.controller; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.doctorstation.appservice.IReservationRecordAppService; import com.openhis.web.doctorstation.dto.ReservationRecordDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; /** * 医生站-预约记录 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ActivityBindDeviceDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ActivityBindDeviceDetailDto.java index e32239da..d46d2383 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ActivityBindDeviceDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ActivityBindDeviceDetailDto.java @@ -1,14 +1,13 @@ package com.openhis.web.doctorstation.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 诊疗绑定耗材 详情dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ActivityChildrenJsonParams.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ActivityChildrenJsonParams.java index 851611a6..26d39d91 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ActivityChildrenJsonParams.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ActivityChildrenJsonParams.java @@ -2,7 +2,6 @@ package com.openhis.web.doctorstation.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java index e7019f67..c7231a33 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java @@ -1,15 +1,14 @@ package com.openhis.web.doctorstation.dto; -import java.math.BigDecimal; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.List; + /** * 医嘱基础 dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceInventoryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceInventoryDto.java index f0a6159c..88557a60 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceInventoryDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceInventoryDto.java @@ -1,14 +1,13 @@ package com.openhis.web.doctorstation.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 医嘱库存 dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdvicePriceDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdvicePriceDto.java index 02c3f0fb..79423483 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdvicePriceDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdvicePriceDto.java @@ -1,14 +1,13 @@ package com.openhis.web.doctorstation.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 医嘱价格 dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java index 62c9675f..a1eea6d2 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java @@ -1,17 +1,14 @@ package com.openhis.web.doctorstation.dto; -import java.math.BigDecimal; - import com.core.common.utils.SecurityUtils; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.openhis.common.annotation.Dict; -import com.openhis.common.enums.EncounterClass; import com.openhis.common.enums.TherapyTimeType; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 医嘱保存 dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveParam.java index b0cca87c..5421d0ef 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveParam.java @@ -1,14 +1,13 @@ package com.openhis.web.doctorstation.dto; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.enums.Whether; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 医嘱保存参数类 */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionBusinessClass.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionBusinessClass.java index 68852385..3b02924c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionBusinessClass.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionBusinessClass.java @@ -1,10 +1,10 @@ package com.openhis.web.doctorstation.dto; -import java.util.List; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 诊断定义 业务分类 */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionMetadata.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionMetadata.java index 887335ae..bb6f61c0 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionMetadata.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ConditionDefinitionMetadata.java @@ -2,7 +2,6 @@ package com.openhis.web.doctorstation.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DeletePrescriptionInfoParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DeletePrescriptionInfoParam.java index 578ce755..ff4d0bcb 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DeletePrescriptionInfoParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DeletePrescriptionInfoParam.java @@ -1,12 +1,10 @@ package com.openhis.web.doctorstation.dto; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 电子处方 dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingDto.java index 714f1feb..f015b782 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingDto.java @@ -2,7 +2,6 @@ package com.openhis.web.doctorstation.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingInitDto.java index ddfebdd2..9985fd5c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingInitDto.java @@ -1,10 +1,10 @@ package com.openhis.web.doctorstation.dto; -import java.util.List; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 诊断归属绑定 init基础数据 */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java index ca99a921..500414f7 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java @@ -3,7 +3,6 @@ package com.openhis.web.doctorstation.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationInitDto.java index 658ba36e..60b2916a 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationInitDto.java @@ -1,13 +1,12 @@ package com.openhis.web.doctorstation.dto; +import com.openhis.common.enums.EncounterStatus; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.ArrayList; import java.util.List; -import com.openhis.common.enums.EncounterStatus; - -import lombok.Data; -import lombok.experimental.Accessors; - /** * 医生站 init基础数据 */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepMedicationInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepMedicationInfoDto.java index 6253f665..28533059 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepMedicationInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepMedicationInfoDto.java @@ -1,16 +1,15 @@ package com.openhis.web.doctorstation.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 药品信息 dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoDto.java index ee984c31..aa273fec 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoDto.java @@ -1,17 +1,11 @@ package com.openhis.web.doctorstation.dto; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 电子处方 dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoParam.java index 8376054d..6f62cb80 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInfoParam.java @@ -1,16 +1,15 @@ package com.openhis.web.doctorstation.dto; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + /** * 电子处方 dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInitConditionDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInitConditionDto.java index 0ccf0d08..8ff2cda9 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInitConditionDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInitConditionDto.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; -import java.util.List; - /** * 诊断信息 */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInitDto.java index 49899aa6..372c15b8 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ElepPrescriptionInitDto.java @@ -1,14 +1,10 @@ package com.openhis.web.doctorstation.dto; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -import com.openhis.web.basedatamanage.dto.LocationDto; -import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto; import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 电子处方下拉框 */ 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 1bc1f0e4..a3837531 100644 --- 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 @@ -8,7 +8,6 @@ import lombok.Data; import lombok.experimental.Accessors; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/EncounterContractDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/EncounterContractDto.java index 4f84fb13..6762f023 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/EncounterContractDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/EncounterContractDto.java @@ -2,7 +2,6 @@ package com.openhis.web.doctorstation.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/OrderBindInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/OrderBindInfoDto.java index bded72e1..a35363c2 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/OrderBindInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/OrderBindInfoDto.java @@ -1,14 +1,12 @@ package com.openhis.web.doctorstation.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 医嘱绑定信息 详情dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientDetailsDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientDetailsDto.java index 5e1b8557..f69e716f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientDetailsDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientDetailsDto.java @@ -1,16 +1,15 @@ package com.openhis.web.doctorstation.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 患者详情Dto * 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 4aa902a5..56cc1500 100644 --- 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 @@ -3,12 +3,11 @@ */ package com.openhis.web.doctorstation.dto; -import javax.validation.constraints.NotNull; - import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.experimental.Accessors; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java index ed21cd77..aebaf579 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java @@ -1,14 +1,13 @@ package com.openhis.web.doctorstation.dto; -import java.util.Date; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 就诊患者信息 dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PrescriptionInfoBaseDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PrescriptionInfoBaseDto.java index c8ed73ba..b2915a9a 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PrescriptionInfoBaseDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PrescriptionInfoBaseDto.java @@ -1,17 +1,15 @@ package com.openhis.web.doctorstation.dto; -import java.util.Date; -import java.util.List; - -import org.springframework.format.annotation.DateTimeFormat; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +import java.util.List; /** * 处方信息 dto diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PrescriptionInfoDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PrescriptionInfoDetailDto.java index 30b5a687..e6b9317d 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PrescriptionInfoDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PrescriptionInfoDetailDto.java @@ -1,16 +1,15 @@ package com.openhis.web.doctorstation.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 处方详情信息 dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ReceptionStatisticsDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ReceptionStatisticsDto.java index 9f41d82f..05985a2c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ReceptionStatisticsDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ReceptionStatisticsDto.java @@ -2,7 +2,6 @@ package com.openhis.web.doctorstation.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java index 886bee3c..5592f34d 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java @@ -1,16 +1,15 @@ package com.openhis.web.doctorstation.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 医嘱请求基础 dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ReservationRecordDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ReservationRecordDto.java index 23aa8868..64656373 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ReservationRecordDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ReservationRecordDto.java @@ -1,15 +1,14 @@ package com.openhis.web.doctorstation.dto; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; + /** * 预约记录 dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisChildParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisChildParam.java index c4b89f0d..b724210c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisChildParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisChildParam.java @@ -2,7 +2,6 @@ package com.openhis.web.doctorstation.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisParam.java index 9cefbd2b..ac34c78e 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisParam.java @@ -1,13 +1,12 @@ package com.openhis.web.doctorstation.dto; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 保存诊断 主参数类 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/UpdateGroupDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/UpdateGroupDto.java index c675e4e2..4c13b4ad 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/UpdateGroupDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/UpdateGroupDto.java @@ -2,7 +2,6 @@ package com.openhis.web.doctorstation.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/UpdateGroupIdParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/UpdateGroupIdParam.java index 28f74554..69818d4d 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/UpdateGroupIdParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/UpdateGroupIdParam.java @@ -1,10 +1,10 @@ package com.openhis.web.doctorstation.dto; -import java.util.List; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 更新组号参数类 */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java index e36d254f..65e4c29e 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java @@ -1,15 +1,14 @@ package com.openhis.web.doctorstation.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.doctorstation.dto.*; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 医生站-医嘱/处方 应用Mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationChineseMedicalAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationChineseMedicalAppMapper.java index 7aa1d64b..d2726d1c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationChineseMedicalAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationChineseMedicalAppMapper.java @@ -1,12 +1,11 @@ package com.openhis.web.doctorstation.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.openhis.web.doctorstation.dto.DiagnosisQueryDto; import com.openhis.web.doctorstation.dto.RequestBaseDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 医生站-中医 应用Mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationDiagnosisAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationDiagnosisAppMapper.java index 9c04ff8d..e27b9f97 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationDiagnosisAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationDiagnosisAppMapper.java @@ -1,10 +1,5 @@ package com.openhis.web.doctorstation.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; @@ -12,6 +7,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.doctorstation.dto.ConditionDefinitionMetadata; import com.openhis.web.doctorstation.dto.DiagnosisBelongBindingDto; import com.openhis.web.doctorstation.dto.DiagnosisQueryDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 医生站-诊断 应用Mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationElepPrescriptionMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationElepPrescriptionMapper.java index 71cfea92..e67f9cfd 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationElepPrescriptionMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationElepPrescriptionMapper.java @@ -2,17 +2,15 @@ package com.openhis.web.doctorstation.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.openhis.web.doctorstation.dto.*; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.openhis.web.doctorstation.dto.ElepMedicationInfoDto; +import com.openhis.web.doctorstation.dto.ElepPrescriptionInfoDto; +import com.openhis.web.doctorstation.dto.ElepPrescriptionInfoParam; import com.openhis.web.reportmanage.dto.ChargeReportPageDto; -import com.openhis.web.reportmanage.dto.ChargeReportSearchParam; import com.openhis.ybcatalog.domain.CatalogDrugInfo; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import java.util.List; - /** * 医生站-电子处方 应用Mapper */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationMainAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationMainAppMapper.java index 582aa887..ce0aeb1f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationMainAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationMainAppMapper.java @@ -1,10 +1,5 @@ package com.openhis.web.doctorstation.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; @@ -13,6 +8,10 @@ import com.openhis.web.doctorstation.dto.PatientInfoDto; import com.openhis.web.doctorstation.dto.PrescriptionInfoBaseDto; import com.openhis.web.doctorstation.dto.PrescriptionInfoDetailDto; import com.openhis.web.doctorstation.dto.ReceptionStatisticsDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 医生站-主页面 应用Mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationPtDetailsAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationPtDetailsAppMapper.java index e153f8f9..187c5139 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationPtDetailsAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationPtDetailsAppMapper.java @@ -1,11 +1,10 @@ package com.openhis.web.doctorstation.mapper; -import java.util.List; - +import com.openhis.web.doctorstation.dto.PatientDetailsDto; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.openhis.web.doctorstation.dto.PatientDetailsDto; +import java.util.List; /** * 医生站-患者详情 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/ReservationRecordAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/ReservationRecordAppMapper.java index 5abf8749..3f4f0ce1 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/ReservationRecordAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/ReservationRecordAppMapper.java @@ -1,13 +1,12 @@ package com.openhis.web.doctorstation.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.doctorstation.dto.ReservationRecordDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; /** * 医生站-预约记录 应用Mapper 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 89a3a3a8..e9f6e26d 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.doctorstation.utils; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.text.SimpleDateFormat; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Component; - import com.core.common.enums.TenantOptionDict; import com.core.common.utils.AssignSeqUtil; import com.core.common.utils.SecurityUtils; @@ -35,6 +25,14 @@ import com.openhis.workflow.service.IActivityDefinitionService; import com.openhis.workflow.service.IDeviceDispenseService; import com.openhis.workflow.service.IDeviceRequestService; import com.openhis.workflow.service.IServiceRequestService; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; /** * 医嘱工具类 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/DoctorStationSendApplyUtil.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/DoctorStationSendApplyUtil.java index c514abb9..af17c21d 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/DoctorStationSendApplyUtil.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/DoctorStationSendApplyUtil.java @@ -1,11 +1,5 @@ package com.openhis.web.doctorstation.utils; -import java.util.Date; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - import com.core.common.exception.ServiceException; import com.core.common.utils.AgeCalculatorUtil; import com.openhis.administration.domain.Organization; @@ -26,8 +20,12 @@ import com.openhis.workflow.domain.ActivityDefinition; import com.openhis.workflow.domain.ServiceRequest; import com.openhis.workflow.service.IActivityDefinitionService; import com.openhis.workflow.service.IServiceRequestService; - import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Date; +import java.util.List; /** * 跨系统发送申请工具类 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 8c79ead7..5b4f9271 100644 --- 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 @@ -1,5 +1,11 @@ package com.openhis.web.doctorstation.utils; +import com.core.common.utils.AssignSeqUtil; +import com.openhis.common.enums.AssignSeqEnum; +import com.openhis.web.doctorstation.dto.AdviceSaveDto; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collections; @@ -7,14 +13,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.annotation.Resource; - -import org.springframework.stereotype.Component; - -import com.core.common.utils.AssignSeqUtil; -import com.openhis.common.enums.AssignSeqEnum; -import com.openhis.web.doctorstation.dto.AdviceSaveDto; - /** * 处方号工具类 */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocDefinitionOrganizationAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocDefinitionOrganizationAppService.java index e5e12d43..c493e41c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocDefinitionOrganizationAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocDefinitionOrganizationAppService.java @@ -3,8 +3,6 @@ package com.openhis.web.document.appservice; import com.core.common.core.domain.R; import com.openhis.web.document.dto.DocDefinitionOrganizationDto; -import java.util.List; - /** * 文书定义 应用Service */ 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 8365c569..8fed9276 100644 --- 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 @@ -1,14 +1,13 @@ package com.openhis.web.document.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - import com.core.common.core.domain.R; 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 java.util.List; + /** * 文书记录 应用Service */ 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 b42369e9..87124b44 100644 --- 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 @@ -1,13 +1,12 @@ package com.openhis.web.document.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - 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 java.util.List; + /** * 文档模板 业务接口 */ 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 bd9b4e53..3100e3bf 100644 --- 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 @@ -1,13 +1,5 @@ package com.openhis.web.document.appservice.impl; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -27,8 +19,13 @@ import com.openhis.web.document.dto.DocDefinitionOrganizationDto; import com.openhis.web.document.dto.DocDefinitonParam; import com.openhis.web.document.mapper.DocDefinitionAppMapper; import com.openhis.web.document.util.DocumentDirectoryProcessor; - import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; @Slf4j @Service 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 d39153cb..cb8a22d9 100644 --- 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 @@ -1,27 +1,5 @@ package com.openhis.web.document.appservice.impl; -import java.math.BigDecimal; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Timestamp; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.ZoneId; -import java.time.format.DateTimeFormatter; -import java.time.temporal.ChronoUnit; -import java.util.*; -import java.util.regex.Pattern; -import java.util.stream.Collectors; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.core.BatchPreparedStatementSetter; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.stereotype.Service; - import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -48,8 +26,27 @@ import com.openhis.web.document.mapper.DocRecordAppMapper; import com.openhis.web.document.util.ConvertToDocStatistics; import com.openhis.web.document.util.OperationDayCalculator; import com.openhis.web.document.util.PermissionProcessor; - import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +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 java.math.BigDecimal; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Timestamp; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoUnit; +import java.util.*; +import java.util.regex.Pattern; +import java.util.stream.Collectors; @Slf4j @Service 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 903ef623..9f0edd3d 100644 --- 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 @@ -1,13 +1,5 @@ package com.openhis.web.document.appservice.impl; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -24,8 +16,13 @@ import com.openhis.document.service.IDocStatisticsService; import com.openhis.web.document.appservice.IDocStatisticsAppService; import com.openhis.web.document.dto.DocStatisticsDto; 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 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 83093933..21f7f552 100644 --- 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 @@ -1,14 +1,5 @@ package com.openhis.web.document.appservice.impl; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -26,8 +17,14 @@ import com.openhis.web.document.appservice.IDocStatisticsDefinitionAppService; import com.openhis.web.document.dto.DocStatisticsDefinitionDto; import com.openhis.web.document.dto.OptionDto; import com.openhis.web.document.mapper.DocStatisticsDefinitionAppMapper; - 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 java.util.*; +import java.util.stream.Collectors; /** * 文档模板 业务实现类 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocDefinitionController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocDefinitionController.java index fb694bfe..57e6955a 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocDefinitionController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocDefinitionController.java @@ -1,12 +1,5 @@ package com.openhis.web.document.controller; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.common.enums.DocPermissionEnum; import com.openhis.common.enums.DocTypeEnum; @@ -15,9 +8,14 @@ import com.openhis.web.document.appservice.IDocDefinitionAppService; import com.openhis.web.document.dto.DocDefinitionDto; import com.openhis.web.document.dto.DocDefinitonParam; import com.openhis.web.document.util.EnumUtil; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 文书定义 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocDefinitionOrganizationController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocDefinitionOrganizationController.java index 92a74054..68ac45fa 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocDefinitionOrganizationController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocDefinitionOrganizationController.java @@ -1,7 +1,6 @@ package com.openhis.web.document.controller; import com.core.common.core.domain.R; -import com.openhis.web.document.appservice.IDocDefinitionAppService; import com.openhis.web.document.appservice.IDocDefinitionOrganizationAppService; import com.openhis.web.document.dto.DocDefinitionOrganizationDto; import lombok.AllArgsConstructor; 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 9f78a96f..fe697295 100644 --- 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 @@ -1,13 +1,5 @@ package com.openhis.web.document.controller; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.common.enums.DocStatusEnum; import com.openhis.common.enums.DocTypeEnum; @@ -16,9 +8,14 @@ import com.openhis.web.document.dto.DocRecordDto; import com.openhis.web.document.dto.DocRecordPatientQueryParam; import com.openhis.web.document.dto.DocRecordQueryParam; import com.openhis.web.document.util.EnumUtil; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 文书记录 controller 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 94e35e54..93f7b433 100644 --- 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 @@ -1,7 +1,6 @@ package com.openhis.web.document.controller; import com.core.common.core.domain.R; -import com.openhis.web.document.appservice.IDocRecordAppService; import com.openhis.web.document.appservice.IDocStatisticsAppService; import com.openhis.web.document.dto.DocStatisticsDto; import com.openhis.web.document.dto.DocStatisticsQueryParam; 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 46f888f9..10ffd550 100644 --- 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 @@ -1,21 +1,18 @@ package com.openhis.web.document.controller; -import java.util.HashMap; -import java.util.Map; - -import com.openhis.web.document.dto.DocTemplateDto; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.common.enums.DocTypeEnum; import com.openhis.common.enums.DocUseRangeEnum; import com.openhis.web.document.appservice.IDocTemplateAppService; +import com.openhis.web.document.dto.DocTemplateDto; import com.openhis.web.document.util.EnumUtil; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.Map; /** * 文书模板/病历模板 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitionDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitionDto.java index 3469fbb4..42c771ad 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitionDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitionDto.java @@ -2,7 +2,6 @@ package com.openhis.web.document.dto; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitonParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitonParam.java index 81742f4e..efce05ed 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitonParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitonParam.java @@ -1,7 +1,5 @@ package com.openhis.web.document.dto; -import com.core.common.core.domain.R; -import com.core.common.utils.SecurityUtils; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientDto.java index df4ae6d3..7ba68945 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientDto.java @@ -1,15 +1,13 @@ package com.openhis.web.document.dto; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; @Data @Accessors(chain = true) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientQueryParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientQueryParam.java index fdd91d9b..51d67db8 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientQueryParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientQueryParam.java @@ -1,6 +1,5 @@ package com.openhis.web.document.dto; -import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -9,7 +8,6 @@ import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; -import java.util.List; @Data @Accessors(chain = true) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionDto.java index 58914706..88be61c3 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionDto.java @@ -1,6 +1,5 @@ package com.openhis.web.document.dto; -import com.core.common.annotation.Excel; import com.core.common.core.domain.entity.SysDictData; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/OptionDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/OptionDto.java index 06e8c301..dc3390db 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/OptionDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/OptionDto.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; -import java.util.List; - @Data @Accessors(chain = true) public class OptionDto { diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsBig.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsBig.java index de9e51de..7aae14a7 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsBig.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsBig.java @@ -1,13 +1,13 @@ package com.openhis.web.document.dto; -import java.util.ArrayList; -import java.util.List; - import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import java.util.ArrayList; +import java.util.List; + /** * 温度、脉搏等生命体征信息 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsOutput.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsOutput.java index 30532e8a..2793ac25 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsOutput.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsOutput.java @@ -1,16 +1,14 @@ package com.openhis.web.document.dto; -import java.util.Date; -import java.util.List; - -import org.springframework.format.annotation.DateTimeFormat; - import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +import java.util.List; /** * 体温单 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsSmall.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsSmall.java index 50232226..edd00921 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsSmall.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsSmall.java @@ -1,15 +1,13 @@ package com.openhis.web.document.dto; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * 图表信息 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocStatisticsDefinitionAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocStatisticsDefinitionAppMapper.java index 6055cee0..029c0915 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocStatisticsDefinitionAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocStatisticsDefinitionAppMapper.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.openhis.web.document.dto.DocRecordPatientDto; import com.openhis.web.document.dto.DocStatisticsDefinitionDto; import com.openhis.web.document.dto.OptionDto; import org.apache.ibatis.annotations.Param; 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 e3a06ec8..79fc9313 100644 --- 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 @@ -1,26 +1,24 @@ package com.openhis.web.document.util; -import static com.core.framework.datasource.DynamicDataSourceContextHolder.log; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.core.common.utils.StringUtils; +import com.openhis.common.enums.TemperatureChartEnum; +import com.openhis.web.document.appservice.IDocStatisticsDefinitionAppService; +import com.openhis.web.document.dto.DocRecordDto; +import com.openhis.web.document.dto.DocStatisticsDefinitionDto; +import com.openhis.web.document.dto.DocStatisticsDto; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Set; -import javax.annotation.Resource; - -import com.core.common.utils.StringUtils; -import org.springframework.stereotype.Component; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.openhis.common.enums.TemperatureChartEnum; -import com.openhis.web.document.appservice.IDocStatisticsDefinitionAppService; -import com.openhis.web.document.dto.DocRecordDto; -import com.openhis.web.document.dto.DocStatisticsDefinitionDto; -import com.openhis.web.document.dto.DocStatisticsDto; +import static com.core.framework.datasource.DynamicDataSourceContextHolder.log; @Component public class ConvertToDocStatistics { diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/PermissionProcessor.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/PermissionProcessor.java index 87e759f6..f1ca3e07 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/PermissionProcessor.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/PermissionProcessor.java @@ -1,12 +1,10 @@ package com.openhis.web.document.util; -import com.core.common.annotation.Excel; import com.core.common.core.domain.entity.SysRole; import com.core.common.utils.SecurityUtils; import com.openhis.common.enums.DocPermissionEnum; import com.openhis.web.document.dto.DocDefinitionDto; -import java.util.ArrayList; import java.util.List; public class PermissionProcessor { diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/impl/BankPosCloudAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/impl/BankPosCloudAppServiceImpl.java index d9cc456d..4b20df2f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/impl/BankPosCloudAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/impl/BankPosCloudAppServiceImpl.java @@ -1,8 +1,5 @@ package com.openhis.web.externalintegration.appservice.impl; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - import com.alibaba.fastjson.JSON; import com.core.common.core.domain.R; import com.core.common.enums.TenantOptionDict; @@ -14,8 +11,9 @@ import com.openhis.web.externalintegration.enums.BpcPayType; import com.openhis.web.externalintegration.enums.BpcTranType; import com.openhis.web.externalintegration.utils.BpcHttpUtil; import com.openhis.web.externalintegration.utils.BpcTraceNoGenerator; - import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; /** * BPC商户接口Service业务层处理 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/impl/FoodborneAcquisitionAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/impl/FoodborneAcquisitionAppServiceImpl.java index f87507ab..37063532 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/impl/FoodborneAcquisitionAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/impl/FoodborneAcquisitionAppServiceImpl.java @@ -1,21 +1,5 @@ package com.openhis.web.externalintegration.appservice.impl; -import java.io.IOException; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; - -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.util.EntityUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.core.common.core.domain.R; @@ -27,8 +11,22 @@ import com.openhis.common.utils.CommonUtil; import com.openhis.web.externalintegration.appservice.IFoodborneAcquisitionAppService; import com.openhis.web.externalintegration.dto.FaSimplediseaseAddNopwParam; import com.openhis.web.externalintegration.mapper.FoodborneAcquisitionAppMapper; - import lombok.extern.slf4j.Slf4j; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.util.EntityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.io.IOException; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; /** * 食源性疾病病例数据智能采集Service业务层处理 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/controller/FoodborneAcquisitionAppController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/controller/FoodborneAcquisitionAppController.java index 6a2169e1..1f09f256 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/controller/FoodborneAcquisitionAppController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/controller/FoodborneAcquisitionAppController.java @@ -1,14 +1,13 @@ package com.openhis.web.externalintegration.controller; +import com.core.common.core.domain.R; +import com.openhis.web.externalintegration.appservice.IFoodborneAcquisitionAppService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.core.common.core.domain.R; -import com.openhis.web.externalintegration.appservice.IFoodborneAcquisitionAppService; - /** * 食源性疾病病例数据智能采集Controller * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcDataElementDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcDataElementDto.java index ccc89d2e..241bb615 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcDataElementDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcDataElementDto.java @@ -1,10 +1,8 @@ package com.openhis.web.externalintegration.dto; -import org.hibernate.validator.constraints.Length; - import com.alibaba.fastjson2.annotation.JSONField; - import lombok.Data; +import org.hibernate.validator.constraints.Length; /** * 【BPC】数据元 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcPaymentScanNotifyDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcPaymentScanNotifyDto.java index dae6eec3..ffb9866a 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcPaymentScanNotifyDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcPaymentScanNotifyDto.java @@ -1,10 +1,8 @@ package com.openhis.web.externalintegration.dto; -import org.hibernate.validator.constraints.Length; - import com.alibaba.fastjson2.annotation.JSONField; - import lombok.Data; +import org.hibernate.validator.constraints.Length; /** * 【BPC】主扫支付结果通知 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcTransactionRequestDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcTransactionRequestDto.java index bd0334be..46a4edd6 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcTransactionRequestDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcTransactionRequestDto.java @@ -1,11 +1,9 @@ package com.openhis.web.externalintegration.dto; -import org.hibernate.validator.constraints.Length; - import com.alibaba.fastjson2.annotation.JSONField; - import lombok.Data; import lombok.experimental.Accessors; +import org.hibernate.validator.constraints.Length; /** * 【BPC】交易请求 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcTransactionResponseDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcTransactionResponseDto.java index a779ce69..d37dbcfa 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcTransactionResponseDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcTransactionResponseDto.java @@ -1,10 +1,8 @@ package com.openhis.web.externalintegration.dto; -import org.hibernate.validator.constraints.Length; - import com.alibaba.fastjson2.annotation.JSONField; - import lombok.Data; +import org.hibernate.validator.constraints.Length; /** * 【BPC】交易回应 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/mapper/FoodborneAcquisitionAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/mapper/FoodborneAcquisitionAppMapper.java index 3d646f61..e5f91685 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/mapper/FoodborneAcquisitionAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/mapper/FoodborneAcquisitionAppMapper.java @@ -1,11 +1,10 @@ package com.openhis.web.externalintegration.mapper; -import java.util.List; - +import com.openhis.web.externalintegration.dto.FaSimplediseaseAddNopwParam; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.openhis.web.externalintegration.dto.FaSimplediseaseAddNopwParam; +import java.util.List; /** * 食源性疾病病例数据智能采集Mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/utils/BpcHttpUtil.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/utils/BpcHttpUtil.java index 3f37415d..c290ac6a 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/utils/BpcHttpUtil.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/utils/BpcHttpUtil.java @@ -1,5 +1,12 @@ package com.openhis.web.externalintegration.utils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.OutputStream; @@ -10,15 +17,6 @@ import java.security.MessageDigest; import java.security.SecureRandom; import java.security.cert.X509Certificate; -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; - -import org.springframework.stereotype.Component; - -import lombok.extern.slf4j.Slf4j; - /** * 【BPC】HTTP请求共通方法 * 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 03932e0c..75dd02b5 100644 --- 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 @@ -1,7 +1,5 @@ package com.openhis.web.inhospitalcharge.appservice; -import java.util.List; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.core.common.core.domain.R; import com.openhis.web.inhospitalcharge.dto.AdvancePaymentFlowRecordDto; @@ -9,6 +7,7 @@ import com.openhis.web.inhospitalcharge.dto.AdvancePaymentInAndOutDto; import com.openhis.web.inhospitalcharge.dto.AdvancePaymentInfoDto; import javax.servlet.http.HttpServletRequest; +import java.util.List; /** * 预交金管理 应用Service 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 2726493f..efabcb3d 100644 --- 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 @@ -1,15 +1,14 @@ package com.openhis.web.inhospitalcharge.appservice; -import java.util.HashMap; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - import com.baomidou.mybatisplus.core.metadata.IPage; 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 java.util.HashMap; +import java.util.List; + /** * 住院登记 应用Service */ 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 4139de8c..4f03ba53 100644 --- 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 @@ -1,13 +1,5 @@ package com.openhis.web.inhospitalcharge.appservice.impl; -import java.math.BigDecimal; -import java.util.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -33,8 +25,13 @@ import com.openhis.web.inhospitalcharge.dto.AdvancePaymentFlowRecordDto; import com.openhis.web.inhospitalcharge.dto.AdvancePaymentInAndOutDto; import com.openhis.web.inhospitalcharge.dto.AdvancePaymentInfoDto; 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 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 21694e52..526c7bf3 100644 --- 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 @@ -1,13 +1,5 @@ package com.openhis.web.inhospitalcharge.appservice.impl; -import java.math.BigDecimal; -import java.util.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -37,8 +29,13 @@ import com.openhis.web.inhospitalcharge.mapper.InHospitalRegisterAppMapper; import com.openhis.web.patientmanage.appservice.IPatientInformationService; import com.openhis.web.patientmanage.dto.PatientBaseInfoDto; 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 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 bd950051..1b0c468c 100644 --- 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 @@ -3,17 +3,15 @@ */ package com.openhis.web.inhospitalcharge.controller; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.inhospitalcharge.appservice.IAdvancePaymentManageAppService; import com.openhis.web.inhospitalcharge.dto.AdvancePaymentInAndOutDto; import com.openhis.web.inhospitalcharge.dto.AdvancePaymentInfoDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.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 ffe5ddce..24b459ac 100644 --- 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 @@ -3,16 +3,14 @@ */ package com.openhis.web.inhospitalcharge.controller; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.inhospitalcharge.appservice.IInHospitalRegisterAppService; import com.openhis.web.inhospitalcharge.dto.*; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; /** * 住院登记 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentFlowRecordDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentFlowRecordDto.java index 87a12b7f..1a1b760c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentFlowRecordDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentFlowRecordDto.java @@ -1,15 +1,13 @@ package com.openhis.web.inhospitalcharge.dto; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + import java.math.BigDecimal; import java.util.Date; -import org.springframework.format.annotation.DateTimeFormat; - -import com.fasterxml.jackson.annotation.JsonFormat; - -import lombok.Data; -import lombok.experimental.Accessors; - /** * 预交金支付流水记录 dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentInAndOutDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentInAndOutDto.java index faa1e33b..2c67315e 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentInAndOutDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentInAndOutDto.java @@ -1,13 +1,12 @@ package com.openhis.web.inhospitalcharge.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 预交金进出 dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentInfoDto.java index 102db051..c3daf27c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/AdvancePaymentInfoDto.java @@ -1,16 +1,14 @@ package com.openhis.web.inhospitalcharge.dto; -import java.math.BigDecimal; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; /** * 预交金信息 dto diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalInfoDto.java index e9532ae1..1a397c63 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalInfoDto.java @@ -1,17 +1,15 @@ package com.openhis.web.inhospitalcharge.dto; -import java.math.BigDecimal; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; /** * 住院信息 dto diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalPatientInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalPatientInfoDto.java index 207cf033..e0e64117 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalPatientInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalPatientInfoDto.java @@ -1,16 +1,14 @@ package com.openhis.web.inhospitalcharge.dto; -import java.util.Date; - +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import org.springframework.format.annotation.DateTimeFormat; - -import com.fasterxml.jackson.annotation.JsonFormat; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * 住院患者信息 dto diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalRegisterDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalRegisterDto.java index ed004423..6e2d39ca 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalRegisterDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalRegisterDto.java @@ -1,13 +1,12 @@ package com.openhis.web.inhospitalcharge.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 住院登记基础 dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java index e1cea677..a8aac2aa 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java @@ -1,16 +1,14 @@ package com.openhis.web.inhospitalcharge.dto; -import java.util.Date; - -import com.openhis.common.annotation.Dict; -import org.springframework.format.annotation.DateTimeFormat; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - +import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * 住院登记查询 dto diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/NoFilesRegisterDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/NoFilesRegisterDto.java index e301f6e2..3e5968ed 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/NoFilesRegisterDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/NoFilesRegisterDto.java @@ -1,7 +1,6 @@ package com.openhis.web.inhospitalcharge.dto; import com.openhis.web.patientmanage.dto.PatientBaseInfoDto; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/PatientUpdateDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/PatientUpdateDto.java index 73078565..2f9a24c0 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/PatientUpdateDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/dto/PatientUpdateDto.java @@ -2,7 +2,6 @@ package com.openhis.web.inhospitalcharge.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/mapper/AdvancePaymentManageAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/mapper/AdvancePaymentManageAppMapper.java index 66520d15..27ed85db 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/mapper/AdvancePaymentManageAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/mapper/AdvancePaymentManageAppMapper.java @@ -1,16 +1,15 @@ package com.openhis.web.inhospitalcharge.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.inhospitalcharge.dto.AdvancePaymentFlowRecordDto; import com.openhis.web.inhospitalcharge.dto.AdvancePaymentInfoDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 预交金管理 应用Mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java index 58c147bd..0d3de8cb 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalcharge/mapper/InHospitalRegisterAppMapper.java @@ -1,10 +1,5 @@ package com.openhis.web.inhospitalcharge.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; @@ -13,6 +8,10 @@ import com.openhis.administration.domain.Location; import com.openhis.web.inhospitalcharge.dto.InHospitalInfoDto; import com.openhis.web.inhospitalcharge.dto.InHospitalPatientInfoDto; import com.openhis.web.inhospitalcharge.dto.InHospitalRegisterQueryDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 住院登记 应用Mapper 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 2dc87aa1..0f9cc043 100644 --- 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 @@ -3,13 +3,13 @@ */ package com.openhis.web.inhospitalnursestation.appservice; -import javax.servlet.http.HttpServletRequest; - import com.core.common.core.domain.R; 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; + /** * 入出转管理 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 9739acf4..0a77dfbf 100644 --- 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 @@ -3,16 +3,15 @@ */ package com.openhis.web.inhospitalnursestation.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - import com.core.common.core.domain.R; import com.openhis.web.common.dto.PerformInfoDto; 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 java.util.List; + /** * 护士站医嘱处理接口 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IEncounterAutoRollAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IEncounterAutoRollAppService.java index c183fd28..a5b166bc 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IEncounterAutoRollAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IEncounterAutoRollAppService.java @@ -1,13 +1,13 @@ package com.openhis.web.inhospitalnursestation.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.inhospitalnursestation.dto.AutoRollSourceDto; import com.openhis.web.inhospitalnursestation.dto.EncounterAutoRollQueryDto; import com.openhis.web.inhospitalnursestation.dto.EncounterAutoRollSaveDto; import com.openhis.web.inhospitalnursestation.dto.InBedPatientInfoDto; +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 7ea0fc69..e80f0ed6 100644 --- 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 @@ -1,13 +1,12 @@ package com.openhis.web.inhospitalnursestation.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - 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 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 40386a3d..67469b51 100644 --- 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 @@ -1,17 +1,16 @@ package com.openhis.web.inhospitalnursestation.appservice; -import java.time.LocalDateTime; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.core.common.core.domain.R; import com.openhis.administration.dto.CostDetailSearchParam; 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 java.time.LocalDateTime; +import java.util.List; + public interface INurseBillingAppService { /* 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 82c7bfa8..c99a1604 100644 --- 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 @@ -3,15 +3,6 @@ */ package com.openhis.web.inhospitalnursestation.appservice.impl; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -48,6 +39,13 @@ import com.openhis.web.inhospitalnursestation.dto.*; import com.openhis.web.inhospitalnursestation.mapper.ATDManageAppMapper; import com.openhis.workflow.domain.ServiceRequest; import com.openhis.workflow.service.IServiceRequestService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import javax.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 0f1f6401..46dc1a61 100644 --- 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 @@ -3,19 +3,6 @@ */ package com.openhis.web.inhospitalnursestation.appservice.impl; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.format.DateTimeFormatter; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -59,6 +46,17 @@ import com.openhis.workflow.domain.DeviceDispense; import com.openhis.workflow.domain.DeviceRequest; 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 java.math.BigDecimal; +import java.math.RoundingMode; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +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/EncounterAutoRollAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/EncounterAutoRollAppServiceImpl.java index 03def7e8..b37c2325 100644 --- 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 @@ -1,16 +1,5 @@ package com.openhis.web.inhospitalnursestation.appservice.impl; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.Date; -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -30,6 +19,15 @@ import com.openhis.web.doctorstation.dto.AdvicePriceDto; import com.openhis.web.inhospitalnursestation.appservice.IEncounterAutoRollAppService; import com.openhis.web.inhospitalnursestation.dto.*; import com.openhis.web.inhospitalnursestation.mapper.EncounterAutoRollAppMapper; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.Date; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; /** * 住院就诊滚方 应用实现类 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 16250979..f020036c 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.inhospitalnursestation.appservice.impl; -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; @@ -35,6 +25,14 @@ import com.openhis.web.pharmacymanage.dto.DispenseStatusOption; import com.openhis.web.pharmacymanage.mapper.ReturnMedicineMapper; 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 java.math.BigDecimal; +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/NurseBillingAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/NurseBillingAppService.java index 15fb46d1..da3cec9a 100644 --- 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 @@ -1,17 +1,5 @@ package com.openhis.web.inhospitalnursestation.appservice.impl; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; @@ -49,6 +37,16 @@ import com.openhis.workflow.service.IActivityDefinitionService; import com.openhis.workflow.service.IDeviceDispenseService; import com.openhis.workflow.service.IDeviceRequestService; 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 java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.*; +import java.util.stream.Collectors; /** * 住院护士站划价服务实现类 核心职责： 1. 临时耗材划价签发（含耗材请求生成、发放记录创建、费用项关联） 2. 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 677d0547..bd957821 100644 --- 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 @@ -3,19 +3,17 @@ */ package com.openhis.web.inhospitalnursestation.controller; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.inhospitalnursestation.appservice.IATDManageAppService; import com.openhis.web.inhospitalnursestation.dto.AdmissionPageParam; import com.openhis.web.inhospitalnursestation.dto.AdmissionPatientInfoDto; import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceParam; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.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 eaec376b..fd2d0439 100644 --- 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 @@ -3,22 +3,19 @@ */ package com.openhis.web.inhospitalnursestation.controller; -import java.util.List; +import com.core.common.core.domain.R; +import com.openhis.web.common.dto.PerformInfoDto; +import com.openhis.web.inhospitalnursestation.appservice.IAdviceProcessAppService; +import com.openhis.web.inhospitalnursestation.dto.AdmissionPageParam; +import com.openhis.web.inhospitalnursestation.dto.AdviceExecuteParam; +import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceParam; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; - -import com.openhis.web.common.dto.PerformInfoDto; -import com.openhis.web.inhospitalnursestation.dto.AdviceExecuteParam; -import org.springframework.web.bind.annotation.*; - -import com.core.common.core.domain.R; -import com.openhis.web.inhospitalnursestation.appservice.IAdviceProcessAppService; -import com.openhis.web.inhospitalnursestation.dto.AdmissionPageParam; -import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceParam; - -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; +import java.util.List; /** * 护士站医嘱处理 controller 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 c3707753..e703922d 100644 --- 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 @@ -1,16 +1,14 @@ package com.openhis.web.inhospitalnursestation.controller; -import javax.annotation.Resource; - -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.common.enums.PublicationStatus; import com.openhis.web.inhospitalnursestation.appservice.IEncounterAutoRollAppService; import com.openhis.web.inhospitalnursestation.dto.EncounterAutoRollSaveDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.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 b27e89af..d56b5d55 100644 --- 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 @@ -1,19 +1,16 @@ package com.openhis.web.inhospitalnursestation.controller; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.inhospitalnursestation.appservice.IMedicineSummaryAppService; import com.openhis.web.inhospitalnursestation.dto.DispenseFormSearchParam; import com.openhis.web.inhospitalnursestation.dto.MedicineSummaryParam; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.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 c2d7a968..0e520571 100644 --- 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 @@ -1,24 +1,21 @@ package com.openhis.web.inhospitalnursestation.controller; -import java.time.LocalDateTime; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.administration.dto.CostDetailSearchParam; import com.openhis.web.inhospitalnursestation.appservice.INurseBillingAppService; import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceParam; import com.openhis.web.regdoctorstation.dto.AdviceBatchOpParam; import com.openhis.web.regdoctorstation.dto.RegAdviceSaveParam; - import lombok.AllArgsConstructor; 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 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 05b75207..994fad50 100644 --- 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 @@ -1,17 +1,14 @@ package com.openhis.web.inhospitalnursestation.controller; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.inhospitalnursestation.appservice.IOrgDeviceStockTakeAppService; import com.openhis.web.inhospitalnursestation.dto.OrgDeviceSummaryParam; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/ATDManageInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/ATDManageInitDto.java index 31aee4cc..8ed681fb 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/ATDManageInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/ATDManageInitDto.java @@ -3,14 +3,11 @@ */ package com.openhis.web.inhospitalnursestation.dto; -import java.util.List; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 入出转管理页面初始化dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionBedPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionBedPageDto.java index a0280243..74c2a35d 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionBedPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionBedPageDto.java @@ -3,7 +3,6 @@ package com.openhis.web.inhospitalnursestation.dto; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientInfoDto.java index 60c9c233..00fc40fe 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientInfoDto.java @@ -3,16 +3,14 @@ */ package com.openhis.web.inhospitalnursestation.dto; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - -import com.openhis.common.enums.Whether; import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 入院患者基本信息 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientPageDto.java index 8d3b5e9d..06f54293 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientPageDto.java @@ -3,16 +3,15 @@ */ package com.openhis.web.inhospitalnursestation.dto; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 入院患者分页dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdviceExecuteDetailParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdviceExecuteDetailParam.java index 577dd675..1100c39c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdviceExecuteDetailParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdviceExecuteDetailParam.java @@ -3,14 +3,13 @@ */ package com.openhis.web.inhospitalnursestation.dto; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 医嘱执行详细参数 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdviceExecuteParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdviceExecuteParam.java index 5e3ace33..9a163ade 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdviceExecuteParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdviceExecuteParam.java @@ -3,14 +3,14 @@ */ package com.openhis.web.inhospitalnursestation.dto; -import java.util.Date; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; +import java.util.List; + /** * 医嘱执行参数 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollBasicServiceDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollBasicServiceDto.java index 0be297a8..a42a25f2 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollBasicServiceDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollBasicServiceDto.java @@ -1,13 +1,12 @@ package com.openhis.web.inhospitalnursestation.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 自动滚方基础服务 Dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollNursingDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollNursingDto.java index 173befcd..a2748fcb 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollNursingDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollNursingDto.java @@ -1,13 +1,12 @@ package com.openhis.web.inhospitalnursestation.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 自动滚方护理医嘱 Dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollSourceDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollSourceDto.java index d3a8f324..605e9072 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollSourceDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollSourceDto.java @@ -3,7 +3,6 @@ package com.openhis.web.inhospitalnursestation.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/CostDetailExcelOutDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/CostDetailExcelOutDto.java index 9404767e..de7c12eb 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/CostDetailExcelOutDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/CostDetailExcelOutDto.java @@ -1,15 +1,14 @@ package com.openhis.web.inhospitalnursestation.dto; -import java.util.List; - import com.core.common.annotation.Excel; import com.openhis.administration.dto.CostDetailDto; - import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import java.util.List; + /** * 住院记账-费用明细导出专用DTO * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/DispenseFormSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/DispenseFormSearchParam.java index a0992b86..18b0d04e 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/DispenseFormSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/DispenseFormSearchParam.java @@ -3,15 +3,14 @@ */ package com.openhis.web.inhospitalnursestation.dto; -import java.io.Serializable; -import java.util.Date; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; + /** * 患者列表查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAccountDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAccountDto.java index 3089fd33..356d0ba5 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAccountDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAccountDto.java @@ -1,13 +1,12 @@ package com.openhis.web.inhospitalnursestation.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 就诊消费 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAutoRollQueryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAutoRollQueryDto.java index ba841320..e1c4f1f9 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAutoRollQueryDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAutoRollQueryDto.java @@ -1,13 +1,12 @@ package com.openhis.web.inhospitalnursestation.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 自动滚方绑定 查询Dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAutoRollSaveDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAutoRollSaveDto.java index 892d08f2..128b09f9 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAutoRollSaveDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAutoRollSaveDto.java @@ -1,13 +1,12 @@ package com.openhis.web.inhospitalnursestation.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 自动滚方绑定 保存Dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InBedPatientInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InBedPatientInfoDto.java index 45f1af41..e9e427a4 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InBedPatientInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InBedPatientInfoDto.java @@ -2,7 +2,6 @@ package com.openhis.web.inhospitalnursestation.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceDto.java index 3c554a15..be06f1bd 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceDto.java @@ -3,19 +3,18 @@ */ package com.openhis.web.inhospitalnursestation.dto; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; import com.openhis.web.common.dto.PerformRecordDto; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + /** * 住院医嘱dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicationRequestUseExe.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicationRequestUseExe.java index d1f816da..d7ef0965 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicationRequestUseExe.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicationRequestUseExe.java @@ -3,16 +3,15 @@ */ package com.openhis.web.inhospitalnursestation.dto; -import java.math.BigDecimal; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.medication.domain.MedicationRequest; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.List; + /** * 药品请求用于执行 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineDispenseFormDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineDispenseFormDto.java index be201efb..926cdc77 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineDispenseFormDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineDispenseFormDto.java @@ -3,17 +3,16 @@ */ package com.openhis.web.inhospitalnursestation.dto; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +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/inhospitalnursestation/dto/MedicineSummaryFormDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryFormDto.java index 6ce49de4..7b2c036a 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryFormDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryFormDto.java @@ -3,15 +3,14 @@ */ package com.openhis.web.inhospitalnursestation.dto; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 汇总单dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryInfoDto.java index 8387da71..f87f3dc5 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryInfoDto.java @@ -3,13 +3,12 @@ */ package com.openhis.web.inhospitalnursestation.dto; -import java.math.BigDecimal; - import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 汇总药品信息dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryParam.java index c7da6415..dc973ee4 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryParam.java @@ -3,15 +3,14 @@ */ package com.openhis.web.inhospitalnursestation.dto; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 药品汇总参数 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/PendingMedicationDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/PendingMedicationDto.java index 12decb2a..b04a440b 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/PendingMedicationDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/PendingMedicationDto.java @@ -1,15 +1,14 @@ package com.openhis.web.inhospitalnursestation.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 待配/退药 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/ServiceRequestUseExe.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/ServiceRequestUseExe.java index a71b117b..cb59be9c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/ServiceRequestUseExe.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/ServiceRequestUseExe.java @@ -3,16 +3,15 @@ */ package com.openhis.web.inhospitalnursestation.dto; -import java.math.BigDecimal; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.workflow.domain.ServiceRequest; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.List; + /** * 诊疗请求用于执行 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/ATDManageAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/ATDManageAppMapper.java index 509b6372..dfc788be 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/ATDManageAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/ATDManageAppMapper.java @@ -3,16 +3,15 @@ */ package com.openhis.web.inhospitalnursestation.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.common.dto.PerformRecordDto; import com.openhis.web.inhospitalnursestation.dto.*; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 入出转管理 appMapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/AdviceProcessAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/AdviceProcessAppMapper.java index 1fbcd8ed..95dd6bb3 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/AdviceProcessAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/AdviceProcessAppMapper.java @@ -3,9 +3,6 @@ */ package com.openhis.web.inhospitalnursestation.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,6 +10,8 @@ import com.openhis.web.inhospitalnursestation.dto.AdmissionPageParam; import com.openhis.web.inhospitalnursestation.dto.AdmissionPatientPageDto; import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceDto; import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceParam; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; /** * 护士站医嘱处理 mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/EncounterAutoRollAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/EncounterAutoRollAppMapper.java index ade8fa52..24fb9446 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/EncounterAutoRollAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/EncounterAutoRollAppMapper.java @@ -3,12 +3,11 @@ */ package com.openhis.web.inhospitalnursestation.mapper; -import java.util.List; - +import com.openhis.web.inhospitalnursestation.dto.*; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.openhis.web.inhospitalnursestation.dto.*; +import java.util.List; /** * 住院就诊滚方 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/MedicineSummaryAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/MedicineSummaryAppMapper.java index 4e828de9..2e7d689a 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/MedicineSummaryAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/MedicineSummaryAppMapper.java @@ -3,11 +3,6 @@ */ package com.openhis.web.inhospitalnursestation.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,6 +10,10 @@ import com.openhis.web.inhospitalnursestation.dto.DispenseFormSearchParam; import com.openhis.web.inhospitalnursestation.dto.MedicineDispenseFormDto; import com.openhis.web.inhospitalnursestation.dto.MedicineSummaryFormDto; import com.openhis.web.inhospitalnursestation.dto.MedicineSummaryInfoDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public interface MedicineSummaryAppMapper { diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/NurseBillingAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/NurseBillingAppMapper.java index a6b97bf9..15b200cb 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/NurseBillingAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/NurseBillingAppMapper.java @@ -1,18 +1,14 @@ package com.openhis.web.inhospitalnursestation.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceDto; import com.openhis.web.inhospitalnursestation.dto.InpatientAdviceParam; - -import lombok.Data; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; import java.time.LocalDateTime; -import java.util.Date; @Repository public interface NurseBillingAppMapper { 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 6c1a5f20..81ae6830 100644 --- 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 @@ -1,11 +1,11 @@ package com.openhis.web.inpatientmanage.appservice; -import javax.servlet.http.HttpServletRequest; - 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; + /** * 住院登记 应用实现 * 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 1250f3ab..178ecac1 100644 --- 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 @@ -1,14 +1,13 @@ package com.openhis.web.inpatientmanage.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - import com.core.common.core.domain.R; 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 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 1577809c..941498a2 100644 --- 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 @@ -1,14 +1,13 @@ package com.openhis.web.inpatientmanage.appservice; -import java.util.Date; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - 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 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 a49d81ec..9fba8936 100644 --- 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 @@ -1,14 +1,13 @@ package com.openhis.web.inpatientmanage.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - import com.core.common.core.domain.R; 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 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 074e27ed..45ef481c 100644 --- 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 @@ -1,14 +1,5 @@ package com.openhis.web.inpatientmanage.appservice.impl; -import java.util.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import com.openhis.yb.dto.PaymentDetailDto; -import com.openhis.yb.dto.PaymentDto; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -41,6 +32,13 @@ import com.openhis.web.inpatientmanage.dto.DepositDetailDto; import com.openhis.web.inpatientmanage.dto.DepositInitPageDto; import com.openhis.web.inpatientmanage.dto.DepositSearchParam; import com.openhis.web.inpatientmanage.mapper.DepositMapper; +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 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 624fe36f..e4e6b804 100644 --- 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 @@ -1,17 +1,5 @@ package com.openhis.web.inpatientmanage.appservice.impl; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import com.openhis.common.enums.EncounterActivityStatus; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -26,6 +14,7 @@ import com.openhis.administration.service.IPractitionerService; import com.openhis.common.constant.CommonConstants; import com.openhis.common.constant.PromptMsgConstant; import com.openhis.common.enums.AdministrativeGender; +import com.openhis.common.enums.EncounterActivityStatus; import com.openhis.common.enums.EncounterClass; import com.openhis.common.enums.LocationForm; import com.openhis.common.utils.EnumUtils; @@ -39,6 +28,15 @@ import com.openhis.document.service.IVitalSignsService; import com.openhis.web.inpatientmanage.appservice.INursingRecordAppService; import com.openhis.web.inpatientmanage.dto.*; 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 java.util.Arrays; +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/inpatientmanage/appservice/impl/PatientHomeAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/PatientHomeAppServiceImpl.java index f15a8ffc..17d642c9 100644 --- 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 @@ -1,12 +1,5 @@ package com.openhis.web.inpatientmanage.appservice.impl; -import java.util.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -31,6 +24,11 @@ import com.openhis.web.inpatientmanage.dto.PatientHomeDto; import com.openhis.web.inpatientmanage.dto.PatientHomeEmptyBedDto; 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 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 cceb5a18..ea58b033 100644 --- 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 @@ -1,25 +1,5 @@ package com.openhis.web.inpatientmanage.appservice.impl; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.ZoneId; -import java.time.temporal.ChronoUnit; -import java.util.*; -import java.util.function.BiConsumer; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -40,6 +20,24 @@ import com.openhis.document.service.IVitalSignsService; import com.openhis.web.inpatientmanage.appservice.IVitalSignsAppService; import com.openhis.web.inpatientmanage.dto.*; 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 java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.ZoneId; +import java.time.temporal.ChronoUnit; +import java.util.*; +import java.util.function.BiConsumer; /** * 三测单 实现类 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 c762c1b6..1ac15f3d 100644 --- 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 @@ -1,17 +1,15 @@ package com.openhis.web.inpatientmanage.controller; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import com.openhis.yb.dto.PaymentDto; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.inpatientmanage.appservice.IDepositAppService; import com.openhis.web.inpatientmanage.dto.DepositSearchParam; - +import com.openhis.yb.dto.PaymentDto; 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; /** * 预交金管理 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 b7a36c17..19450eeb 100644 --- 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 @@ -1,20 +1,17 @@ package com.openhis.web.inpatientmanage.controller; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.inpatientmanage.appservice.INursingRecordAppService; import com.openhis.web.inpatientmanage.dto.NursingEmrTemplateDto; import com.openhis.web.inpatientmanage.dto.NursingRecordDto; import com.openhis.web.inpatientmanage.dto.NursingSearchParam; - 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 java.util.List; /** * 护理记录单 controller 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 0d626995..017cb850 100644 --- 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 @@ -1,19 +1,16 @@ package com.openhis.web.inpatientmanage.controller; -import java.util.Date; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.inpatientmanage.appservice.IPatientHomeAppService; import com.openhis.web.inpatientmanage.dto.PatientHomeSearchParam; - import lombok.AllArgsConstructor; 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 java.util.Date; /** * 患者首页 应用实现 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 ec39d9c3..e9468732 100644 --- 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 @@ -1,20 +1,17 @@ package com.openhis.web.inpatientmanage.controller; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.inpatientmanage.appservice.IVitalSignsAppService; import com.openhis.web.inpatientmanage.dto.VitalSignsDeleteDto; import com.openhis.web.inpatientmanage.dto.VitalSignsSaveDto; import com.openhis.web.inpatientmanage.dto.VitalSignsSearchParam; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.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 ba1eb600..f3746bba 100644 --- 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 @@ -1,21 +1,16 @@ package com.openhis.web.inpatientmanage.dto; -import java.math.BigDecimal; -import java.util.Date; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import javax.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 8c6b17c5..b256553c 100644 --- 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 @@ -3,16 +3,14 @@ */ package com.openhis.web.inpatientmanage.dto; -import java.math.BigDecimal; - -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import javax.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 13a7f441..32305d30 100644 --- 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 @@ -1,17 +1,15 @@ package com.openhis.web.inpatientmanage.dto; -import java.util.Date; - -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import javax.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 c09b37a5..ae7fb383 100644 --- 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 @@ -3,16 +3,14 @@ */ package com.openhis.web.inpatientmanage.dto; -import java.io.Serializable; - -import javax.validation.constraints.NotBlank; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + /** * 病历模板Dto * 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 c4e910a0..44bf6d43 100644 --- 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 @@ -1,17 +1,15 @@ package com.openhis.web.inpatientmanage.dto; -import java.util.Date; - -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import javax.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 2f093743..38164026 100644 --- 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 @@ -3,17 +3,15 @@ */ package com.openhis.web.inpatientmanage.dto; -import java.util.Date; - -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import javax.validation.constraints.NotNull; +import java.util.Date; + /** * 护理记录单入参 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeDto.java index 41006699..04df3725 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeDto.java @@ -1,15 +1,14 @@ package com.openhis.web.inpatientmanage.dto; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 患者首页信息 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeEmptyBedDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeEmptyBedDto.java index f6ae679a..d197354e 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeEmptyBedDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeEmptyBedDto.java @@ -3,7 +3,6 @@ package com.openhis.web.inpatientmanage.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsDeleteDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsDeleteDto.java index 352849b7..f76ccec0 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsDeleteDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsDeleteDto.java @@ -1,7 +1,6 @@ package com.openhis.web.inpatientmanage.dto; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsDto.java index a89eb3ee..56d3d1d1 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsDto.java @@ -1,15 +1,14 @@ package com.openhis.web.inpatientmanage.dto; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 三测单信息 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsMedicalRecordDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsMedicalRecordDto.java index b1648e4a..45d9b8fe 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsMedicalRecordDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsMedicalRecordDto.java @@ -1,14 +1,14 @@ package com.openhis.web.inpatientmanage.dto; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.experimental.Accessors; +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/inpatientmanage/dto/VitalSignsSaveDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsSaveDto.java index fa10a506..a163009c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsSaveDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsSaveDto.java @@ -1,15 +1,14 @@ package com.openhis.web.inpatientmanage.dto; -import java.util.Date; - import com.core.common.core.domain.HisBaseEntity; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import java.util.Date; + /** * 生命体征管理 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsTemperaturePulsesDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsTemperaturePulsesDto.java index 8da0d2d6..67c697e2 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsTemperaturePulsesDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsTemperaturePulsesDto.java @@ -1,13 +1,13 @@ package com.openhis.web.inpatientmanage.dto; -import java.util.ArrayList; -import java.util.List; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.experimental.Accessors; +import java.util.ArrayList; +import java.util.List; + /** * 三测单信息 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/DepositMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/DepositMapper.java index 9dd97ff9..b935ea4d 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/DepositMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/DepositMapper.java @@ -1,13 +1,12 @@ package com.openhis.web.inpatientmanage.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.inpatientmanage.dto.DepositDetailDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; /** * 预交金管理 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/NursingRecordAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/NursingRecordAppMapper.java index 1a902d39..5b597ea7 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/NursingRecordAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/NursingRecordAppMapper.java @@ -1,8 +1,5 @@ package com.openhis.web.inpatientmanage.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; @@ -11,6 +8,8 @@ import com.openhis.web.inpatientmanage.dto.NursingDetailDto; import com.openhis.web.inpatientmanage.dto.NursingEmrTemplateDto; import com.openhis.web.inpatientmanage.dto.NursingPageDto; import com.openhis.web.inpatientmanage.dto.NursingSearchParam; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; /** * 护理记录单 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/PatientHomeAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/PatientHomeAppMapper.java index 1c3b2de6..71e435cf 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/PatientHomeAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/PatientHomeAppMapper.java @@ -1,16 +1,15 @@ package com.openhis.web.inpatientmanage.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.inpatientmanage.dto.PatientHomeDto; import com.openhis.web.inpatientmanage.dto.PatientHomeEmptyBedDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 患者首页 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/VitalSignsAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/VitalSignsAppMapper.java index c414464c..35c77318 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/VitalSignsAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/VitalSignsAppMapper.java @@ -1,11 +1,5 @@ package com.openhis.web.inpatientmanage.mapper; -import java.util.Date; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; @@ -13,6 +7,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.document.domain.VitalSigns; import com.openhis.web.inpatientmanage.dto.PatientHomeDto; import com.openhis.web.inpatientmanage.dto.VitalSignsDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.Date; +import java.util.List; /** * 三测单 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 e2d7513a..79d85f49 100644 --- 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 @@ -1,10 +1,10 @@ package com.openhis.web.inventorymanage.appservice; -import javax.servlet.http.HttpServletRequest; - import com.core.common.core.domain.R; import com.openhis.web.adjustprice.dto.AdjustPriceManagerSearchParam; +import javax.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 b5def940..bd89862f 100644 --- 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 @@ -3,13 +3,10 @@ */ package com.openhis.web.inventorymanage.appservice; -import javax.servlet.http.HttpServletRequest; - -import com.baomidou.mybatisplus.core.metadata.IPage; import com.core.common.core.domain.R; import com.openhis.web.inventorymanage.dto.InventoryDetailsSearchParam; -import com.openhis.web.inventorymanage.dto.InventoryStockTakeDetailDto; -import com.openhis.web.inventorymanage.dto.RequisitionOutSearchParam; + +import javax.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 8656fa67..01b63576 100644 --- 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 @@ -3,16 +3,15 @@ */ package com.openhis.web.inventorymanage.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.core.common.core.domain.R; 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 java.util.List; + /** * 报损单 appService * 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 8427fa43..bad07632 100644 --- 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 @@ -1,13 +1,12 @@ package com.openhis.web.inventorymanage.appservice; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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 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 1d19801e..f762ff1f 100644 --- 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 @@ -3,17 +3,16 @@ */ package com.openhis.web.inventorymanage.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.core.common.core.domain.R; import com.openhis.web.inventorymanage.dto.InventoryReceiptDetailDto; 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 java.util.List; + /** * 商品盘点 appService * 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 7d9bc3d8..b53188a1 100644 --- 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 @@ -3,16 +3,15 @@ */ package com.openhis.web.inventorymanage.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.core.common.core.domain.R; 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 java.util.List; + /** * 商品调拨 appService * 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 d36ff884..479019ef 100644 --- 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 @@ -3,15 +3,14 @@ */ package com.openhis.web.inventorymanage.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - 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 java.util.List; + /** * 采购入库 appService * 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 1d889922..c8bfe3f5 100644 --- 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 @@ -3,14 +3,12 @@ */ package com.openhis.web.inventorymanage.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.core.common.core.domain.R; import com.openhis.web.inventorymanage.dto.PurchaseReturnDetailDto; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + /** * 采购退货 appService * 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 d8eaffc0..30732bb3 100644 --- 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 @@ -3,16 +3,15 @@ */ package com.openhis.web.inventorymanage.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.core.common.core.domain.R; 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 java.util.List; + /** * 单据审批 appService * 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 c2325de2..a9863b81 100644 --- 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 @@ -3,15 +3,14 @@ */ package com.openhis.web.inventorymanage.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - 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 java.util.List; + /** * 领用出库 appService * 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 d6fda411..3f3f20ad 100644 --- 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 @@ -3,15 +3,14 @@ */ package com.openhis.web.inventorymanage.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - 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 java.util.List; + /** * 退货出库 appService * 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 51402f39..391a4f16 100644 --- 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 @@ -3,15 +3,14 @@ */ package com.openhis.web.inventorymanage.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - import com.core.common.core.domain.R; 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 java.util.List; + /** * 追溯码管理 appService * 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 45163deb..b5634d20 100644 --- 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 @@ -1,21 +1,9 @@ package com.openhis.web.inventorymanage.appservice.impl; -import java.util.Date; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; +import com.core.common.enums.DelFlag; import com.openhis.administration.domain.ChangePriceRecord; import com.openhis.administration.domain.ChargeItemDefDetail; import com.openhis.administration.domain.ChargeItemDefinition; @@ -25,7 +13,6 @@ import com.openhis.administration.service.IChargeItemDefDetailService; import com.openhis.administration.service.IChargeItemDefinitionService; import com.openhis.common.constant.CommonConstants; import com.openhis.common.enums.ConditionCode; -import com.core.common.enums.DelFlag; import com.openhis.common.enums.SupplyStatus; import com.openhis.common.enums.SupplyType; import com.openhis.common.utils.EnumUtils; @@ -38,6 +25,17 @@ import com.openhis.web.inventorymanage.appservice.IInventoryAdjustPriceService; import com.openhis.web.inventorymanage.dto.ReceiptApprovalSearchParam; import com.openhis.web.inventorymanage.dto.ReceiptInitDto; 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 java.util.Date; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * @ClassName IInventoryAdjustPriceServiceImpl 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 20b6630c..079ed36a 100644 --- 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 @@ -3,17 +3,6 @@ */ package com.openhis.web.inventorymanage.appservice.impl; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.apache.commons.lang3.tuple.Pair; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -34,6 +23,15 @@ import com.openhis.web.inventorymanage.dto.InventorySettlementSearchParam; import com.openhis.web.inventorymanage.mapper.InventorySettlementAppMapper; import com.openhis.workflow.domain.InventoryItem; import com.openhis.workflow.service.IInventoryItemService; +import org.apache.commons.lang3.tuple.Pair; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; /** * 动态盘点 实现类 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 15a24954..81931072 100644 --- 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 @@ -3,13 +3,6 @@ */ package com.openhis.web.inventorymanage.appservice.impl; -import java.util.HashSet; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; @@ -24,6 +17,11 @@ import com.openhis.web.inventorymanage.appservice.IInventoryDetailsAppService; import com.openhis.web.inventorymanage.dto.InventoryDetailsPageDto; import com.openhis.web.inventorymanage.dto.InventoryDetailsSearchParam; 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 java.util.HashSet; /** * 库存相关明细查询 impl 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 5ee8a8a1..ea821d07 100644 --- 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 @@ -3,19 +3,6 @@ */ package com.openhis.web.inventorymanage.appservice.impl; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; @@ -37,6 +24,17 @@ import com.openhis.web.inventorymanage.dto.*; import com.openhis.web.inventorymanage.mapper.LossReportFormMapper; import com.openhis.workflow.domain.SupplyRequest; 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 java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 报损单 impl 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 aa604a2b..f33d5886 100644 --- 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 @@ -1,19 +1,5 @@ package com.openhis.web.inventorymanage.appservice.impl; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.core.common.utils.*; -import com.openhis.web.inventorymanage.dto.ProductTransferPageDto; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -22,6 +8,7 @@ import com.core.common.core.domain.R; import com.core.common.core.domain.model.LoginUser; import com.core.common.enums.TenantOptionDict; import com.core.common.exception.NonCaptureException; +import com.core.common.utils.*; import com.core.common.utils.poi.ExcelUtil; import com.core.web.util.TenantOptionUtil; import com.openhis.administration.domain.ChargeItemDefDetail; @@ -39,6 +26,16 @@ import com.openhis.web.inventorymanage.dto.ProductDetailSearchParam; import com.openhis.web.inventorymanage.mapper.ProductDetailAppMapper; 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 java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 库存商品明细 impl 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 40040e8c..d0842acd 100644 --- 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 @@ -3,17 +3,6 @@ */ package com.openhis.web.inventorymanage.appservice.impl; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; @@ -37,6 +26,15 @@ import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.domain.SupplyRequestAuto; import com.openhis.workflow.service.ISupplyRequestAutoService; 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 java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 商品盘点 impl 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 899dbf2f..be5c9602 100644 --- 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 @@ -3,27 +3,15 @@ */ package com.openhis.web.inventorymanage.appservice.impl; -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.openhis.administration.domain.Practitioner; -import com.openhis.administration.domain.Supplier; -import com.openhis.administration.service.IPractitionerService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.*; import com.core.common.utils.bean.BeanUtils; import com.openhis.administration.domain.Location; +import com.openhis.administration.domain.Practitioner; import com.openhis.administration.service.ILocationService; +import com.openhis.administration.service.IPractitionerService; import com.openhis.common.constant.CommonConstants; import com.openhis.common.constant.PromptMsgConstant; import com.openhis.common.enums.*; @@ -36,6 +24,14 @@ import com.openhis.web.inventorymanage.dto.*; import com.openhis.web.inventorymanage.mapper.ProductTransferMapper; import com.openhis.workflow.domain.SupplyRequest; 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 java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 商品调拨 impl 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 adf94fe3..83298f35 100644 --- 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 @@ -3,30 +3,18 @@ */ package com.openhis.web.inventorymanage.appservice.impl; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.openhis.administration.domain.Location; -import com.openhis.administration.service.impl.LocationServiceImpl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.exception.ServiceException; import com.core.common.utils.*; import com.core.common.utils.bean.BeanUtils; +import com.openhis.administration.domain.Location; import com.openhis.administration.domain.Practitioner; import com.openhis.administration.domain.Supplier; import com.openhis.administration.service.IPractitionerService; import com.openhis.administration.service.ISupplierService; +import com.openhis.administration.service.impl.LocationServiceImpl; import com.openhis.common.constant.CommonConstants; import com.openhis.common.constant.PromptMsgConstant; import com.openhis.common.enums.*; @@ -37,6 +25,14 @@ import com.openhis.web.inventorymanage.dto.*; import com.openhis.web.inventorymanage.mapper.PurchaseInventoryMapper; 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 javax.servlet.http.HttpServletResponse; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 采购入库 impl 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 b5c0b75d..f8ff8421 100644 --- 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 @@ -3,17 +3,6 @@ */ package com.openhis.web.inventorymanage.appservice.impl; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.*; @@ -36,6 +25,14 @@ import com.openhis.web.inventorymanage.dto.PurchaseReturnPageDto; import com.openhis.web.inventorymanage.mapper.PurchaseReturnMapper; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; /** * 采购退货 impl 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 682016e1..4ae7fdcf 100644 --- 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 @@ -3,18 +3,6 @@ */ package com.openhis.web.inventorymanage.appservice.impl; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -55,6 +43,16 @@ import com.openhis.yb.dto.MedicalInventory3501Param; import com.openhis.yb.dto.MedicalInventory3502Param; import com.openhis.yb.dto.MedicalPurchase3504Param; 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 java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 单据审批 impl 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 fe36e22d..0f82f562 100644 --- 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 @@ -26,7 +26,6 @@ import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.math.BigDecimal; 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/ReturnIssueAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ReturnIssueAppServiceImpl.java index 583df6da..0811fa4a 100644 --- 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 @@ -3,19 +3,6 @@ */ package com.openhis.web.inventorymanage.appservice.impl; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; @@ -35,6 +22,17 @@ import com.openhis.web.inventorymanage.dto.*; import com.openhis.web.inventorymanage.mapper.ReturnIssueMapper; import com.openhis.workflow.domain.SupplyRequest; 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 java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 退货出库 impl 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 e451db6b..e7d50d32 100644 --- 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 @@ -3,15 +3,6 @@ */ package com.openhis.web.inventorymanage.appservice.impl; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; @@ -31,6 +22,13 @@ import com.openhis.common.utils.PageUtils; import com.openhis.web.inventorymanage.appservice.ITraceNoAppService; 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 java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 追溯码管理 impl diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/assembler/InventoryManageAssembler.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/assembler/InventoryManageAssembler.java index 7dd32e0f..a23f0537 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/assembler/InventoryManageAssembler.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/assembler/InventoryManageAssembler.java @@ -3,12 +3,12 @@ */ package com.openhis.web.inventorymanage.assembler; -import java.util.ArrayList; -import java.util.List; - import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto; import com.openhis.workflow.domain.InventoryItem; +import java.util.ArrayList; +import java.util.List; + /** * 入库管理dto转换器 * 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 2c0c7364..96156948 100644 --- 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 @@ -3,20 +3,18 @@ */ package com.openhis.web.inventorymanage.controller; -import javax.annotation.Resource; - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.openhis.web.inventorymanage.appservice.IInventorySettlementAppService; import com.openhis.web.inventorymanage.dto.InventorySettlementDto; import com.openhis.web.inventorymanage.dto.InventorySettlementSearchParam; - import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +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; /** * 库房日结 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 51bc531a..d108f607 100644 --- 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 @@ -3,21 +3,18 @@ */ package com.openhis.web.inventorymanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.inventorymanage.appservice.ILossReportFormAppService; import com.openhis.web.inventorymanage.dto.LossReportFormDto; import com.openhis.web.inventorymanage.dto.LossReportSearchParam; - import lombok.extern.slf4j.Slf4j; +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 java.util.List; /** * 报损单 controller 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 bb1d5006..5e998eb3 100644 --- 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 @@ -1,17 +1,15 @@ package com.openhis.web.inventorymanage.controller; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.core.common.utils.StringUtils; import com.openhis.web.adjustprice.appservice.IAdjustPriceService; import com.openhis.web.adjustprice.dto.AdjustPriceManagerSearchParam; 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; /** * @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 05360659..9e6bed9c 100644 --- 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 @@ -1,20 +1,17 @@ package com.openhis.web.inventorymanage.controller; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.web.bind.annotation.*; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.openhis.web.inventorymanage.appservice.IProductDetailAppService; import com.openhis.web.inventorymanage.dto.ProductDetailPageDto; 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 java.util.List; /** * 库存商品明细 controller 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 64a1a80f..6704d284 100644 --- 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 @@ -3,22 +3,19 @@ */ package com.openhis.web.inventorymanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.inventorymanage.appservice.IProductStocktakingAppService; import com.openhis.web.inventorymanage.dto.ProductStocktakingDto; import com.openhis.web.inventorymanage.dto.ProductStocktakingSearchParam; import com.openhis.web.inventorymanage.dto.StocktakingBatchSearchParam; - import lombok.extern.slf4j.Slf4j; +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 java.util.List; /** * 商品盘点 controller 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 a22208cd..1a58461d 100644 --- 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 @@ -3,22 +3,19 @@ */ package com.openhis.web.inventorymanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.inventorymanage.appservice.IProductTransferAppService; import com.openhis.web.inventorymanage.dto.BatchTransferSearchParam; import com.openhis.web.inventorymanage.dto.ProductTransferDto; import com.openhis.web.inventorymanage.dto.SupplySearchParam; - import lombok.extern.slf4j.Slf4j; +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 java.util.List; /** * 商品调拨 controller 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 bbb01286..f0cc87b8 100644 --- 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 @@ -3,21 +3,18 @@ */ package com.openhis.web.inventorymanage.controller; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.inventorymanage.appservice.IPurchaseInventoryAppService; import com.openhis.web.inventorymanage.dto.InventorySearchParam; import com.openhis.web.inventorymanage.dto.PurchaseInventoryDto; - 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 java.util.List; /** * 采购入库 controller 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 04fd9ade..e89f8365 100644 --- 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 @@ -3,20 +3,16 @@ */ package com.openhis.web.inventorymanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.core.common.core.domain.R; +import com.openhis.web.inventorymanage.appservice.IPurchaseReturnAppService; +import com.openhis.web.inventorymanage.dto.PurchaseReturnDetailDto; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import com.core.common.core.domain.R; -import com.openhis.web.inventorymanage.appservice.IPurchaseReturnAppService; -import com.openhis.web.inventorymanage.dto.PurchaseReturnDetailDto; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 采购退货 controller 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 2695f956..39e84d9d 100644 --- 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 @@ -3,17 +3,15 @@ */ package com.openhis.web.inventorymanage.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.inventorymanage.appservice.IReceiptApprovalAppService; import com.openhis.web.inventorymanage.dto.ReceiptApprovalSearchParam; - 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; /** * 单据审批 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 910eb1a9..cdd9d82d 100644 --- 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 @@ -3,21 +3,18 @@ */ package com.openhis.web.inventorymanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.inventorymanage.appservice.IRequisitionIssueAppService; import com.openhis.web.inventorymanage.dto.IssueDto; import com.openhis.web.inventorymanage.dto.IssueSearchParam; - import lombok.extern.slf4j.Slf4j; +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 java.util.List; /** * 领用出库 controller 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 4887b1ea..3369c11b 100644 --- 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 @@ -3,21 +3,18 @@ */ package com.openhis.web.inventorymanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.inventorymanage.appservice.IReturnIssueAppService; import com.openhis.web.inventorymanage.dto.IssueDto; import com.openhis.web.inventorymanage.dto.IssueSearchParam; - import lombok.extern.slf4j.Slf4j; +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 java.util.List; /** * 退货出库 controller 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 d77208c1..003ff1a1 100644 --- 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 @@ -3,20 +3,17 @@ */ package com.openhis.web.inventorymanage.controller; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.inventorymanage.appservice.ITraceNoAppService; import com.openhis.web.inventorymanage.dto.TraceNoInfoParam; import com.openhis.web.inventorymanage.dto.TraceNoSearchParam; - 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 java.util.List; /** * 追溯码管理 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/BatchTransferSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/BatchTransferSearchParam.java index e9dbfed3..47a37903 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/BatchTransferSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/BatchTransferSearchParam.java @@ -3,8 +3,6 @@ */ package com.openhis.web.inventorymanage.dto; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryAdjustPriceDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryAdjustPriceDto.java index 9e15c7c5..4840bf31 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryAdjustPriceDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryAdjustPriceDto.java @@ -1,17 +1,15 @@ package com.openhis.web.inventorymanage.dto; -import java.math.BigDecimal; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; /** * @ClassName InventoryAdjustPriceDto diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryBusinessInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryBusinessInfoDto.java index eb92ecb1..254ab7d6 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryBusinessInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryBusinessInfoDto.java @@ -3,15 +3,14 @@ */ package com.openhis.web.inventorymanage.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 库存业务单据信息 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDetailsPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDetailsPageDto.java index 5be6a750..dfeb3da4 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDetailsPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDetailsPageDto.java @@ -3,19 +3,18 @@ */ package com.openhis.web.inventorymanage.dto; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + /** * 库存相关明细 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDetailsSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDetailsSearchParam.java index 4b04f851..2c062bfe 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDetailsSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryDetailsSearchParam.java @@ -3,12 +3,12 @@ */ package com.openhis.web.inventorymanage.dto; -import java.io.Serializable; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; + /** * 库存相关明细查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryReceiptDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryReceiptDetailDto.java index d8ab37e0..33d50358 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryReceiptDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryReceiptDetailDto.java @@ -1,9 +1,5 @@ package com.openhis.web.inventorymanage.dto; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.core.common.annotation.Excel; @@ -12,10 +8,13 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; import com.openhis.web.common.dto.UnitDto; - import lombok.Data; import lombok.experimental.Accessors; +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/inventorymanage/dto/InventorySearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventorySearchParam.java index e423d7cb..bf434d1c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventorySearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventorySearchParam.java @@ -3,11 +3,11 @@ */ package com.openhis.web.inventorymanage.dto; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 入库单据分页查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventorySettlementDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventorySettlementDto.java index 42c14262..65aecc53 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventorySettlementDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventorySettlementDto.java @@ -3,16 +3,15 @@ */ package com.openhis.web.inventorymanage.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; import com.openhis.common.enums.Whether; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 库房日结信息 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryStockTakeDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryStockTakeDetailDto.java index f6a72d7a..30b34541 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryStockTakeDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryStockTakeDetailDto.java @@ -3,16 +3,15 @@ */ package com.openhis.web.inventorymanage.dto; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - -import lombok.Data; -import lombok.experimental.Accessors; - /** * 商品盘点 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryTransferDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryTransferDetailDto.java index 2b26be6b..a64a33c4 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryTransferDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryTransferDetailDto.java @@ -3,16 +3,15 @@ */ package com.openhis.web.inventorymanage.dto; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - -import lombok.Data; -import lombok.experimental.Accessors; - /** * 商品调拨 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDepartmentDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDepartmentDto.java index 80242c13..2b958671 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDepartmentDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDepartmentDto.java @@ -6,8 +6,6 @@ package com.openhis.web.inventorymanage.dto; import lombok.Data; import lombok.experimental.Accessors; -import java.util.List; - /** * 领用/退货部门列表 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDetailDto.java index 178445d2..943f5ce6 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDetailDto.java @@ -3,10 +3,6 @@ */ package com.openhis.web.inventorymanage.dto; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.core.common.annotation.Excel; @@ -16,10 +12,13 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; import com.openhis.web.common.dto.UnitDto; - import lombok.Data; import lombok.experimental.Accessors; +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/inventorymanage/dto/IssueDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDto.java index 7f0ec2cf..a529aa58 100644 --- 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 @@ -3,21 +3,19 @@ */ package com.openhis.web.inventorymanage.dto; -import java.math.BigDecimal; -import java.util.Date; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; 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 java.math.BigDecimal; +import java.util.Date; + /** * 出库单据 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueInitDto.java index f5707e0d..cd3bc703 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueInitDto.java @@ -3,13 +3,13 @@ */ package com.openhis.web.inventorymanage.dto; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 出库初始化 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ItemChargeDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ItemChargeDetailDto.java index 959656c7..9cfedf76 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ItemChargeDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ItemChargeDetailDto.java @@ -3,11 +3,11 @@ */ package com.openhis.web.inventorymanage.dto; -import java.math.BigDecimal; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 项目价格详情 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReceiptDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReceiptDetailDto.java index b515fd92..93b95cfe 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReceiptDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReceiptDetailDto.java @@ -1,19 +1,18 @@ package com.openhis.web.inventorymanage.dto; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.core.common.annotation.Excel; import com.core.common.annotation.ExcelExtra; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; import com.openhis.web.common.dto.UnitDto; - import lombok.Data; import lombok.experimental.Accessors; +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/inventorymanage/dto/LossReportFormDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormDto.java index ce471351..275e40fc 100644 --- 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 @@ -3,20 +3,18 @@ */ package com.openhis.web.inventorymanage.dto; -import java.math.BigDecimal; -import java.util.Date; - -import javax.validation.constraints.NotNull; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import javax.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/LossReportFormInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormInitDto.java index af0a71dc..a4fdbef3 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormInitDto.java @@ -3,15 +3,12 @@ */ package com.openhis.web.inventorymanage.dto; -import java.util.List; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.web.basedatamanage.dto.LocationDto; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 报损单初始化 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormPageDto.java index 2b609caf..a94bc035 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportFormPageDto.java @@ -3,18 +3,13 @@ */ package com.openhis.web.inventorymanage.dto; -import java.math.BigDecimal; -import java.util.Date; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 报损单分页列表 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportSearchParam.java index d83f636e..328ceb5e 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/LossReportSearchParam.java @@ -3,12 +3,12 @@ */ package com.openhis.web.inventorymanage.dto; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; +import java.util.Date; + /** * 报损单分页查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailPageDto.java index 4b6d98cd..8de503fd 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailPageDto.java @@ -1,17 +1,16 @@ package com.openhis.web.inventorymanage.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.core.common.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 库存商品明细分页列表 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailSearchParam.java index 99fe9151..6dcaaf73 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailSearchParam.java @@ -1,11 +1,11 @@ package com.openhis.web.inventorymanage.dto; -import java.util.Date; -import java.util.List; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; +import java.util.List; + /** * 库存商品明细分页查询条件 * 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 ba5c39c6..2fa397e0 100644 --- 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 @@ -3,21 +3,18 @@ */ package com.openhis.web.inventorymanage.dto; -import java.math.BigDecimal; -import java.util.Date; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.util.Date; + /** * 商品盘点 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingInitDto.java index 60e0bd6a..0cd7becc 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingInitDto.java @@ -3,13 +3,12 @@ */ package com.openhis.web.inventorymanage.dto; -import java.util.List; - import com.openhis.web.basedatamanage.dto.LocationDto; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 商品入库初始化 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingSearchParam.java index 309eb00d..6c3a21d7 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductStocktakingSearchParam.java @@ -3,11 +3,11 @@ */ package com.openhis.web.inventorymanage.dto; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 商品盘点分页查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDetailDto.java index 1c4a1928..40306bee 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDetailDto.java @@ -3,10 +3,6 @@ */ package com.openhis.web.inventorymanage.dto; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.core.common.annotation.Excel; @@ -16,10 +12,13 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; import com.openhis.web.common.dto.UnitDto; - import lombok.Data; import lombok.experimental.Accessors; +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/inventorymanage/dto/ProductTransferDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDto.java index 3722d879..88f59cbd 100644 --- 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 @@ -13,7 +13,6 @@ import lombok.experimental.Accessors; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; -import java.io.Serializable; 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 bafe0a41..c0d53fda 100644 --- 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 @@ -3,22 +3,19 @@ */ package com.openhis.web.inventorymanage.dto; -import java.math.BigDecimal; -import java.util.Date; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - -import org.hibernate.validator.constraints.Length; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.Min; +import javax.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/PurchaseInventoryInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryInitDto.java index 78d9a482..54fa836d 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryInitDto.java @@ -3,14 +3,13 @@ */ package com.openhis.web.inventorymanage.dto; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 采购入库初始化 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnDetailDto.java index 66e5c20d..ec604d45 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseReturnDetailDto.java @@ -3,10 +3,6 @@ */ package com.openhis.web.inventorymanage.dto; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.core.common.annotation.Excel; @@ -16,10 +12,13 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; import com.openhis.web.common.dto.UnitDto; - import lombok.Data; import lombok.experimental.Accessors; +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/inventorymanage/dto/ReceiptDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptDetailDto.java index 8e01e8cb..a62e4855 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptDetailDto.java @@ -3,10 +3,6 @@ */ package com.openhis.web.inventorymanage.dto; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.core.common.annotation.Excel; @@ -15,10 +11,13 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; import com.openhis.web.common.dto.UnitDto; - import lombok.Data; import lombok.experimental.Accessors; +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/inventorymanage/dto/ReceiptInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptInitDto.java index 37268fd8..de8d7f68 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptInitDto.java @@ -3,11 +3,11 @@ */ package com.openhis.web.inventorymanage.dto; -import java.util.List; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 单据初始化 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptPageDto.java index b37ee784..01b222af 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ReceiptPageDto.java @@ -3,19 +3,17 @@ */ package com.openhis.web.inventorymanage.dto; -import java.math.BigDecimal; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.core.common.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; /** * 单据分页列表 dto diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutDetailDto.java index 96722923..b6d88415 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutDetailDto.java @@ -3,16 +3,15 @@ */ package com.openhis.web.inventorymanage.dto; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - -import lombok.Data; -import lombok.experimental.Accessors; - /** * 领用出库 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutSearchParam.java index 082d6c24..3304310c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/RequisitionOutSearchParam.java @@ -3,12 +3,11 @@ */ package com.openhis.web.inventorymanage.dto; -import java.io.Serializable; - -import org.hibernate.validator.constraints.Length; - import lombok.Data; import lombok.experimental.Accessors; +import org.hibernate.validator.constraints.Length; + +import java.io.Serializable; /** * 领用出库分页查询条件 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplyItemDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplyItemDetailDto.java index 364bd0c1..a5cdcdae 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplyItemDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplyItemDetailDto.java @@ -3,15 +3,14 @@ */ package com.openhis.web.inventorymanage.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 供应单据及供应项相关详细信息 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplySearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplySearchParam.java index b1a5021f..028ef636 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplySearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SupplySearchParam.java @@ -6,7 +6,6 @@ package com.openhis.web.inventorymanage.dto; import lombok.Data; import lombok.experimental.Accessors; -import java.io.Serializable; import java.util.Date; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoDetailsPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoDetailsPageDto.java index 31a04ca5..b591992a 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoDetailsPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoDetailsPageDto.java @@ -3,18 +3,17 @@ */ package com.openhis.web.inventorymanage.dto; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 追溯码明细 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoSearchParam.java index 97ca9f2f..396ca0b1 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/TraceNoSearchParam.java @@ -5,12 +5,9 @@ package com.openhis.web.inventorymanage.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; -import java.util.Date; - /** * 追溯码分页查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryAdjustPriceMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryAdjustPriceMapper.java index 5b055ba8..782121b8 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryAdjustPriceMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryAdjustPriceMapper.java @@ -1,14 +1,12 @@ package com.openhis.web.inventorymanage.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Component; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.adjustprice.dto.ChangePricePageDto; import com.openhis.web.inventorymanage.dto.ReceiptApprovalSearchParam; import com.openhis.web.inventorymanage.dto.ReceiptPageDto; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryDetailsMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryDetailsMapper.java index 494d64aa..c7e40618 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryDetailsMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryDetailsMapper.java @@ -3,14 +3,13 @@ */ package com.openhis.web.inventorymanage.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.inventorymanage.dto.InventoryDetailsPageDto; import com.openhis.web.inventorymanage.dto.InventoryDetailsSearchParam; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; /** * 库存相关明细查询用 mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventorySettlementAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventorySettlementAppMapper.java index 5a163be9..944129bd 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventorySettlementAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventorySettlementAppMapper.java @@ -3,18 +3,17 @@ */ package com.openhis.web.inventorymanage.mapper; -import java.util.Date; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.inventorymanage.dto.InventoryBusinessInfoDto; import com.openhis.web.inventorymanage.dto.InventorySettlementDto; import com.openhis.web.inventorymanage.dto.InventorySettlementSearchParam; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.Date; +import java.util.List; /** * 库房日结 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/LossReportFormMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/LossReportFormMapper.java index d4d84ddd..a2d9c449 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/LossReportFormMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/LossReportFormMapper.java @@ -3,11 +3,6 @@ */ package com.openhis.web.inventorymanage.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,6 +10,10 @@ import com.openhis.web.inventorymanage.dto.LossReceiptDetailDto; import com.openhis.web.inventorymanage.dto.LossReportFormPageDto; import com.openhis.web.inventorymanage.dto.LossReportSearchParam; import com.openhis.web.inventorymanage.dto.ReceiptDetailDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 报损单查询用 mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductDetailAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductDetailAppMapper.java index 90292037..e03c2280 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductDetailAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductDetailAppMapper.java @@ -3,16 +3,15 @@ */ package com.openhis.web.inventorymanage.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.inventorymanage.dto.ProductDetailPageDto; import com.openhis.web.inventorymanage.dto.ProductDetailSearchParam; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 库存商品明细查询用 mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductStocktakingMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductStocktakingMapper.java index 9ec58814..ac4fec48 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductStocktakingMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductStocktakingMapper.java @@ -3,15 +3,14 @@ */ package com.openhis.web.inventorymanage.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.inventorymanage.dto.*; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 商品盘点查询用 mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductTransferMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductTransferMapper.java index 5161d3be..a0299569 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductTransferMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductTransferMapper.java @@ -3,15 +3,17 @@ */ package com.openhis.web.inventorymanage.mapper; -import java.util.List; - -import com.openhis.web.inventorymanage.dto.*; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.openhis.web.inventorymanage.dto.ProductTransferDetailDto; +import com.openhis.web.inventorymanage.dto.ProductTransferPageDto; +import com.openhis.web.inventorymanage.dto.ReceiptDetailDto; +import com.openhis.web.inventorymanage.dto.SupplySearchParam; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 商品调拨查询用 mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseInventoryMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseInventoryMapper.java index c34db22c..273ec358 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseInventoryMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseInventoryMapper.java @@ -3,19 +3,16 @@ */ package com.openhis.web.inventorymanage.mapper; -import java.util.List; - -import com.openhis.web.inventorymanage.dto.ProductTransferDetailDto; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.openhis.web.common.dto.LocationInventoryDto; import com.openhis.web.inventorymanage.dto.InventorySearchParam; import com.openhis.web.inventorymanage.dto.ReceiptDetailDto; import com.openhis.web.inventorymanage.dto.ReceiptPageDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 采购入库查询用 mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseReturnMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseReturnMapper.java index 775f9a69..468363e6 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseReturnMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/PurchaseReturnMapper.java @@ -3,14 +3,13 @@ */ package com.openhis.web.inventorymanage.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.inventorymanage.dto.PurchaseReturnDetailDto; import com.openhis.web.inventorymanage.dto.PurchaseReturnPageDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 采购退货查询用 mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReceiptApprovalMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReceiptApprovalMapper.java index f2b538ec..b4a170db 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReceiptApprovalMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReceiptApprovalMapper.java @@ -3,11 +3,6 @@ */ package com.openhis.web.inventorymanage.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; @@ -17,6 +12,10 @@ import com.openhis.web.inventorymanage.dto.ReceiptApprovalSearchParam; import com.openhis.web.inventorymanage.dto.ReceiptPageDto; import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto; import com.openhis.workflow.domain.SupplyRequest; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 单据审批查询用 mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/RequisitionIssueMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/RequisitionIssueMapper.java index 62e115c1..9fb4019d 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/RequisitionIssueMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/RequisitionIssueMapper.java @@ -3,15 +3,17 @@ */ package com.openhis.web.inventorymanage.mapper; -import java.util.List; - -import com.openhis.web.inventorymanage.dto.*; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.openhis.web.inventorymanage.dto.IssueDepartmentDto; +import com.openhis.web.inventorymanage.dto.IssueDetailDto; +import com.openhis.web.inventorymanage.dto.IssuePageDto; +import com.openhis.web.inventorymanage.dto.IssueSearchParam; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 领用出库查询用 mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReturnIssueMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReturnIssueMapper.java index 0c966af6..8d548c3e 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReturnIssueMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ReturnIssueMapper.java @@ -6,10 +6,12 @@ package com.openhis.web.inventorymanage.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.openhis.web.inventorymanage.dto.*; +import com.openhis.web.inventorymanage.dto.IssueDepartmentDto; +import com.openhis.web.inventorymanage.dto.IssueDetailDto; +import com.openhis.web.inventorymanage.dto.IssuePageDto; +import com.openhis.web.inventorymanage.dto.IssueSearchParam; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.openhis.web.inventorymanage.dto.IssueSearchParam; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/TraceNoAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/TraceNoAppMapper.java index 71d9002e..9374c8d4 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/TraceNoAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/TraceNoAppMapper.java @@ -6,12 +6,11 @@ package com.openhis.web.inventorymanage.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.openhis.web.inventorymanage.dto.*; +import com.openhis.web.inventorymanage.dto.TraceNoDetailsPageDto; +import com.openhis.web.inventorymanage.dto.TraceNoSearchParam; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import java.util.List; - /** * 追溯码 mapper * 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 ad4d19a3..efb85f3e 100644 --- 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 @@ -1,13 +1,5 @@ package com.openhis.web.jlau.appservice.impl; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.core.common.core.domain.R; import com.core.common.exception.ServiceException; @@ -24,8 +16,13 @@ import com.openhis.jlau.service.IReviewPrescriptionRecordsService; import com.openhis.web.jlau.appservice.IReviewPrescriptionRecordsAppService; import com.openhis.web.jlau.dto.ReviewPrescriptionRecordsDto; import com.openhis.web.jlau.mapper.ReviewPrescriptionRecordsAppMapper; - import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.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/jlau/controller/ReviewPrescriptionRecordsController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/controller/ReviewPrescriptionRecordsController.java index e8d9656a..e630b573 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/controller/ReviewPrescriptionRecordsController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/controller/ReviewPrescriptionRecordsController.java @@ -3,14 +3,12 @@ */ package com.openhis.web.jlau.controller; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.jlau.appservice.IReviewPrescriptionRecordsAppService; import com.openhis.web.jlau.dto.ReviewPrescriptionRecordsDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; /** * 农大审方记录 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/dto/ReviewPrescriptionRecordsDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/dto/ReviewPrescriptionRecordsDto.java index a75bbdd9..4c70dfc4 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/dto/ReviewPrescriptionRecordsDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/dto/ReviewPrescriptionRecordsDto.java @@ -1,10 +1,7 @@ package com.openhis.web.jlau.dto; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/mapper/ReviewPrescriptionRecordsAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/mapper/ReviewPrescriptionRecordsAppMapper.java index 90110016..319a73ea 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/mapper/ReviewPrescriptionRecordsAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/jlau/mapper/ReviewPrescriptionRecordsAppMapper.java @@ -1,11 +1,10 @@ package com.openhis.web.jlau.mapper; -import java.util.List; - +import com.openhis.web.jlau.dto.ReviewPrescriptionRecordsDto; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.openhis.web.jlau.dto.ReviewPrescriptionRecordsDto; +import java.util.List; /** * 农大审方记录 应用Mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/controller/InspectionPackageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/controller/InspectionPackageController.java index ac24249d..94e62175 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/controller/InspectionPackageController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/controller/InspectionPackageController.java @@ -1,6 +1,5 @@ package com.openhis.web.lab.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.core.common.core.controller.BaseController; import com.core.common.core.domain.AjaxResult; import com.core.common.core.page.TableDataInfo; 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 b77cd1c5..41232e38 100644 --- 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 @@ -1,11 +1,10 @@ package com.openhis.web.materialmanage.appservice; -import javax.servlet.http.HttpServletRequest; - import com.core.common.core.domain.R; import com.openhis.web.materialmanage.dto.MaterialInitDto; import com.openhis.web.materialmanage.dto.MaterialSearchParam; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam; + +import javax.servlet.http.HttpServletRequest; /** * 物资共通方法 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialProfitLossOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialProfitLossOrderService.java index 4660d39d..ea256af0 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialProfitLossOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialProfitLossOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.materialmanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.materialmanage.dto.MaterialDetailDto; +import java.util.List; + /** * 物资损益单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialPurchaseOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialPurchaseOrderService.java index 96dcbbb7..fbfa0966 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialPurchaseOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialPurchaseOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.materialmanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.materialmanage.dto.MaterialDetailDto; +import java.util.List; + /** * 物资订货单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReceiptApprovalService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReceiptApprovalService.java index 57550063..136374cd 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReceiptApprovalService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReceiptApprovalService.java @@ -1,11 +1,11 @@ package com.openhis.web.materialmanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.inventorymanage.dto.ItemChargeDetailDto; import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto; +import java.util.List; + /** * 物资审批方法 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReturnOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReturnOrderService.java index 474d279f..eddd90e2 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReturnOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReturnOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.materialmanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.materialmanage.dto.MaterialDetailDto; +import java.util.List; + /** * 物资退货单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReturnToWarehouseOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReturnToWarehouseOrderService.java index 9e4dd56b..8193d1ea 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReturnToWarehouseOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReturnToWarehouseOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.materialmanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.materialmanage.dto.MaterialDetailDto; +import java.util.List; + /** * 物资退库单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStockInOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStockInOrderService.java index cfa6a6ba..dda58bed 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStockInOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStockInOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.materialmanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.materialmanage.dto.MaterialDetailDto; +import java.util.List; + /** * 物资进货单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStockOutOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStockOutOrderService.java index 56240a52..da39e812 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStockOutOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStockOutOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.materialmanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.materialmanage.dto.MaterialDetailDto; +import java.util.List; + /** * 物资出库单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStocktakingOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStocktakingOrderService.java index 1d30439c..bc13f0c4 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStocktakingOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStocktakingOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.materialmanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.materialmanage.dto.MaterialDetailDto; +import java.util.List; + /** * 物资盘点单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialTransferInOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialTransferInOrderService.java index 044c58ca..e84c19d5 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialTransferInOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialTransferInOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.materialmanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.materialmanage.dto.MaterialDetailDto; +import java.util.List; + /** * 物资调入单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialTransferOutOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialTransferOutOrderService.java index cdb210e3..90fb0bb3 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialTransferOutOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialTransferOutOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.materialmanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.materialmanage.dto.MaterialDetailDto; +import java.util.List; + /** * 物资调出单 * 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 a6722a04..5612a7d1 100644 --- 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 @@ -1,5 +1,34 @@ package com.openhis.web.materialmanage.appservice.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.core.common.core.domain.R; +import com.core.common.utils.MessageUtils; +import com.openhis.administration.domain.Organization; +import com.openhis.administration.domain.Practitioner; +import com.openhis.administration.domain.Supplier; +import com.openhis.administration.service.IOrganizationService; +import com.openhis.administration.service.IPractitionerService; +import com.openhis.administration.service.ISupplierService; +import com.openhis.common.constant.CommonConstants; +import com.openhis.common.constant.PromptMsgConstant; +import com.openhis.common.enums.*; +import com.openhis.common.utils.EnumUtils; +import com.openhis.common.utils.HisQueryUtils; +import com.openhis.web.common.appservice.ICommonService; +import com.openhis.web.common.dto.LocationDto; +import com.openhis.web.materialmanage.appservice.IMaterialCommonService; +import com.openhis.web.materialmanage.dto.MaterialDeviceInfoDto; +import com.openhis.web.materialmanage.dto.MaterialDto; +import com.openhis.web.materialmanage.dto.MaterialInitDto; +import com.openhis.web.materialmanage.dto.MaterialSearchParam; +import com.openhis.web.materialmanage.mapper.MaterialCommonMapper; +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 java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; @@ -7,37 +36,6 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import com.openhis.administration.domain.Organization; -import com.openhis.administration.service.IOrganizationService; -import com.openhis.common.enums.*; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.core.common.core.domain.R; -import com.core.common.utils.MessageUtils; -import com.openhis.administration.domain.Practitioner; -import com.openhis.administration.domain.Supplier; -import com.openhis.administration.service.IPractitionerService; -import com.openhis.administration.service.ISupplierService; -import com.openhis.common.constant.CommonConstants; -import com.openhis.common.constant.PromptMsgConstant; -import com.openhis.common.utils.EnumUtils; -import com.openhis.common.utils.HisQueryUtils; -import com.openhis.web.common.appservice.ICommonService; -import com.openhis.web.common.dto.LocationDto; -import com.openhis.web.materialmanage.appservice.IMaterialCommonService; -import com.openhis.web.materialmanage.dto.MaterialDto; -import com.openhis.web.materialmanage.dto.MaterialInitDto; -import com.openhis.web.materialmanage.dto.MaterialDeviceInfoDto; -import com.openhis.web.materialmanage.dto.MaterialSearchParam; -import com.openhis.web.materialmanage.mapper.MaterialCommonMapper; -import com.openhis.workflow.domain.SupplyRequest; -import com.openhis.workflow.service.ISupplyRequestService; - /** * 物资共通 * 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 70bad1e6..80690f30 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.materialmanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -25,9 +15,16 @@ import com.openhis.web.materialmanage.appservice.IMaterialProfitLossOrderService import com.openhis.web.materialmanage.dto.MaterialDetailDto; import com.openhis.web.materialmanage.dto.MaterialInitDto; import com.openhis.web.materialmanage.mapper.MaterialCommonMapper; -import com.openhis.web.materialmanage.mapper.MaterialProfitLossOrderMapper; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +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/MaterialPurchaseOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialPurchaseOrderServiceImpl.java index cdd738aa..2cb33852 100644 --- 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 @@ -1,14 +1,5 @@ package com.openhis.web.materialmanage.appservice.impl; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -23,9 +14,15 @@ import com.openhis.web.materialmanage.appservice.IMaterialPurchaseOrderService; import com.openhis.web.materialmanage.dto.MaterialDetailDto; import com.openhis.web.materialmanage.dto.MaterialInitDto; import com.openhis.web.materialmanage.mapper.MaterialCommonMapper; -import com.openhis.web.materialmanage.mapper.MaterialPurchaseOrderMapper; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.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 586b37c9..06a88d78 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.materialmanage.appservice.impl; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.core.common.core.domain.R; @@ -46,6 +36,14 @@ import com.openhis.yb.dto.MedicalInventory3501Param; import com.openhis.yb.dto.MedicalInventory3502Param; import com.openhis.yb.dto.MedicalPurchase3504Param; import com.openhis.yb.service.YbManager; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.*; +import java.util.stream.Collectors; /** * 物资审批 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 5ca69579..962c9493 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.materialmanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -27,6 +17,14 @@ import com.openhis.web.materialmanage.dto.MaterialInitDto; import com.openhis.web.materialmanage.mapper.MaterialCommonMapper; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +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/MaterialReturnToWarehouseOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReturnToWarehouseOrderServiceImpl.java index c38b6629..710d4a79 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.materialmanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -27,6 +17,14 @@ import com.openhis.web.materialmanage.dto.MaterialInitDto; import com.openhis.web.materialmanage.mapper.MaterialCommonMapper; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +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/MaterialStockInOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockInOrderServiceImpl.java index 6fedf641..9301133d 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.materialmanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -25,9 +15,16 @@ import com.openhis.web.materialmanage.appservice.IMaterialStockInOrderService; import com.openhis.web.materialmanage.dto.MaterialDetailDto; import com.openhis.web.materialmanage.dto.MaterialInitDto; import com.openhis.web.materialmanage.mapper.MaterialCommonMapper; -import com.openhis.web.materialmanage.mapper.MaterialStockInOrderMapper; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +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/MaterialStockOutOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockOutOrderServiceImpl.java index 6fa2d1db..7fd7557c 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.materialmanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -27,6 +17,14 @@ import com.openhis.web.materialmanage.dto.MaterialInitDto; import com.openhis.web.materialmanage.mapper.MaterialCommonMapper; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +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/MaterialStocktakingOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStocktakingOrderServiceImpl.java index b9c0814b..8c2fe6ac 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.materialmanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -25,9 +15,16 @@ import com.openhis.web.materialmanage.appservice.IMaterialStocktakingOrderServic import com.openhis.web.materialmanage.dto.MaterialDetailDto; import com.openhis.web.materialmanage.dto.MaterialInitDto; import com.openhis.web.materialmanage.mapper.MaterialCommonMapper; -import com.openhis.web.materialmanage.mapper.MaterialStocktakingOrderMapper; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +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/MaterialTransferInOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferInOrderServiceImpl.java index 879fa62b..2cfbb931 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.materialmanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -27,6 +17,14 @@ import com.openhis.web.materialmanage.dto.MaterialInitDto; import com.openhis.web.materialmanage.mapper.MaterialCommonMapper; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +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/MaterialTransferOutOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferOutOrderServiceImpl.java index 81eb728b..b1eda377 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.materialmanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -25,9 +15,16 @@ import com.openhis.web.materialmanage.appservice.IMaterialTransferOutOrderServic import com.openhis.web.materialmanage.dto.MaterialDetailDto; import com.openhis.web.materialmanage.dto.MaterialInitDto; import com.openhis.web.materialmanage.mapper.MaterialCommonMapper; -import com.openhis.web.materialmanage.mapper.MaterialTransferOutOrderMapper; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; /** * 物资调出单 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 1b9be264..d12a3af4 100644 --- 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 @@ -1,23 +1,19 @@ package com.openhis.web.materialmanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; -import com.openhis.common.enums.LocationForm; import com.openhis.common.enums.SupplyType; import com.openhis.web.materialmanage.appservice.IMaterialCommonService; import com.openhis.web.materialmanage.appservice.IMaterialProfitLossOrderService; import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService; import com.openhis.web.materialmanage.dto.MaterialDetailDto; import com.openhis.web.materialmanage.dto.MaterialSearchParam; - import lombok.extern.slf4j.Slf4j; +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 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 43333084..c70188dd 100644 --- 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 @@ -1,23 +1,19 @@ package com.openhis.web.materialmanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; -import com.openhis.common.enums.LocationForm; import com.openhis.common.enums.SupplyType; import com.openhis.web.materialmanage.appservice.IMaterialCommonService; import com.openhis.web.materialmanage.appservice.IMaterialPurchaseOrderService; import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService; import com.openhis.web.materialmanage.dto.MaterialDetailDto; import com.openhis.web.materialmanage.dto.MaterialSearchParam; - import lombok.extern.slf4j.Slf4j; +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 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 76d1882c..ce6f9505 100644 --- 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 @@ -1,23 +1,19 @@ package com.openhis.web.materialmanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; -import com.openhis.common.enums.LocationForm; import com.openhis.common.enums.SupplyType; import com.openhis.web.materialmanage.appservice.IMaterialCommonService; import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService; import com.openhis.web.materialmanage.appservice.IMaterialReturnOrderService; import com.openhis.web.materialmanage.dto.MaterialDetailDto; import com.openhis.web.materialmanage.dto.MaterialSearchParam; - import lombok.extern.slf4j.Slf4j; +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 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 49932ed3..cb920b97 100644 --- 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 @@ -1,23 +1,19 @@ package com.openhis.web.materialmanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; -import com.openhis.common.enums.LocationForm; import com.openhis.common.enums.SupplyType; import com.openhis.web.materialmanage.appservice.IMaterialCommonService; import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService; import com.openhis.web.materialmanage.appservice.IMaterialReturnToWarehouseOrderService; import com.openhis.web.materialmanage.dto.MaterialDetailDto; import com.openhis.web.materialmanage.dto.MaterialSearchParam; - import lombok.extern.slf4j.Slf4j; +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 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 267fda5c..a4c037a3 100644 --- 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 @@ -1,23 +1,19 @@ package com.openhis.web.materialmanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; -import com.openhis.common.enums.LocationForm; import com.openhis.common.enums.SupplyType; import com.openhis.web.materialmanage.appservice.IMaterialCommonService; import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService; import com.openhis.web.materialmanage.appservice.IMaterialStockInOrderService; import com.openhis.web.materialmanage.dto.MaterialDetailDto; import com.openhis.web.materialmanage.dto.MaterialSearchParam; - import lombok.extern.slf4j.Slf4j; +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 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 f91ab064..9d35126e 100644 --- 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 @@ -1,23 +1,19 @@ package com.openhis.web.materialmanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; -import com.openhis.common.enums.LocationForm; import com.openhis.common.enums.SupplyType; import com.openhis.web.materialmanage.appservice.IMaterialCommonService; import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService; import com.openhis.web.materialmanage.appservice.IMaterialStockOutOrderService; import com.openhis.web.materialmanage.dto.MaterialDetailDto; import com.openhis.web.materialmanage.dto.MaterialSearchParam; - import lombok.extern.slf4j.Slf4j; +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 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 d6e75045..2437d5b3 100644 --- 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 @@ -1,23 +1,19 @@ package com.openhis.web.materialmanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; -import com.openhis.common.enums.LocationForm; import com.openhis.common.enums.SupplyType; import com.openhis.web.materialmanage.appservice.IMaterialCommonService; import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService; import com.openhis.web.materialmanage.appservice.IMaterialStocktakingOrderService; import com.openhis.web.materialmanage.dto.MaterialDetailDto; import com.openhis.web.materialmanage.dto.MaterialSearchParam; - import lombok.extern.slf4j.Slf4j; +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 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 e97a05af..47114551 100644 --- 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 @@ -1,23 +1,19 @@ package com.openhis.web.materialmanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; -import com.openhis.common.enums.LocationForm; import com.openhis.common.enums.SupplyType; import com.openhis.web.materialmanage.appservice.IMaterialCommonService; import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService; import com.openhis.web.materialmanage.appservice.IMaterialTransferInOrderService; import com.openhis.web.materialmanage.dto.MaterialDetailDto; import com.openhis.web.materialmanage.dto.MaterialSearchParam; - import lombok.extern.slf4j.Slf4j; +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 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 59b18ef5..47f2af9c 100644 --- 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 @@ -1,23 +1,19 @@ package com.openhis.web.materialmanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; -import com.openhis.common.enums.LocationForm; import com.openhis.common.enums.SupplyType; import com.openhis.web.materialmanage.appservice.IMaterialCommonService; import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService; import com.openhis.web.materialmanage.appservice.IMaterialTransferOutOrderService; import com.openhis.web.materialmanage.dto.MaterialDetailDto; import com.openhis.web.materialmanage.dto.MaterialSearchParam; - import lombok.extern.slf4j.Slf4j; +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 java.util.List; /** * 物资调出单 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDetailDto.java index c7930b2a..bbcd1e37 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDetailDto.java @@ -3,21 +3,20 @@ */ package com.openhis.web.materialmanage.dto; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; +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/materialmanage/dto/MaterialDeviceInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDeviceInfoDto.java index 2251dc66..5ff4bfbb 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDeviceInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDeviceInfoDto.java @@ -3,19 +3,18 @@ */ package com.openhis.web.materialmanage.dto; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; +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/materialmanage/dto/MaterialDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDto.java index 0dc23df7..6babb84a 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDto.java @@ -3,17 +3,16 @@ */ package com.openhis.web.materialmanage.dto; -import java.io.Serializable; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; + /** * 单据信息 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialInitDto.java index 435ae04c..77d1ae66 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialInitDto.java @@ -3,17 +3,16 @@ */ package com.openhis.web.materialmanage.dto; -import java.io.Serializable; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.administration.domain.Organization; import com.openhis.web.common.dto.LocationDto; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.List; + /** * 单据初期信息 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialSearchParam.java index c4ff0bc3..f6a24ac7 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialSearchParam.java @@ -3,14 +3,13 @@ */ package com.openhis.web.materialmanage.dto; -import java.io.Serializable; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * 单据查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialCommonMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialCommonMapper.java index e1b9b61a..16e38210 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialCommonMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialCommonMapper.java @@ -1,15 +1,14 @@ package com.openhis.web.materialmanage.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.materialmanage.dto.MaterialDetailDto; -import com.openhis.web.materialmanage.dto.MaterialDto; import com.openhis.web.materialmanage.dto.MaterialDeviceInfoDto; +import com.openhis.web.materialmanage.dto.MaterialDto; import com.openhis.web.materialmanage.dto.MaterialSearchParam; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; /** * 物资共通 mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfRatioApplicationRecordAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfRatioApplicationRecordAppService.java index 1bb55ecf..3d7c9d86 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfRatioApplicationRecordAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfRatioApplicationRecordAppService.java @@ -1,7 +1,5 @@ package com.openhis.web.nenu.appservice; -import java.util.List; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.core.common.core.domain.R; import com.openhis.web.nenu.dto.GfRatioApplicationDefinitionSelectDto; @@ -9,6 +7,8 @@ import com.openhis.web.nenu.dto.GfRatioApplicationPrintDto; import com.openhis.web.nenu.dto.GfRatioApplicationProcessDto; import com.openhis.web.nenu.dto.GfRatioApplicationRecordDto; +import java.util.List; + /** * 公费医疗-比例调整申请记录 AppService * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfRatioManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfRatioManageAppService.java index 38746631..6367cdb6 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfRatioManageAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfRatioManageAppService.java @@ -1,12 +1,12 @@ package com.openhis.web.nenu.appservice; -import java.util.List; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.core.common.core.domain.R; import com.openhis.nenu.dto.GfTypeRatioDto; import com.openhis.web.nenu.dto.GfIndividualRatioDto; +import java.util.List; + /** * 公费医疗-自付比例管理 AppService * 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 c6a7feab..6173e311 100644 --- 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 @@ -1,12 +1,11 @@ package com.openhis.web.nenu.appservice; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.web.multipart.MultipartFile; - import com.baomidou.mybatisplus.core.metadata.IPage; 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; /** * 公费医疗-学生名单管理 AppService diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfRatioApplicationRecordAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfRatioApplicationRecordAppServiceImpl.java index 2e99e569..6e1e0c09 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfRatioApplicationRecordAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfRatioApplicationRecordAppServiceImpl.java @@ -1,21 +1,12 @@ package com.openhis.web.nenu.appservice.impl; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.*; -import java.util.stream.Collectors; - -import com.core.common.enums.DelFlag; -import org.apache.commons.lang3.tuple.Pair; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; +import com.core.common.enums.DelFlag; import com.core.common.utils.AssignSeqUtil; import com.core.common.utils.DateUtils; import com.core.common.utils.SecurityUtils; @@ -39,6 +30,14 @@ import com.openhis.web.nenu.dto.GfRatioApplicationRecordDto; import com.openhis.web.nenu.mapper.GfRatioApplicationRecordAppMapper; import com.openhis.workflow.domain.ActivityDefinition; import com.openhis.workflow.service.IActivityDefinitionService; +import org.apache.commons.lang3.tuple.Pair; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.*; +import java.util.stream.Collectors; /** * 公费医疗-比例调整申请记录 AppServiceImpl diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfRatioManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfRatioManageAppServiceImpl.java index fbc22352..e4b2370e 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfRatioManageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfRatioManageAppServiceImpl.java @@ -1,12 +1,5 @@ package com.openhis.web.nenu.appservice.impl; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -23,6 +16,12 @@ import com.openhis.nenu.service.IGfRatioService; import com.openhis.web.nenu.appservice.IGfRatioManageAppService; import com.openhis.web.nenu.dto.GfIndividualRatioDto; import com.openhis.web.nenu.mapper.GfRatioManageAppMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; /** * 公费医疗-自付比例管理 AppServiceImpl 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 e56758fe..001c9828 100644 --- 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 @@ -1,35 +1,6 @@ package com.openhis.web.nenu.appservice.impl; -import java.io.IOException; -import java.time.format.DateTimeParseException; -import java.util.*; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - -import javax.servlet.http.HttpServletResponse; - import com.alibaba.fastjson2.JSON; -import com.core.common.enums.TenantOptionDict; -import com.core.common.exception.ServiceException; -import com.core.web.util.TenantOptionUtil; -import com.openhis.web.nenu.dto.GfStudentPeisDto; -import com.openhis.web.nenu.dto.PeisStudentPatientDto; -import com.openhis.web.patientmanage.mapper.PatientManageMapper; -import com.openhis.yb.dto.BaseInfo; -import com.openhis.yb.dto.BaseParam; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.ContentType; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.util.EntityUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -37,8 +8,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.enums.DelFlag; +import com.core.common.enums.TenantOptionDict; +import com.core.common.exception.ServiceException; import com.core.common.utils.*; import com.core.common.utils.poi.ExcelUtil; +import com.core.web.util.TenantOptionUtil; import com.openhis.administration.domain.Patient; import com.openhis.administration.domain.PatientStudent; import com.openhis.administration.service.IPatientService; @@ -52,7 +26,27 @@ import com.openhis.common.utils.IdCardUtil; import com.openhis.web.nenu.appservice.IGfStudentListAppService; import com.openhis.web.nenu.dto.GfStudentListDto; import com.openhis.web.nenu.dto.GfStudentListImportDto; +import com.openhis.web.nenu.dto.GfStudentPeisDto; +import com.openhis.web.nenu.dto.PeisStudentPatientDto; import com.openhis.web.nenu.mapper.GfStudentListAppMapper; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.ContentType; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.time.format.DateTimeParseException; +import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; +import java.util.stream.IntStream; /** * 公费医疗-学生名单管理 AppServiceImpl diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfRatioApplicationRecordController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfRatioApplicationRecordController.java index ea5b76f9..03857045 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfRatioApplicationRecordController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfRatioApplicationRecordController.java @@ -1,11 +1,5 @@ package com.openhis.web.nenu.controller; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.core.common.core.domain.R; import com.openhis.web.nenu.appservice.IGfRatioApplicationRecordAppService; @@ -13,6 +7,11 @@ import com.openhis.web.nenu.dto.GfRatioApplicationDefinitionSelectDto; import com.openhis.web.nenu.dto.GfRatioApplicationPrintDto; import com.openhis.web.nenu.dto.GfRatioApplicationProcessDto; import com.openhis.web.nenu.dto.GfRatioApplicationRecordDto; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 公费医疗-比例调整申请记录 Controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfRatioManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfRatioManageController.java index fd49c15e..a20ab887 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfRatioManageController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfRatioManageController.java @@ -1,16 +1,15 @@ package com.openhis.web.nenu.controller; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.core.common.core.domain.R; import com.openhis.nenu.dto.GfTypeRatioDto; import com.openhis.web.nenu.appservice.IGfRatioManageAppService; import com.openhis.web.nenu.dto.GfIndividualRatioDto; import com.openhis.web.nenu.dto.GfTypeRatioSaveDto; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 公费医疗-自付比例管理 Controller 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 4a2b2bd2..a0a69652 100644 --- 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 @@ -1,16 +1,15 @@ package com.openhis.web.nenu.controller; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.core.common.core.domain.R; import com.openhis.web.nenu.appservice.IGfStudentListAppService; import com.openhis.web.nenu.dto.GfStudentListDto; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; /** * 公费医疗-学生名单管理 Controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfIndividualRatioDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfIndividualRatioDto.java index ed3b38e8..1b0e6fde 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfIndividualRatioDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfIndividualRatioDto.java @@ -1,17 +1,15 @@ package com.openhis.web.nenu.dto; -import java.math.BigDecimal; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; /** * 公费医疗-单项比例Dto diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationDefinitionSelectDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationDefinitionSelectDto.java index 0733c31c..04a67103 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationDefinitionSelectDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationDefinitionSelectDto.java @@ -2,7 +2,6 @@ package com.openhis.web.nenu.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; 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 1bbb9caa..a06b5fce 100644 --- 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 @@ -1,14 +1,13 @@ package com.openhis.web.nenu.dto; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import javax.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 82ea42dc..fdb7737c 100644 --- 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 @@ -1,21 +1,18 @@ package com.openhis.web.nenu.dto; -import java.math.BigDecimal; -import java.util.Date; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -import org.springframework.format.annotation.DateTimeFormat; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.util.Date; /** * 公费医疗-比例调整申请记录Dto 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 1f5fff87..c2337646 100644 --- 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 @@ -1,20 +1,17 @@ package com.openhis.web.nenu.dto; -import java.util.Date; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -import org.springframework.format.annotation.DateTimeFormat; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Date; /** * 公费医疗-学生名单Dto diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListImportDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListImportDto.java index e23a24e6..61be16e2 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListImportDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListImportDto.java @@ -1,11 +1,10 @@ package com.openhis.web.nenu.dto; -import java.util.Date; - import com.core.common.annotation.Excel; - import lombok.Data; +import java.util.Date; + /** * 公费医疗-学生名单导入Dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfTypeRatioSaveDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfTypeRatioSaveDto.java index e3faa7e2..9c6b7430 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfTypeRatioSaveDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfTypeRatioSaveDto.java @@ -1,13 +1,12 @@ package com.openhis.web.nenu.dto; -import java.util.List; - import com.openhis.nenu.dto.GfTypeRatioDto; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.List; + /** * 公费医疗-大项比例保存Dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfRatioApplicationRecordAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfRatioApplicationRecordAppMapper.java index fb579831..15fcf83d 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfRatioApplicationRecordAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfRatioApplicationRecordAppMapper.java @@ -1,14 +1,13 @@ package com.openhis.web.nenu.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.nenu.dto.GfRatioApplicationDefinitionSelectDto; import com.openhis.web.nenu.dto.GfRatioApplicationRecordDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; /** * 公费医疗-比例调整申请记录 Mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfRatioManageAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfRatioManageAppMapper.java index 31a5beca..912ad6d6 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfRatioManageAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfRatioManageAppMapper.java @@ -1,13 +1,12 @@ package com.openhis.web.nenu.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.nenu.dto.GfIndividualRatioDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; /** * 公费医疗-自付比例管理 Mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfStudentListAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfStudentListAppMapper.java index 26ba0ff4..e7e00696 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfStudentListAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfStudentListAppMapper.java @@ -1,14 +1,13 @@ package com.openhis.web.nenu.mapper; -import com.openhis.web.nenu.dto.GfStudentPeisDto; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.nenu.dto.GfStudentListDto; +import com.openhis.web.nenu.dto.GfStudentPeisDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; import java.util.List; 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 2fc61137..19bf80cc 100644 --- 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 @@ -1,12 +1,11 @@ package com.openhis.web.outpatientmanage.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - import com.core.common.core.domain.R; import com.openhis.web.outpatientmanage.dto.OutpatientInfusionPatientDto; +import javax.servlet.http.HttpServletRequest; +import java.util.List; + /** * 门诊管理——输液实现类 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientSkinTestAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientSkinTestAppService.java index 1663c98e..6835e6d8 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientSkinTestAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientSkinTestAppService.java @@ -1,11 +1,11 @@ package com.openhis.web.outpatientmanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.outpatientmanage.dto.SkinTestQueryDto; import com.openhis.web.outpatientmanage.dto.SkinTestSaveDto; +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 3ce5a59e..58f70708 100644 --- 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 @@ -1,13 +1,12 @@ package com.openhis.web.outpatientmanage.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - import com.core.common.core.domain.R; +import com.openhis.web.common.dto.PerformInfoDto; import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentEncounterDto; import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentInfoDto; -import com.openhis.web.common.dto.PerformInfoDto; + +import javax.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 7d6cabe1..79d3d846 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.outpatientmanage.appservice.impl; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -31,6 +21,14 @@ import com.openhis.web.outpatientmanage.mapper.OutpatientInfusionAppMapper; import com.openhis.workflow.domain.ServiceRequest; import com.openhis.workflow.mapper.ServiceRequestMapper; import com.openhis.workflow.service.IServiceRequestService; +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 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 6b822540..bd069b67 100644 --- 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 @@ -1,13 +1,5 @@ package com.openhis.web.outpatientmanage.appservice.impl; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.core.common.core.domain.R; import com.core.common.utils.MessageUtils; import com.openhis.clinical.domain.AllergyIntolerance; @@ -23,6 +15,12 @@ import com.openhis.web.outpatientmanage.dto.SkinTestQueryDto; import com.openhis.web.outpatientmanage.dto.SkinTestSaveDto; import com.openhis.web.outpatientmanage.mapper.OutpatientSkinTestAppMapper; import com.openhis.workflow.service.IActivityDefinitionService; +import org.springframework.stereotype.Service; + +import javax.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 ea0a81f6..5b05b4db 100644 --- 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 @@ -1,14 +1,6 @@ package com.openhis.web.outpatientmanage.appservice.impl; -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.stereotype.Service; - +import cn.hutool.core.lang.Pair; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -49,8 +41,13 @@ import com.openhis.workflow.service.IDeviceDispenseService; import com.openhis.workflow.service.IDeviceRequestService; import com.openhis.workflow.service.IInventoryItemService; import com.openhis.workflow.service.IServiceRequestService; +import org.springframework.stereotype.Service; -import cn.hutool.core.lang.Pair; +import javax.annotation.Resource; +import javax.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 83e1a658..02031ee4 100644 --- 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 @@ -1,18 +1,15 @@ package com.openhis.web.outpatientmanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.outpatientmanage.appservice.IOutpatientInfusionAppService; import com.openhis.web.outpatientmanage.dto.OutpatientInfusionPatientDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; /** * 门诊输液记录 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientSkinTestAppController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientSkinTestAppController.java index 9766f6ba..d1cf7549 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientSkinTestAppController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientSkinTestAppController.java @@ -1,14 +1,12 @@ package com.openhis.web.outpatientmanage.controller; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.outpatientmanage.appservice.IOutpatientSkinTestAppService; import com.openhis.web.outpatientmanage.dto.SkinTestSaveDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; /** * 门诊皮试 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 f121f0ff..84b30b48 100644 --- 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 @@ -1,20 +1,17 @@ package com.openhis.web.outpatientmanage.controller; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.common.dto.PerformInfoDto; import com.openhis.web.outpatientmanage.appservice.IOutpatientTreatmentAppService; import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentEncounterDto; import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentInfoDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; /** * 门诊处置 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/AllergyIntoInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/AllergyIntoInitDto.java index 90522667..89adbaf9 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/AllergyIntoInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/AllergyIntoInitDto.java @@ -1,10 +1,10 @@ package com.openhis.web.outpatientmanage.dto; -import java.util.List; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 皮试检查 初始数据Dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/BloodTransfusionPatchDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/BloodTransfusionPatchDto.java index 8fb83564..59eec512 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/BloodTransfusionPatchDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/BloodTransfusionPatchDto.java @@ -3,13 +3,12 @@ */ package com.openhis.web.outpatientmanage.dto; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 输血贴 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionPatientDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionPatientDto.java index 6689e553..3dd2b38a 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionPatientDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionPatientDto.java @@ -1,12 +1,10 @@ package com.openhis.web.outpatientmanage.dto; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotNull; import java.util.Date; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionRecordDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionRecordDto.java index 6e58312b..0a5ec6d2 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionRecordDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionRecordDto.java @@ -1,15 +1,12 @@ package com.openhis.web.outpatientmanage.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; +import java.math.BigDecimal; /** * 门诊输液记录Dto diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientStationInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientStationInitDto.java index 1c2fc38f..84a56adb 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientStationInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientStationInitDto.java @@ -3,11 +3,11 @@ */ package com.openhis.web.outpatientmanage.dto; -import java.util.List; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 门诊工作站初始化dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientTreatmentEncounterDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientTreatmentEncounterDto.java index 04166be1..7052ab5d 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientTreatmentEncounterDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientTreatmentEncounterDto.java @@ -6,7 +6,6 @@ package com.openhis.web.outpatientmanage.dto; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientTreatmentInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientTreatmentInfoDto.java index 77d83792..9086d8da 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientTreatmentInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientTreatmentInfoDto.java @@ -3,15 +3,14 @@ */ package com.openhis.web.outpatientmanage.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 处方信息 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/SkinTestMedLotNumberDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/SkinTestMedLotNumberDto.java index 0bc4a637..5172c9b3 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/SkinTestMedLotNumberDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/SkinTestMedLotNumberDto.java @@ -5,7 +5,6 @@ package com.openhis.web.outpatientmanage.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/SkinTestQueryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/SkinTestQueryDto.java index a5c702d2..51bb0193 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/SkinTestQueryDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/SkinTestQueryDto.java @@ -3,18 +3,16 @@ */ package com.openhis.web.outpatientmanage.dto; -import java.util.Date; -import java.util.List; - -import org.springframework.format.annotation.DateTimeFormat; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +import java.util.List; /** * 皮试检查 查询Dto diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/SkinTestSaveDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/SkinTestSaveDto.java index b58303ff..b577d929 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/SkinTestSaveDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/SkinTestSaveDto.java @@ -3,16 +3,14 @@ */ package com.openhis.web.outpatientmanage.dto; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * 皮试检查 保存Dto diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientInfusionAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientInfusionAppMapper.java index f130add9..6474087b 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientInfusionAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientInfusionAppMapper.java @@ -1,15 +1,14 @@ package com.openhis.web.outpatientmanage.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.outpatientmanage.dto.OutpatientInfusionPatientDto; import com.openhis.web.outpatientmanage.dto.OutpatientInfusionRecordDto; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 门诊管理 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientSkinTestAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientSkinTestAppMapper.java index e38f981b..727213bf 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientSkinTestAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientSkinTestAppMapper.java @@ -1,12 +1,11 @@ package com.openhis.web.outpatientmanage.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.openhis.web.outpatientmanage.dto.SkinTestMedLotNumberDto; import com.openhis.web.outpatientmanage.dto.SkinTestQueryDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 门诊皮试 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientTreatmentAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientTreatmentAppMapper.java index c8df7a0c..0e4bd650 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientTreatmentAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientTreatmentAppMapper.java @@ -3,11 +3,6 @@ */ package com.openhis.web.outpatientmanage.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,6 +10,10 @@ import com.openhis.web.common.dto.PerformRecordDto; import com.openhis.web.outpatientmanage.dto.BloodTransfusionPatchDto; import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentEncounterDto; import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentInfoDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public interface OutpatientTreatmentAppMapper { 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 cf762e19..e886c29b 100644 --- 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 @@ -1,12 +1,12 @@ package com.openhis.web.patientmanage.appservice; -import javax.servlet.http.HttpServletRequest; - import com.baomidou.mybatisplus.core.metadata.IPage; 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; + /** * 门诊记录查询 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 901fabff..537ce538 100644 --- 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 @@ -1,12 +1,12 @@ package com.openhis.web.patientmanage.appservice; -import javax.servlet.http.HttpServletRequest; - import com.baomidou.mybatisplus.core.metadata.IPage; 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; + /** * 病人管理——病人信息 * 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 0dd059cb..633ea1cd 100644 --- 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 @@ -1,13 +1,5 @@ package com.openhis.web.patientmanage.appservice.impl; -import java.util.Arrays; -import java.util.HashSet; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -22,6 +14,12 @@ import com.openhis.web.patientmanage.appservice.IOutpatientRecordService; import com.openhis.web.patientmanage.dto.OutpatientRecordDto; import com.openhis.web.patientmanage.dto.OutpatientRecordSearchParam; import com.openhis.web.patientmanage.mapper.PatientManageMapper; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import javax.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 9344b6c1..b29b3c0d 100644 --- 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 @@ -1,17 +1,5 @@ package com.openhis.web.patientmanage.appservice.impl; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -40,6 +28,16 @@ import com.openhis.web.patientmanage.dto.PatientBaseInfoDto; import com.openhis.web.patientmanage.dto.PatientIdInfoDto; import com.openhis.web.patientmanage.dto.PatientInfoInitDto; 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 java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +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/patientmanage/controller/PatientInformationController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java index 0421ab80..7bf15450 100644 --- 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 @@ -1,16 +1,14 @@ package com.openhis.web.patientmanage.controller; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.patientmanage.appservice.IPatientInformationService; import com.openhis.web.patientmanage.dto.PatientBaseInfoDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; /** * 病人管理——病人信息 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordDto.java index d29badef..5f09f1aa 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/OutpatientRecordDto.java @@ -1,14 +1,13 @@ package com.openhis.web.patientmanage.dto; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 门诊记录 Dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientBaseInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientBaseInfoDto.java index bb84e721..9fcc7aa9 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientBaseInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientBaseInfoDto.java @@ -1,16 +1,15 @@ package com.openhis.web.patientmanage.dto; -import java.util.Date; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; +import java.util.List; + /** * 病人信息 Dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientIdInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientIdInfoDto.java index e8ae0074..fe95b473 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientIdInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientIdInfoDto.java @@ -1,14 +1,13 @@ package com.openhis.web.patientmanage.dto; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 病人证件信息 Dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/mapper/PatientManageMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/mapper/PatientManageMapper.java index 7966751c..8177d3c1 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/mapper/PatientManageMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/mapper/PatientManageMapper.java @@ -1,10 +1,5 @@ package com.openhis.web.patientmanage.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -14,6 +9,10 @@ import com.openhis.administration.domain.Patient; import com.openhis.web.patientmanage.dto.OutpatientRecordDto; import com.openhis.web.patientmanage.dto.PatientBaseInfoDto; import com.openhis.web.patientmanage.dto.PatientIdInfoDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 病人信息管理 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChangePriceService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChangePriceService.java index a12f03e2..e6290587 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChangePriceService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChangePriceService.java @@ -3,8 +3,6 @@ package com.openhis.web.paymentmanage.appservice; import com.github.pagehelper.PageInfo; import com.openhis.web.paymentmanage.dto.ChangePriceListDto; -import java.util.List; - /** * Desc: * @Author raymond diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChargeBillService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChargeBillService.java index 40255bd1..47c52189 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChargeBillService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChargeBillService.java @@ -1,10 +1,10 @@ package com.openhis.web.paymentmanage.appservice; -import java.util.Map; - import com.core.common.core.domain.R; import com.openhis.web.paymentmanage.dto.ChargeSummaryDto; +import java.util.Map; + public interface IChargeBillService { /** * 小票信息 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IEleInvoiceService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IEleInvoiceService.java index ea5984d9..71270417 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IEleInvoiceService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IEleInvoiceService.java @@ -5,12 +5,6 @@ package com.openhis.web.paymentmanage.appservice; import com.core.common.core.domain.R; import com.openhis.administration.domain.Invoice; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; /** * 电子发票接口Service 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 57426f9f..184baf59 100644 --- 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 @@ -3,20 +3,22 @@ */ package com.openhis.web.paymentmanage.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.core.common.core.domain.R; import com.openhis.web.chargemanage.dto.OutpatientRegistrationAddParam; import com.openhis.web.chargemanage.dto.OutpatientRegistrationSettleParam; -import com.openhis.web.paymentmanage.dto.*; +import com.openhis.web.paymentmanage.dto.CancelPaymentDto; +import com.openhis.web.paymentmanage.dto.InpatientPreSettleResultDto; +import com.openhis.web.paymentmanage.dto.NenuBpcPayDto; +import com.openhis.web.paymentmanage.dto.PaymentVO; import com.openhis.yb.dto.PaymentDetailDto; import com.openhis.yb.dto.PaymentDto; import com.openhis.yb.dto.PaymentInpatientDto; import com.openhis.yb.dto.PrePaymentDto; +import javax.servlet.http.HttpServletRequest; +import java.util.List; + /** * 付款应用层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 ede44f32..7654ab4a 100644 --- 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 @@ -1,6 +1,5 @@ package com.openhis.web.paymentmanage.appservice.impl; -import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.openhis.medication.domain.MedicationDefinition; import com.openhis.web.paymentmanage.appservice.IChangePriceService; 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 34c45fa4..c6038704 100644 --- 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 @@ -3,36 +3,6 @@ */ package com.openhis.web.paymentmanage.appservice.impl; -import java.io.IOException; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.text.DecimalFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.apache.commons.codec.digest.DigestUtils; -import org.apache.http.HttpResponse; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.ContentType; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.util.EntityUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; @@ -66,8 +36,35 @@ import com.openhis.web.paymentmanage.mapper.EleInvoiceMapper; import com.openhis.yb.domain.ClinicReg; import com.openhis.yb.service.IClinicSettleService; import com.openhis.yb.service.IRegService; - import lombok.extern.slf4j.Slf4j; +import org.apache.commons.codec.digest.DigestUtils; +import org.apache.http.HttpResponse; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.ContentType; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.util.EntityUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.io.IOException; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.text.DecimalFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; /** * 电子发票接口Service 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 4b628433..a1306222 100644 --- 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 @@ -3,25 +3,6 @@ */ package com.openhis.web.paymentmanage.appservice.impl; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.format.DateTimeFormatter; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.util.StringUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -42,7 +23,6 @@ import com.openhis.administration.service.impl.PatientStudentServiceImpl; import com.openhis.common.constant.CommonConstants; import com.openhis.common.constant.PromptMsgConstant; import com.openhis.common.enums.*; -import com.openhis.common.enums.PaymentOutcome; import com.openhis.common.enums.ybenums.YbMdtrtCertType; import com.openhis.common.enums.ybenums.YbPayment; import com.openhis.common.enums.ybenums.YbPsnSetlWay; @@ -88,8 +68,24 @@ import com.openhis.yb.service.IClinicSettleService; import com.openhis.yb.service.IInpatientSettleService; import com.openhis.yb.service.IRegService; import com.openhis.yb.service.YbManager; - import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.apache.poi.util.StringUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +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 java.math.BigDecimal; +import java.math.RoundingMode; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +import java.util.*; +import java.util.stream.Collectors; /** * 付款应用层Service 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 6c8adbaa..4402cd94 100644 --- 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 @@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.core.common.constant.Constants; import com.core.common.core.domain.R; import com.core.common.enums.TenantOptionDict; import com.core.common.exception.ServiceException; @@ -15,7 +14,6 @@ import com.core.web.util.TenantOptionUtil; import com.openhis.administration.domain.Practitioner; import com.openhis.administration.service.IPractitionerService; import com.openhis.common.constant.CommonConstants; -import com.openhis.common.enums.PaymentStatus; import com.openhis.common.utils.HisQueryUtils; import com.openhis.financial.domain.PaymentReconciliation; import com.openhis.financial.domain.ThreePartPayCallBack; @@ -23,11 +21,8 @@ import com.openhis.financial.service.IPaymentRecDetailService; import com.openhis.financial.service.IPaymentReconciliationService; import com.openhis.financial.service.ThreePartPayCallBackService; import com.openhis.web.paymentmanage.appservice.ThreePartPayService; -import com.openhis.web.paymentmanage.dto.PaymentVO; import com.openhis.web.paymentmanage.dto.ThreePartCallBackVo; import com.openhis.web.paymentmanage.mapper.PaymentMapper; -import com.openhis.yb.dto.BaseInfo; -import com.openhis.yb.dto.BaseParam; import com.openhis.yb.dto.PaymentDetailDto; import com.openhis.yb.dto.ThreePartPayDto; import lombok.extern.slf4j.Slf4j; @@ -53,7 +48,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import java.util.function.Consumer; @Component @Slf4j diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ThreePartSimpleFieldMappingService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ThreePartSimpleFieldMappingService.java index d0bbc136..8dcc6547 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ThreePartSimpleFieldMappingService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ThreePartSimpleFieldMappingService.java @@ -5,10 +5,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.openhis.web.paymentmanage.util.ReverseMappingProperties; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Service; + 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/paymentmanage/controller/ChargeBillController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ChargeBillController.java index 4d0fa8b7..f0cddd60 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ChargeBillController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ChargeBillController.java @@ -1,14 +1,12 @@ package com.openhis.web.paymentmanage.controller; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - import com.core.common.annotation.Anonymous; import com.core.common.core.domain.R; import com.openhis.web.paymentmanage.appservice.IChargeBillService; import com.openhis.web.paymentmanage.dto.ChargeSummaryDto; - import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; /** * 报表 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/EleInvoiceController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/EleInvoiceController.java index 30c98547..9e24d520 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/EleInvoiceController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/EleInvoiceController.java @@ -4,7 +4,6 @@ import com.core.common.core.domain.R; import com.core.common.exception.ServiceException; import com.openhis.administration.domain.Invoice; import com.openhis.common.enums.ybenums.YbEncounterClass; -import com.openhis.financial.domain.PaymentReconciliation; import com.openhis.web.paymentmanage.appservice.IChargeBillService; import com.openhis.web.paymentmanage.appservice.IEleInvoiceService; import com.openhis.web.paymentmanage.dto.InvoiceWriteOffDto; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentContractController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentContractController.java index fbac2303..39f20619 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentContractController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentContractController.java @@ -3,17 +3,15 @@ */ package com.openhis.web.paymentmanage.controller; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.core.common.core.domain.R; import com.openhis.financial.domain.Contract; import com.openhis.financial.service.IContractService; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; /** * 付款合同管理 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 95c7d7fc..3fce3152 100644 --- 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 @@ -3,15 +3,6 @@ */ package com.openhis.web.paymentmanage.controller; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.core.common.enums.TenantOptionDict; import com.core.web.util.TenantOptionUtil; @@ -27,9 +18,15 @@ import com.openhis.web.paymentmanage.dto.NenuBpcPayDto; import com.openhis.yb.dto.PaymentDto; import com.openhis.yb.dto.PaymentInpatientDto; import com.openhis.yb.dto.PrePaymentDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +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 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 0de64722..1a00263e 100644 --- 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 @@ -1,21 +1,7 @@ package com.openhis.web.paymentmanage.controller; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.core.common.core.domain.R; -import com.core.common.enums.TenantOptionDict; -import com.core.common.utils.SecurityUtils; -import com.core.web.util.TenantOptionUtil; -import com.openhis.administration.domain.Practitioner; -import com.openhis.administration.service.IPractitionerService; -import com.openhis.administration.service.impl.PractitionerServiceImpl; -import com.openhis.financial.domain.PaymentRecDetail; -import com.openhis.financial.domain.PaymentReconciliation; -import com.openhis.financial.service.IPaymentRecDetailService; -import com.openhis.financial.service.IPaymentReconciliationService; import com.openhis.web.paymentmanage.appservice.ThreePartPayService; -import com.openhis.yb.dto.PaymentDetailDto; -import com.openhis.yb.dto.PaymentDto; import com.openhis.yb.dto.ThreePartPayDto; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -23,10 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; -import java.math.BigDecimal; -import java.security.Security; -import java.util.HashMap; -import java.util.Map; /** * 第三方支付管理 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 e96463a3..dcea42c7 100644 --- 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 @@ -3,15 +3,13 @@ */ package com.openhis.web.paymentmanage.dto; -import java.util.List; - -import javax.validation.constraints.NotEmpty; - import com.openhis.yb.dto.PaymentDetailDto; - import lombok.Data; import lombok.experimental.Accessors; +import javax.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 fdc5060c..e87a1088 100644 --- 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 @@ -1,18 +1,16 @@ package com.openhis.web.paymentmanage.dto; -import java.math.BigDecimal; -import java.util.List; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.yb.dto.PaymentDetailDto; - import lombok.Data; import lombok.experimental.Accessors; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.util.List; + @Data @Accessors(chain = true) public class CancelRegPaymentDto { diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDetailVO.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDetailVO.java index 75097b55..c25d5613 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDetailVO.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDetailVO.java @@ -1,6 +1,5 @@ package com.openhis.web.paymentmanage.dto; -import com.openhis.administration.domain.ChargeItem; import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeSummaryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeSummaryDto.java index cec1231c..a23cc5e3 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeSummaryDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeSummaryDto.java @@ -1,7 +1,6 @@ package com.openhis.web.paymentmanage.dto; import lombok.Data; -import org.springframework.web.bind.annotation.RequestParam; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2206OrderResultDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2206OrderResultDto.java index d8dcf016..9428b390 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2206OrderResultDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2206OrderResultDto.java @@ -8,7 +8,6 @@ import lombok.Data; import lombok.experimental.Accessors; import java.math.BigDecimal; -import java.util.List; /** * 预结算结果集 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2207OrderResultDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2207OrderResultDto.java index 7e2b9f42..fb0071d7 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2207OrderResultDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2207OrderResultDto.java @@ -1,7 +1,6 @@ package com.openhis.web.paymentmanage.dto; import com.openhis.yb.dto.Clinic2207OrderResult; -import lombok.Data; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceChargeDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceChargeDetailDto.java index 4a7e0ddd..0a3fded0 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceChargeDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceChargeDetailDto.java @@ -3,9 +3,6 @@ */ package com.openhis.web.paymentmanage.dto; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceListDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceListDetailDto.java index 4f489639..a0bf3ec7 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceListDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceListDetailDto.java @@ -3,8 +3,6 @@ */ package com.openhis.web.paymentmanage.dto; -import com.alibaba.fastjson2.annotation.JSONField; -import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePaymentInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePaymentInfoDto.java index 3885d728..9242833b 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePaymentInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePaymentInfoDto.java @@ -3,12 +3,10 @@ */ package com.openhis.web.paymentmanage.dto; -import java.math.BigDecimal; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; -import org.apache.poi.hpsf.Decimal; + +import java.math.BigDecimal; /** * 付款信息 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceResultDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceResultDto.java index abe4a6a9..3dc052a8 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceResultDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceResultDto.java @@ -3,14 +3,12 @@ */ package com.openhis.web.paymentmanage.dto; -import java.math.BigDecimal; - -import com.openhis.common.annotation.Dict; - import com.openhis.common.enums.InvoiceStatus; import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 返回信息 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleDto.java index ec6c7130..a41ad7c6 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleDto.java @@ -3,17 +3,16 @@ */ package com.openhis.web.paymentmanage.dto; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonProperty; import com.openhis.yb.dto.Clinic2206FundPaymentResult; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + /** * TODO:请概括描述当前类的主要用途和注意事项 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleResultDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleResultDto.java index fbc3adc4..2ee10d5e 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleResultDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleResultDto.java @@ -3,13 +3,12 @@ */ package com.openhis.web.paymentmanage.dto; -import java.util.List; - import com.openhis.financial.domain.PaymentReconciliation; import com.openhis.financial.model.PaymentRecDetailDto; - import lombok.Data; +import java.util.List; + /** * 住院预结算回显数据 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InvoiceBaseInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InvoiceBaseInfoDto.java index 3ee5c411..f416db69 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InvoiceBaseInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InvoiceBaseInfoDto.java @@ -3,16 +3,15 @@ */ package com.openhis.web.paymentmanage.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 电子发票基础信息查询实体 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/NenuBpcPayDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/NenuBpcPayDto.java index f1fe3995..e5c463a0 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/NenuBpcPayDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/NenuBpcPayDto.java @@ -3,11 +3,11 @@ */ package com.openhis.web.paymentmanage.dto; -import java.math.BigDecimal; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 师大Bpc支付入参 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/OrgIncomeDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/OrgIncomeDto.java index 7c07a174..bc6c6e24 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/OrgIncomeDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/OrgIncomeDto.java @@ -1,10 +1,10 @@ package com.openhis.web.paymentmanage.dto; -import java.math.BigDecimal; - import lombok.Getter; import lombok.Setter; +import java.math.BigDecimal; + @Getter @Setter public class OrgIncomeDto { diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentVO.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentVO.java index 1a1fabfe..9b4ee155 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentVO.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentVO.java @@ -3,15 +3,14 @@ */ package com.openhis.web.paymentmanage.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; +import java.math.BigDecimal; +import java.util.Date; + /** * 映射对象 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ReportVo.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ReportVo.java index c4a388ba..3e911b8b 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ReportVo.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ReportVo.java @@ -1,12 +1,10 @@ package com.openhis.web.paymentmanage.dto; -import java.util.Date; - +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import com.fasterxml.jackson.annotation.JsonFormat; - -import lombok.Data; +import java.util.Date; @Data public class ReportVo { diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartCallBackVo.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartCallBackVo.java index 771c0944..0f64b5b9 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartCallBackVo.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartCallBackVo.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.financial.domain.ThreePartPayCallBack; import lombok.Data; -import java.math.BigDecimal; - @Data public class ThreePartCallBackVo extends ThreePartPayCallBack { diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChangePriceMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChangePriceMapper.java index 7a66d53f..e222b1a0 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChangePriceMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChangePriceMapper.java @@ -1,7 +1,6 @@ package com.openhis.web.paymentmanage.mapper; import com.openhis.medication.domain.MedicationDefinition; -import com.openhis.web.paymentmanage.dto.ChangePriceListDto; import org.springframework.stereotype.Component; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChargeBillMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChargeBillMapper.java index b76f367c..85bfe4ad 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChargeBillMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChargeBillMapper.java @@ -1,6 +1,5 @@ package com.openhis.web.paymentmanage.mapper; -import com.openhis.web.paymentmanage.dto.ChargeItemDetailVO; import com.openhis.web.paymentmanage.dto.ChargeItemExtendInfoDto; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/EleInvoiceMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/EleInvoiceMapper.java index 38995525..8cba023a 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/EleInvoiceMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/EleInvoiceMapper.java @@ -3,15 +3,14 @@ */ package com.openhis.web.paymentmanage.mapper; -import java.util.List; - import com.openhis.web.paymentmanage.dto.EleInvoiceChargeDetailDto; import com.openhis.web.paymentmanage.dto.EleInvoiceListDetailDto; - import com.openhis.web.paymentmanage.dto.EleInvoicePatientInfoDto; import com.openhis.web.paymentmanage.dto.EleInvoicePaymentInfoDto; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 电子发票 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/PaymentMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/PaymentMapper.java index cf21b444..beee26ae 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/PaymentMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/PaymentMapper.java @@ -3,12 +3,6 @@ */ package com.openhis.web.paymentmanage.mapper; -import java.util.List; - -import com.openhis.web.paymentmanage.dto.ThreePartCallBackVo; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; @@ -16,7 +10,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.paymentmanage.dto.ChargeItemDto; import com.openhis.web.paymentmanage.dto.DispenseQuantityDto; import com.openhis.web.paymentmanage.dto.PaymentVO; +import com.openhis.web.paymentmanage.dto.ThreePartCallBackVo; import com.openhis.yb.dto.PaymentDetailDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 付款Dao 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 44b50469..1ea6ad7c 100644 --- 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 @@ -3,13 +3,13 @@ */ package com.openhis.web.personalization.appservice; -import javax.servlet.http.HttpServletRequest; - import com.core.common.core.domain.R; 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; + /** * 诊疗耗材绑定 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 b43238e9..3d3d202f 100644 --- 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 @@ -3,16 +3,6 @@ */ package com.openhis.web.personalization.appservice.impl; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -33,6 +23,14 @@ import com.openhis.web.personalization.appservice.IActivityDeviceAppService; import com.openhis.web.personalization.dto.ActivityDeviceDto; 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 java.util.ArrayList; +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/personalization/appservice/impl/IOrderGroupAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/IOrderGroupAppServiceImpl.java index 746eb659..3d02e031 100644 --- 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 @@ -1,14 +1,5 @@ package com.openhis.web.personalization.appservice.impl; -import java.util.HashSet; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -27,6 +18,13 @@ import com.openhis.web.personalization.appservice.IOrderGroupAppService; import com.openhis.web.personalization.dto.OrderGroupDto; import com.openhis.web.personalization.dto.OrderGroupInitDto; import com.openhis.web.personalization.mapper.OrderGroupAppMapper; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.HashSet; +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/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java index e639f753..c604d956 100644 --- 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 @@ -1,14 +1,5 @@ package com.openhis.web.personalization.appservice.impl; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.core.common.core.domain.R; import com.core.common.exception.ServiceException; @@ -27,6 +18,13 @@ import com.openhis.web.doctorstation.dto.AdviceBaseDto; import com.openhis.web.personalization.appservice.IOrdersGroupPackageAppService; import com.openhis.web.personalization.dto.*; import com.openhis.web.personalization.mapper.OrdersGroupPackageAppMapper; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +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/personalization/controller/ActivityDeviceController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/ActivityDeviceController.java index 1573838f..06799191 100644 --- 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 @@ -3,20 +3,18 @@ */ package com.openhis.web.personalization.controller; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.datadictionary.dto.DeviceManageSelParam; import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam; import com.openhis.web.personalization.appservice.IActivityDeviceAppService; import com.openhis.web.personalization.dto.ActivityDeviceDto; - import lombok.AllArgsConstructor; 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; /** * 耗材诊疗绑定 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 aaf84215..e2e46472 100644 --- 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 @@ -3,17 +3,15 @@ */ package com.openhis.web.personalization.controller; -import javax.annotation.Resource; - -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.personalization.appservice.IOrderGroupAppService; import com.openhis.web.personalization.dto.OrderGroupDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; /** * 组套 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/OrdersGroupPackageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/OrdersGroupPackageController.java index ffc9a02e..6dda9552 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/OrdersGroupPackageController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/OrdersGroupPackageController.java @@ -3,15 +3,13 @@ */ package com.openhis.web.personalization.controller; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.common.enums.BindingType; import com.openhis.web.personalization.appservice.IOrdersGroupPackageAppService; import com.openhis.web.personalization.dto.OrdersGroupPackageSaveDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; /** * 组合套餐 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/ActivityDeviceDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/ActivityDeviceDto.java index 11f5af61..e8de1370 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/ActivityDeviceDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/ActivityDeviceDto.java @@ -6,7 +6,6 @@ package com.openhis.web.personalization.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/ActivityDeviceInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/ActivityDeviceInitDto.java index 787dfbaa..10fc027b 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/ActivityDeviceInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/ActivityDeviceInitDto.java @@ -3,11 +3,11 @@ */ package com.openhis.web.personalization.dto; -import java.util.List; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 诊疗耗材绑定初始化 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrderGroupDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrderGroupDto.java index b1f20deb..8f19eebf 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrderGroupDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrderGroupDto.java @@ -6,7 +6,6 @@ package com.openhis.web.personalization.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrderGroupInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrderGroupInitDto.java index 439ab26b..7f9c03a5 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrderGroupInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrderGroupInitDto.java @@ -3,11 +3,11 @@ */ package com.openhis.web.personalization.dto; -import java.util.List; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 组套初始化 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailQueryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailQueryDto.java index 0a49e1ff..019a6eed 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailQueryDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailQueryDto.java @@ -3,16 +3,15 @@ */ package com.openhis.web.personalization.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; import com.openhis.web.doctorstation.dto.AdviceBaseDto; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 组合套餐明细查询 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailSaveDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailSaveDto.java index 1f8ea403..c4fc065f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailSaveDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailSaveDto.java @@ -3,14 +3,13 @@ */ package com.openhis.web.personalization.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 组合套餐明细保存 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDto.java index 0cf63895..844ed61e 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDto.java @@ -3,15 +3,14 @@ */ package com.openhis.web.personalization.dto; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 组合套餐 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageQueryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageQueryDto.java index 4ab3f419..6a699b37 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageQueryDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageQueryDto.java @@ -5,7 +5,6 @@ package com.openhis.web.personalization.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageSaveDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageSaveDto.java index ab89b23d..edb2c0c7 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageSaveDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageSaveDto.java @@ -3,14 +3,13 @@ */ package com.openhis.web.personalization.dto; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 组合套餐保存 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageUseDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageUseDto.java index 82ac8a8e..398b26c5 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageUseDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageUseDto.java @@ -3,12 +3,12 @@ */ package com.openhis.web.personalization.dto; -import java.util.List; - import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 组合套餐(人员使用) dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/ActivityDeviceAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/ActivityDeviceAppMapper.java index 285ca073..388085a2 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/ActivityDeviceAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/ActivityDeviceAppMapper.java @@ -3,13 +3,12 @@ */ package com.openhis.web.personalization.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.personalization.dto.ActivityDeviceDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; /** * 诊疗耗材绑定 appMapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/OrderGroupAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/OrderGroupAppMapper.java index cf3db5c3..cd6cecba 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/OrderGroupAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/OrderGroupAppMapper.java @@ -3,13 +3,12 @@ */ package com.openhis.web.personalization.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.personalization.dto.OrderGroupDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; /** * 组套 Mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/OrdersGroupPackageAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/OrdersGroupPackageAppMapper.java index aa9baff0..0f0a77cd 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/OrdersGroupPackageAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/OrdersGroupPackageAppMapper.java @@ -3,13 +3,12 @@ */ package com.openhis.web.personalization.mapper; -import java.util.List; - +import com.openhis.web.personalization.dto.OrdersGroupPackageDetailQueryDto; +import com.openhis.web.personalization.dto.OrdersGroupPackageQueryDto; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.openhis.web.personalization.dto.OrdersGroupPackageDetailQueryDto; -import com.openhis.web.personalization.dto.OrdersGroupPackageQueryDto; +import java.util.List; /** * 组合套餐 Mapper 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 0c37377e..19a07347 100644 --- 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 @@ -1,11 +1,11 @@ package com.openhis.web.pharmacyDispensarymanage.appservice; -import javax.servlet.http.HttpServletRequest; - 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; + /** * 药房共通方法 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryDispensingOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryDispensingOrderService.java index 8b5477bd..73bfee6f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryDispensingOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryDispensingOrderService.java @@ -1,9 +1,8 @@ package com.openhis.web.pharmacyDispensarymanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; -import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto; + +import java.util.List; /** * 药房发药单 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryProfitLossOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryProfitLossOrderService.java index a2fb777b..44c6bf39 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryProfitLossOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryProfitLossOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.pharmacyDispensarymanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto; +import java.util.List; + /** * 药房损益单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReceiptApprovalService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReceiptApprovalService.java index bdb26392..da486ebd 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReceiptApprovalService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReceiptApprovalService.java @@ -1,11 +1,10 @@ package com.openhis.web.pharmacyDispensarymanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; -import com.openhis.web.inventorymanage.dto.ItemChargeDetailDto; import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto; +import java.util.List; + /** * 药房审批方法 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryRequisitionOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryRequisitionOrderService.java index e36c9590..25174b44 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryRequisitionOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryRequisitionOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.pharmacyDispensarymanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto; +import java.util.List; + /** * 药房请领单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReturnToWarehouseOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReturnToWarehouseOrderService.java index 0b70e967..a2b25e32 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReturnToWarehouseOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryReturnToWarehouseOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.pharmacyDispensarymanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto; +import java.util.List; + /** * 药房退库单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStockInOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStockInOrderService.java index d9ae6f87..4ea953cf 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStockInOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStockInOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.pharmacyDispensarymanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto; +import java.util.List; + /** * 药房入库单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStocktakingOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStocktakingOrderService.java index 1fd7fbcb..5ad38210 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStocktakingOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryStocktakingOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.pharmacyDispensarymanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto; +import java.util.List; + /** * 药房盘点单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferInOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferInOrderService.java index 5bbc44dc..34c9c3cf 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferInOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferInOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.pharmacyDispensarymanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto; +import java.util.List; + /** * 药房调入单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferOutOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferOutOrderService.java index e6eb5188..5c45e18c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferOutOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/IPharmacyDispensaryTransferOutOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.pharmacyDispensarymanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto; +import java.util.List; + /** * 药房调出单 * 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 6c882806..6450af43 100644 --- 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 @@ -1,27 +1,11 @@ package com.openhis.web.pharmacyDispensarymanage.appservice.impl; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import com.openhis.workflow.domain.SupplyRequest; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; -import com.core.common.utils.AssignSeqUtil; import com.core.common.utils.MessageUtils; import com.openhis.administration.domain.Practitioner; import com.openhis.administration.domain.Supplier; -import com.openhis.administration.service.ILocationService; import com.openhis.administration.service.IPractitionerService; import com.openhis.administration.service.ISupplierService; import com.openhis.common.constant.CommonConstants; @@ -40,8 +24,18 @@ import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryMedicationInfoDto; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam; import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper; -import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryRequisitionOrderMapper; +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 java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +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/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryDispensingOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryDispensingOrderServiceImpl.java index 3f7ec952..d7c1a6c7 100644 --- 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 @@ -1,13 +1,5 @@ package com.openhis.web.pharmacyDispensarymanage.appservice.impl; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -24,6 +16,12 @@ import com.openhis.workflow.domain.SupplyDelivery; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyDeliveryService; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.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 12a0c6bb..99270dcc 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.pharmacyDispensarymanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -27,6 +17,14 @@ import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto; import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +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/PharmacyDispensaryReceiptApprovalServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReceiptApprovalServiceImpl.java index a7ca0b17..e7f2772a 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.pharmacyDispensarymanage.appservice.impl; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.core.common.core.domain.R; @@ -46,6 +36,14 @@ import com.openhis.yb.dto.MedicalInventory3501Param; import com.openhis.yb.dto.MedicalInventory3502Param; import com.openhis.yb.dto.MedicalPurchase3504Param; import com.openhis.yb.service.YbManager; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.*; +import java.util.stream.Collectors; /** * 药房审批 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 5e9c1280..45b9d19b 100644 --- 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 @@ -1,14 +1,5 @@ package com.openhis.web.pharmacyDispensarymanage.appservice.impl; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -25,6 +16,13 @@ import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto; import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.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 8ea3b488..ec485bd3 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.pharmacyDispensarymanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -27,6 +17,14 @@ import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto; import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +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/PharmacyDispensaryStockInOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStockInOrderServiceImpl.java index f5d7f7fd..4cce2789 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.pharmacyDispensarymanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -25,9 +15,16 @@ import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensarySt import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto; import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper; -import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryStockInOrderMapper; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +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/PharmacyDispensaryStocktakingOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryStocktakingOrderServiceImpl.java index 7d1d1f62..a09cf183 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.pharmacyDispensarymanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -25,9 +15,16 @@ import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensarySt import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto; import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper; -import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryStocktakingOrderMapper; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +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/PharmacyDispensaryTransferInOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferInOrderServiceImpl.java index a6c926cc..67c95195 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.pharmacyDispensarymanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -27,6 +17,14 @@ import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto; import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +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/PharmacyDispensaryTransferOutOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryTransferOutOrderServiceImpl.java index 31c7e005..a54089e0 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.pharmacyDispensarymanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -25,9 +15,16 @@ import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryTr import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryInitDto; import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryCommonMapper; -import com.openhis.web.pharmacyDispensarymanage.mapper.PharmacyDispensaryTransferOutOrderMapper; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; /** * 药房调出单 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 91a0cddf..a31d01eb 100644 --- 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 @@ -1,23 +1,19 @@ package com.openhis.web.pharmacyDispensarymanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; -import com.openhis.common.enums.LocationForm; import com.openhis.common.enums.SupplyType; import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService; -import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService; import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryDispensingOrderService; -import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto; +import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam; - import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +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; /** * 药房发药单 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 2e348038..80b4f567 100644 --- 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 @@ -1,23 +1,19 @@ package com.openhis.web.pharmacyDispensarymanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; -import com.openhis.common.enums.LocationForm; import com.openhis.common.enums.SupplyType; import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService; import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryProfitLossOrderService; import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam; - import lombok.extern.slf4j.Slf4j; +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 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 9f7d8413..7e223199 100644 --- 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 @@ -1,23 +1,19 @@ package com.openhis.web.pharmacyDispensarymanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - +import com.core.common.core.domain.R; +import com.openhis.common.enums.SupplyType; +import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService; +import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService; +import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryRequisitionOrderService; +import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto; +import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import com.core.common.core.domain.R; -import com.openhis.common.enums.LocationForm; -import com.openhis.common.enums.SupplyType; -import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService; -import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryRequisitionOrderService; -import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService; -import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto; -import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam; - -import lombok.extern.slf4j.Slf4j; +import javax.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 84778117..7e193601 100644 --- 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 @@ -1,24 +1,19 @@ package com.openhis.web.pharmacyDispensarymanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReturnToWarehouseOrderService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; -import com.openhis.common.enums.LocationForm; import com.openhis.common.enums.SupplyType; import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService; import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService; import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReturnToWarehouseOrderService; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam; - import lombok.extern.slf4j.Slf4j; +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 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 a794bd42..f1296d9d 100644 --- 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 @@ -1,23 +1,19 @@ package com.openhis.web.pharmacyDispensarymanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; -import com.openhis.common.enums.LocationForm; import com.openhis.common.enums.SupplyType; import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService; import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService; import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryStockInOrderService; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam; - import lombok.extern.slf4j.Slf4j; +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 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 f1a9b9c7..380e2981 100644 --- 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 @@ -1,23 +1,19 @@ package com.openhis.web.pharmacyDispensarymanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; -import com.openhis.common.enums.LocationForm; import com.openhis.common.enums.SupplyType; import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService; import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService; import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryStocktakingOrderService; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam; - import lombok.extern.slf4j.Slf4j; +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 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 0a212765..f08c0352 100644 --- 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 @@ -1,23 +1,19 @@ package com.openhis.web.pharmacyDispensarymanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; -import com.openhis.common.enums.LocationForm; import com.openhis.common.enums.SupplyType; import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService; import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService; import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryTransferInOrderService; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam; - import lombok.extern.slf4j.Slf4j; +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 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 adb2ecba..e74fc159 100644 --- 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 @@ -1,23 +1,19 @@ package com.openhis.web.pharmacyDispensarymanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; -import com.openhis.common.enums.LocationForm; import com.openhis.common.enums.SupplyType; import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryCommonService; import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryReceiptApprovalService; import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryTransferOutOrderService; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam; - import lombok.extern.slf4j.Slf4j; +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 java.util.List; /** * 药房调出单 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDetailDto.java index 1f9926ac..fe8a4166 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDetailDto.java @@ -3,22 +3,20 @@ */ package com.openhis.web.pharmacyDispensarymanage.dto; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - -import liquibase.pro.packaged.S; import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; +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/pharmacyDispensarymanage/dto/PharmacyDispensaryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDto.java index 100e9b3b..bfa09f9c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryDto.java @@ -3,17 +3,16 @@ */ package com.openhis.web.pharmacyDispensarymanage.dto; -import java.io.Serializable; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; + /** * 订购单信息 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryInitDto.java index 77a21c2b..b9927789 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryInitDto.java @@ -3,16 +3,15 @@ */ package com.openhis.web.pharmacyDispensarymanage.dto; -import java.io.Serializable; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.web.common.dto.LocationDto; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.List; + /** * 订购单信息 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryMedicationInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryMedicationInfoDto.java index 3529eec6..ccf0a981 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryMedicationInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensaryMedicationInfoDto.java @@ -3,19 +3,18 @@ */ package com.openhis.web.pharmacyDispensarymanage.dto; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; +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/pharmacyDispensarymanage/dto/PharmacyDispensarySearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensarySearchParam.java index 2263b3d5..b649b8ff 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensarySearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/dto/PharmacyDispensarySearchParam.java @@ -3,14 +3,13 @@ */ package com.openhis.web.pharmacyDispensarymanage.dto; -import java.io.Serializable; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * 订购单查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryCommonMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryCommonMapper.java index 08d0ce8c..d4f63172 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryCommonMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryCommonMapper.java @@ -1,8 +1,5 @@ package com.openhis.web.pharmacyDispensarymanage.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,6 +7,8 @@ import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDto; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryMedicationInfoDto; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensarySearchParam; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; /** * 药库共通 mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryDispensingOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryDispensingOrderMapper.java index 9ded9aa6..021e69c5 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryDispensingOrderMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyDispensarymanage/mapper/PharmacyDispensaryDispensingOrderMapper.java @@ -1,7 +1,5 @@ package com.openhis.web.pharmacyDispensarymanage.mapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.openhis.common.enums.DispenseStatus; import com.openhis.web.pharmacyDispensarymanage.dto.PharmacyDispensaryDetailDto; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; 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 ff73d700..e5f568dd 100644 --- 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 @@ -1,14 +1,10 @@ package com.openhis.web.pharmacyWarehousemanage.appservice; -import javax.servlet.http.HttpServletRequest; - import com.core.common.core.domain.R; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; -import java.util.List; +import javax.servlet.http.HttpServletRequest; /** * 药库共通方法 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseDocumentManagementService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseDocumentManagementService.java index fefd008c..07be32a2 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseDocumentManagementService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseDocumentManagementService.java @@ -1,9 +1,6 @@ package com.openhis.web.pharmacyWarehousemanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto; /** * 药库单据 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseProfitLossOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseProfitLossOrderService.java index e572cc84..8978e05c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseProfitLossOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseProfitLossOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.pharmacyWarehousemanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto; +import java.util.List; + /** * 药库损益单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehousePurchaseOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehousePurchaseOrderService.java index 3b1c1b8d..c47b6c6a 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehousePurchaseOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehousePurchaseOrderService.java @@ -2,9 +2,7 @@ package com.openhis.web.pharmacyWarehousemanage.appservice; import com.core.common.core.domain.R; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam; -import javax.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReceiptApprovalService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReceiptApprovalService.java index 1becbcc5..278734ab 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReceiptApprovalService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReceiptApprovalService.java @@ -1,13 +1,8 @@ package com.openhis.web.pharmacyWarehousemanage.appservice; -import javax.servlet.http.HttpServletRequest; - import com.core.common.core.domain.R; import com.openhis.web.inventorymanage.dto.ItemChargeDetailDto; -import com.openhis.web.inventorymanage.dto.ReceiptApprovalSearchParam; import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnOrderService.java index 7f37b51e..4ab55612 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnOrderService.java @@ -1,12 +1,9 @@ package com.openhis.web.pharmacyWarehousemanage.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - import com.core.common.core.domain.R; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam; + +import java.util.List; /** * 药库退货单 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnToWarehouseOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnToWarehouseOrderService.java index f5760e84..66cc14f5 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnToWarehouseOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseReturnToWarehouseOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.pharmacyWarehousemanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto; +import java.util.List; + /** * 药库退库单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockInOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockInOrderService.java index 87c3734b..5fb44999 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockInOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockInOrderService.java @@ -1,12 +1,9 @@ package com.openhis.web.pharmacyWarehousemanage.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - import com.core.common.core.domain.R; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam; + +import java.util.List; /** * 药库进货单 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockOutOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockOutOrderService.java index a3e47d82..082846e3 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockOutOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStockOutOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.pharmacyWarehousemanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto; +import java.util.List; + /** * 药库出库单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStocktakingOrderService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStocktakingOrderService.java index 55779f63..7c155932 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStocktakingOrderService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/IPharmacyWarehouseStocktakingOrderService.java @@ -1,10 +1,10 @@ package com.openhis.web.pharmacyWarehousemanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto; +import java.util.List; + /** * 药库盘点单 * 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 6eb2bf9d..175e9ca8 100644 --- 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 @@ -1,45 +1,41 @@ package com.openhis.web.pharmacyWarehousemanage.appservice.impl; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.core.common.utils.DateUtils; +import com.core.common.core.domain.R; import com.core.common.utils.MessageUtils; +import com.openhis.administration.domain.Practitioner; +import com.openhis.administration.domain.Supplier; +import com.openhis.administration.service.IPractitionerService; +import com.openhis.administration.service.ISupplierService; import com.openhis.common.constant.CommonConstants; import com.openhis.common.constant.PromptMsgConstant; -import com.openhis.common.enums.*; +import com.openhis.common.enums.AcceptanceResult; +import com.openhis.common.enums.PackagingCondition; +import com.openhis.common.enums.SupplyStatus; +import com.openhis.common.enums.SupplyType; import com.openhis.common.utils.EnumUtils; import com.openhis.common.utils.HisQueryUtils; import com.openhis.web.common.appservice.ICommonService; -import com.openhis.web.common.dto.InventoryItemDto; -import com.openhis.web.common.dto.UnitDto; +import com.openhis.web.common.dto.LocationDto; import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService; +import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDto; +import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseMedicationInfoDto; +import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam; import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper; -import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehousePurchaseOrderMapper; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.core.common.core.domain.R; -import com.core.common.utils.AssignSeqUtil; -import com.openhis.administration.domain.Location; -import com.openhis.administration.domain.Practitioner; -import com.openhis.administration.domain.Supplier; -import com.openhis.administration.service.ILocationService; -import com.openhis.administration.service.IPractitionerService; -import com.openhis.administration.service.ISupplierService; -import com.openhis.web.common.dto.LocationDto; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDto; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +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/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseDocumentManagementServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseDocumentManagementServiceImpl.java index 47dd6f77..29334683 100644 --- 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 @@ -1,36 +1,21 @@ package com.openhis.web.pharmacyWarehousemanage.appservice.impl; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import com.openhis.administration.domain.Location; +import com.core.common.core.domain.R; import com.openhis.administration.domain.Organization; -import com.openhis.common.enums.*; +import com.openhis.common.enums.LocationForm; +import com.openhis.common.enums.SupplyType; import com.openhis.web.common.appservice.ICommonService; import com.openhis.web.common.dto.LocationDto; +import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService; +import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseDocumentManagementService; +import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.core.common.core.domain.R; -import com.core.common.utils.AssignSeqUtil; -import com.core.common.utils.DateUtils; -import com.core.common.utils.MessageUtils; -import com.openhis.common.constant.CommonConstants; -import com.openhis.common.constant.PromptMsgConstant; -import com.openhis.common.utils.EnumUtils; -import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto; -import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService; -import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseDocumentManagementService; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto; -import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper; -import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseDocumentManagementMapper; -import com.openhis.workflow.domain.SupplyRequest; -import com.openhis.workflow.service.ISupplyRequestService; +import javax.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 e2b40fdf..02e2c8c5 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.pharmacyWarehousemanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -27,6 +17,14 @@ import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto; import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +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/PharmacyWarehousePurchaseOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehousePurchaseOrderServiceImpl.java index 5a2b7b1d..10254472 100644 --- 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 @@ -1,14 +1,5 @@ package com.openhis.web.pharmacyWarehousemanage.appservice.impl; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -25,6 +16,13 @@ import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto; import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.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 e644c987..382ad424 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.pharmacyWarehousemanage.appservice.impl; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.core.common.core.domain.R; @@ -46,6 +36,14 @@ import com.openhis.yb.dto.MedicalInventory3501Param; import com.openhis.yb.dto.MedicalInventory3502Param; import com.openhis.yb.dto.MedicalPurchase3504Param; import com.openhis.yb.service.YbManager; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.*; +import java.util.stream.Collectors; /** * 药库审批 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 849d4703..d4102a66 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.pharmacyWarehousemanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -27,6 +17,14 @@ import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto; import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +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/PharmacyWarehouseReturnToWarehouseOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReturnToWarehouseOrderServiceImpl.java index cc73702a..0f1543d3 100644 --- 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 @@ -1,16 +1,5 @@ package com.openhis.web.pharmacyWarehousemanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import com.openhis.common.enums.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -18,6 +7,7 @@ import com.core.common.utils.DateUtils; import com.core.common.utils.MessageUtils; import com.openhis.common.constant.CommonConstants; import com.openhis.common.constant.PromptMsgConstant; +import com.openhis.common.enums.*; import com.openhis.common.utils.EnumUtils; import com.openhis.web.inventorymanage.dto.ProductStocktakingInitDto; import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService; @@ -25,9 +15,16 @@ import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseRetu import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto; import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper; -import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseReturnToWarehouseOrderMapper; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +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/PharmacyWarehouseStockInOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockInOrderServiceImpl.java index e12e5313..4f45c4a9 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.pharmacyWarehousemanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -27,6 +17,14 @@ import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto; import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +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/PharmacyWarehouseStockOutOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockOutOrderServiceImpl.java index a470a972..629304d3 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.pharmacyWarehousemanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -25,9 +15,16 @@ import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStoc import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto; import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper; -import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseStockOutOrderMapper; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +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/PharmacyWarehouseStocktakingOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStocktakingOrderServiceImpl.java index 62017fdf..aa633e6f 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.pharmacyWarehousemanage.appservice.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.utils.AssignSeqUtil; @@ -27,6 +17,14 @@ import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto; import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.ISupplyRequestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; /** * 药库盘点单 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 fab3502c..8a65eec5 100644 --- 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 @@ -1,24 +1,18 @@ package com.openhis.web.pharmacyWarehousemanage.controller; -import java.util.List; +import com.core.common.core.domain.R; +import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService; +import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseDocumentManagementService; +import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +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 com.openhis.common.enums.LocationForm; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import com.core.common.core.domain.R; -import com.openhis.common.enums.SupplyType; -import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService; -import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService; -import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseDocumentManagementService; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam; - -import lombok.extern.slf4j.Slf4j; - /** * 药库单据管理 * 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 9bbe7205..ba1d6278 100644 --- 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 @@ -1,23 +1,19 @@ package com.openhis.web.pharmacyWarehousemanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.openhis.common.enums.LocationForm; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.common.enums.SupplyType; import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService; -import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService; import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseProfitLossOrderService; +import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam; - import lombok.extern.slf4j.Slf4j; +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 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 80a5f8a1..580baae6 100644 --- 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 @@ -1,7 +1,6 @@ package com.openhis.web.pharmacyWarehousemanage.controller; import com.core.common.core.domain.R; -import com.openhis.common.enums.LocationForm; import com.openhis.common.enums.SupplyType; import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService; import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehousePurchaseOrderService; 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 48486ca0..5af908f5 100644 --- 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 @@ -1,23 +1,19 @@ package com.openhis.web.pharmacyWarehousemanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.openhis.common.enums.LocationForm; +import com.core.common.core.domain.R; import com.openhis.common.enums.SupplyType; +import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService; import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService; +import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReturnOrderService; +import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto; +import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import com.core.common.core.domain.R; -import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService; -import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReturnOrderService; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam; - -import lombok.extern.slf4j.Slf4j; +import javax.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 c16ba7f3..be6afe6d 100644 --- 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 @@ -1,14 +1,5 @@ package com.openhis.web.pharmacyWarehousemanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.openhis.common.enums.LocationForm; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.common.enums.SupplyType; import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService; @@ -16,8 +7,13 @@ import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseRece import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReturnToWarehouseOrderService; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam; - import lombok.extern.slf4j.Slf4j; +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 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 372dfb5b..88057b3d 100644 --- 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 @@ -1,24 +1,19 @@ package com.openhis.web.pharmacyWarehousemanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.openhis.common.enums.LocationForm; +import com.core.common.core.domain.R; import com.openhis.common.enums.SupplyType; +import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService; import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService; +import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStockInOrderService; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto; -import liquibase.pro.packaged.S; +import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import com.core.common.core.domain.R; -import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService; -import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStockInOrderService; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam; - -import lombok.extern.slf4j.Slf4j; +import javax.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 30249c52..d43f8fda 100644 --- 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 @@ -1,14 +1,5 @@ package com.openhis.web.pharmacyWarehousemanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.openhis.common.enums.LocationForm; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.common.enums.SupplyType; import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService; @@ -16,8 +7,13 @@ import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseRece import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStockOutOrderService; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam; - import lombok.extern.slf4j.Slf4j; +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 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 a40b917c..2a9c209c 100644 --- 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 @@ -1,23 +1,19 @@ package com.openhis.web.pharmacyWarehousemanage.controller; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import com.openhis.common.enums.LocationForm; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.common.enums.SupplyType; import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService; -import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStocktakingOrderService; import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReceiptApprovalService; +import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStocktakingOrderService; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam; - import lombok.extern.slf4j.Slf4j; +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 java.util.List; /** * 药库盘点单 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDetailDto.java index b31ecf35..f4f22050 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDetailDto.java @@ -3,21 +3,20 @@ */ package com.openhis.web.pharmacyWarehousemanage.dto; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; +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/pharmacyWarehousemanage/dto/PharmacyWarehouseDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDto.java index b30d88c7..b3971e30 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseDto.java @@ -3,10 +3,6 @@ */ package com.openhis.web.pharmacyWarehousemanage.dto; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -14,6 +10,9 @@ import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; + /** * 单据信息 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseInitDto.java index b46fd85c..3842b1dc 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseInitDto.java @@ -3,15 +3,15 @@ */ package com.openhis.web.pharmacyWarehousemanage.dto; -import java.io.Serializable; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.web.common.dto.LocationDto; import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.List; + /** * 单据初期信息 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseMedicationInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseMedicationInfoDto.java index 927650a0..ffe533e1 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseMedicationInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseMedicationInfoDto.java @@ -3,20 +3,18 @@ */ package com.openhis.web.pharmacyWarehousemanage.dto; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - -import com.openhis.web.common.dto.UnitDto; import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; +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/pharmacyWarehousemanage/dto/PharmacyWarehouseSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseSearchParam.java index 7152ef95..557db0da 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/dto/PharmacyWarehouseSearchParam.java @@ -3,13 +3,13 @@ */ package com.openhis.web.pharmacyWarehousemanage.dto; -import java.io.Serializable; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * 单据查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseCommonMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseCommonMapper.java index 076444d7..afad68f4 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseCommonMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseCommonMapper.java @@ -1,8 +1,5 @@ package com.openhis.web.pharmacyWarehousemanage.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,6 +7,8 @@ import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDto; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseMedicationInfoDto; import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; /** * 药库共通 mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehousePurchaseOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehousePurchaseOrderMapper.java index 7bc85a39..f72b13a6 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehousePurchaseOrderMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehousePurchaseOrderMapper.java @@ -1,13 +1,5 @@ package com.openhis.web.pharmacyWarehousemanage.mapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseMedicationInfoDto; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDto; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam; -import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseReturnOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseReturnOrderMapper.java index 73227626..eaa01c35 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseReturnOrderMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseReturnOrderMapper.java @@ -1,16 +1,7 @@ package com.openhis.web.pharmacyWarehousemanage.mapper; -import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDto; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseMedicationInfoDto; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam; - /** * 药库进货单 mapper * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStockInOrderMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStockInOrderMapper.java index 63084103..1067936a 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStockInOrderMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/mapper/PharmacyWarehouseStockInOrderMapper.java @@ -1,16 +1,7 @@ package com.openhis.web.pharmacyWarehousemanage.mapper; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDto; -import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseMedicationInfoDto; -import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam; - /** * 药库进货单 mapper * 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 2afd2a1e..1863ad89 100644 --- 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 @@ -1,15 +1,13 @@ package com.openhis.web.pharmacymanage.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - import com.core.common.core.domain.R; import com.openhis.web.pharmacymanage.dto.DispenseItemDto; -import com.openhis.web.pharmacymanage.dto.EncounterInfoDto; import com.openhis.web.pharmacymanage.dto.EncounterInfoSearchParam; import com.openhis.web.pharmacymanage.dto.ItemDispenseOrderDto; +import javax.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 bb0720e3..11c7611a 100644 --- 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 @@ -1,11 +1,11 @@ package com.openhis.web.pharmacymanage.appservice; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.core.common.core.domain.R; import com.openhis.web.pharmacymanage.dto.MedDetailsSearchParam; +import javax.servlet.http.HttpServletRequest; +import javax.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 f3fac197..78ce990c 100644 --- 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 @@ -1,10 +1,10 @@ package com.openhis.web.pharmacymanage.appservice; -import javax.servlet.http.HttpServletRequest; - import com.core.common.core.domain.R; import com.openhis.web.pharmacymanage.dto.PendingMedicationSearchParam; +import javax.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 312633d7..2b556089 100644 --- 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 @@ -1,13 +1,12 @@ package com.openhis.web.pharmacymanage.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - 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 java.util.List; + /** * 退药管理 应用实现接口 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/ISummaryDispenseMedicineAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/ISummaryDispenseMedicineAppService.java index 1133a46f..ffca0e40 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/ISummaryDispenseMedicineAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/ISummaryDispenseMedicineAppService.java @@ -1,9 +1,9 @@ package com.openhis.web.pharmacymanage.appservice; -import java.util.List; - import com.core.common.core.domain.R; +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 723f8fa3..4472ec9b 100644 --- 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 @@ -1,16 +1,12 @@ package com.openhis.web.pharmacymanage.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - import com.core.common.core.domain.R; import com.openhis.web.pharmacymanage.dto.DispenseItemDto; import com.openhis.web.pharmacymanage.dto.EncounterInfoSearchParam; import com.openhis.web.pharmacymanage.dto.ItemDispenseOrderDto; -import com.openhis.yb.dto.MedicalInventory3511Param; -import com.openhis.yb.dto.MedicalInventory3512Param; -import com.openhis.yb.dto.MedicalInventory3513Param; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; /** * 处方管理 应用实现接口 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 90adedf8..f4cee16c 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.web.pharmacymanage.appservice.impl; -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -42,6 +32,14 @@ import com.openhis.workflow.domain.DeviceDispense; import com.openhis.workflow.domain.InventoryItem; 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 java.math.BigDecimal; +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/pharmacymanage/appservice/impl/MedicationDetailsAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicationDetailsAppServiceImpl.java index 12833de6..ba1de5f9 100644 --- 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 @@ -1,22 +1,5 @@ package com.openhis.web.pharmacymanage.appservice.impl; -import static com.openhis.common.constant.CommonConstants.ExcelOut.*; -import static com.openhis.common.constant.CommonConstants.SheetName.SHEET_NAME_DRUG_DETAIL; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; @@ -38,7 +21,21 @@ import com.openhis.web.pharmacymanage.dto.MedDetailedAccountPageDto; import com.openhis.web.pharmacymanage.dto.MedDetailsInitDto; import com.openhis.web.pharmacymanage.dto.MedDetailsSearchParam; import com.openhis.web.pharmacymanage.mapper.MedicationDetailsMapper; -import com.openhis.web.reportmanage.utils.ExcelFillerUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static com.openhis.common.constant.CommonConstants.ExcelOut.*; +import static com.openhis.common.constant.CommonConstants.SheetName.SHEET_NAME_DRUG_DETAIL; /** * 发药明细 应用实现类 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 2f581bcc..f3584448 100644 --- 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 @@ -11,7 +11,6 @@ import com.openhis.web.pharmacymanage.appservice.IPendingMedicationDetailsAppSer import com.openhis.web.pharmacymanage.dto.PendingMedicationPageDto; import com.openhis.web.pharmacymanage.dto.PendingMedicationSearchParam; import com.openhis.web.pharmacymanage.mapper.PendingMedicationDetailsMapper; -import com.openhis.web.reportmanage.dto.LossReportSearchParam; 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/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java index 9fe8d428..06e40fff 100644 --- 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 @@ -1,16 +1,5 @@ package com.openhis.web.pharmacymanage.appservice.impl; -import java.math.BigDecimal; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.lang3.tuple.Pair; -import org.springframework.stereotype.Service; - import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -52,8 +41,16 @@ import com.openhis.yb.domain.ClinicSettle; import com.openhis.yb.dto.Medical3506Param; import com.openhis.yb.dto.MedicalInventory3511Param; import com.openhis.yb.service.IClinicSettleService; -import com.openhis.yb.service.YbHttpUtils; 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 java.math.BigDecimal; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; /** * 退药管理 应用实现类 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 c313263a..66323be5 100644 --- 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 @@ -1,26 +1,15 @@ package com.openhis.web.pharmacymanage.appservice.impl; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.core.common.core.domain.R; import com.core.common.exception.ServiceException; +import com.core.common.utils.AssignSeqUtil; import com.core.common.utils.DateUtils; import com.core.common.utils.MessageUtils; import com.core.common.utils.SecurityUtils; +import com.core.system.service.ISysDictTypeService; import com.openhis.administration.domain.TraceNoManage; +import com.openhis.administration.service.IOrganizationService; import com.openhis.administration.service.ITraceNoManageService; import com.openhis.common.constant.CommonConstants; import com.openhis.common.constant.PromptMsgConstant; @@ -28,27 +17,34 @@ import com.openhis.common.enums.*; import com.openhis.common.enums.ybenums.YbInvChgType; import com.openhis.medication.domain.MedicationDefinition; import com.openhis.medication.domain.MedicationDispense; -import com.core.common.utils.AssignSeqUtil; -import com.core.system.service.ISysDictTypeService; -import com.openhis.administration.service.IOrganizationService; import com.openhis.medication.service.IMedicationDefinitionService; import com.openhis.medication.service.IMedicationDispenseService; import com.openhis.medication.service.impl.MedicationRequestServiceImpl; +import com.openhis.web.inhospitalnursestation.mapper.AdviceProcessAppMapper; import com.openhis.web.inventorymanage.appservice.impl.ReceiptApprovalAppServiceImpl; import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto; import com.openhis.web.pharmacymanage.appservice.ISummaryDispenseMedicineAppService; -import com.openhis.web.pharmacymanage.appservice.impl.ReturnMedicineAppServiceImpl; -import com.openhis.web.pharmacymanage.appservice.impl.WesternMedicineDispenseAppServiceImpl; import com.openhis.web.pharmacymanage.dto.UnDispenseInventoryDto; import com.openhis.web.pharmacymanage.mapper.ReturnMedicineMapper; import com.openhis.web.pharmacymanage.mapper.WesternMedicineDispenseMapper; -import com.openhis.web.inhospitalnursestation.mapper.AdviceProcessAppMapper; import com.openhis.workflow.domain.InventoryItem; import com.openhis.workflow.domain.SupplyDelivery; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.service.IInventoryItemService; import com.openhis.workflow.service.ISupplyDeliveryService; 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 java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; /** * 住院汇总发放 应用实现类 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 6b597905..4a32178c 100644 --- 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 @@ -1,17 +1,5 @@ package com.openhis.web.pharmacymanage.appservice.impl; -import java.math.BigDecimal; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.lang3.tuple.Pair; -import org.springframework.stereotype.Service; - import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -55,9 +43,18 @@ import com.openhis.yb.dto.Medical3505Param; import com.openhis.yb.service.IClinicSettleService; import com.openhis.yb.service.YbHttpUtils; import com.openhis.yb.service.YbManager; - +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 java.math.BigDecimal; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + /** * 西药发放 应用实现类 * 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 b73b1bf4..daf4142a 100644 --- 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 @@ -1,21 +1,17 @@ package com.openhis.web.pharmacymanage.controller; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.pharmacymanage.appservice.IMedicalDeviceDispenseAppService; import com.openhis.web.pharmacymanage.dto.DispenseItemDto; import com.openhis.web.pharmacymanage.dto.EncounterInfoSearchParam; import com.openhis.web.pharmacymanage.dto.ItemDispenseOrderDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.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 4b8e871f..2f11c49f 100644 --- 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 @@ -1,22 +1,18 @@ package com.openhis.web.pharmacymanage.controller; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.openhis.web.pharmacymanage.appservice.impl.MedicationDetailsAppServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; +import com.core.common.core.domain.R; +import com.openhis.web.pharmacymanage.appservice.IMedicationDetailsAppService; +import com.openhis.web.pharmacymanage.dto.MedDetailsSearchParam; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.core.common.core.domain.R; -import com.openhis.web.pharmacymanage.appservice.IMedicationDetailsAppService; -import com.openhis.web.pharmacymanage.dto.MedDetailsSearchParam; - -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.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 5a1cc71c..ae95caff 100644 --- 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 @@ -1,20 +1,17 @@ package com.openhis.web.pharmacymanage.controller; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; +import com.core.common.core.domain.R; +import com.openhis.web.pharmacymanage.appservice.IPendingMedicationDetailsAppService; +import com.openhis.web.pharmacymanage.dto.PendingMedicationSearchParam; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.core.common.core.domain.R; -import com.openhis.web.pharmacymanage.appservice.IPendingMedicationDetailsAppService; -import com.openhis.web.pharmacymanage.dto.PendingMedicationSearchParam; - -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; +import javax.annotation.Resource; +import javax.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 e9722233..b38996b7 100644 --- 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 @@ -1,20 +1,16 @@ package com.openhis.web.pharmacymanage.controller; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.pharmacymanage.appservice.IReturnMedicineAppService; import com.openhis.web.pharmacymanage.dto.EncounterInfoDto; import com.openhis.web.pharmacymanage.dto.ReturnMedicineDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.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 52c04c87..a17dd1f9 100644 --- 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 @@ -1,19 +1,16 @@ package com.openhis.web.pharmacymanage.controller; -import java.util.List; - -import javax.annotation.Resource; - +import com.core.common.core.domain.R; +import com.openhis.web.pharmacymanage.appservice.ISummaryDispenseMedicineAppService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.core.common.core.domain.R; -import com.openhis.web.pharmacymanage.appservice.ISummaryDispenseMedicineAppService; - -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; +import javax.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 7f4f1c9d..208e9cce 100644 --- 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 @@ -1,23 +1,17 @@ package com.openhis.web.pharmacymanage.controller; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import com.openhis.yb.dto.MedicalInventory3511Param; -import com.openhis.yb.dto.MedicalInventory3512Param; -import com.openhis.yb.dto.MedicalInventory3513Param; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.pharmacymanage.appservice.IWesternMedicineDispenseAppService; import com.openhis.web.pharmacymanage.dto.DispenseItemDto; import com.openhis.web.pharmacymanage.dto.EncounterInfoSearchParam; import com.openhis.web.pharmacymanage.dto.ItemDispenseOrderDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; /** * 西药发药 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInitDto.java index 81850b59..e4b7c384 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInitDto.java @@ -3,14 +3,13 @@ */ package com.openhis.web.pharmacymanage.dto; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 发放列表初始化 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInventoryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInventoryDto.java index 281c9a14..ad63f320 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInventoryDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInventoryDto.java @@ -3,14 +3,14 @@ */ package com.openhis.web.pharmacymanage.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 药品发放和库存表连接信息 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseItemDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseItemDto.java index c119d333..cadce80d 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseItemDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseItemDto.java @@ -5,7 +5,6 @@ package com.openhis.web.pharmacymanage.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoDto.java index 8f4b5d35..7580523e 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoDto.java @@ -3,14 +3,13 @@ */ package com.openhis.web.pharmacymanage.dto; -import java.util.Date; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 就诊人员列表 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoSearchParam.java index 2d44b555..390362c3 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoSearchParam.java @@ -3,11 +3,11 @@ */ package com.openhis.web.pharmacymanage.dto; -import java.io.Serializable; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * 患者列表查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InventoryDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InventoryDetailDto.java index ab36f858..3115b2cc 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InventoryDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InventoryDetailDto.java @@ -3,16 +3,15 @@ */ package com.openhis.web.pharmacymanage.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 库存明细dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ItemDispenseOrderDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ItemDispenseOrderDto.java index 9b55ddeb..2759e116 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ItemDispenseOrderDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ItemDispenseOrderDto.java @@ -3,19 +3,18 @@ */ package com.openhis.web.pharmacymanage.dto; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.core.common.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +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/pharmacymanage/dto/MedDetailsInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsInitDto.java index 9089af0c..a427de63 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsInitDto.java @@ -1,13 +1,8 @@ package com.openhis.web.pharmacymanage.dto; import com.openhis.administration.domain.Practitioner; -import com.openhis.web.datadictionary.dto.DiagnosisTreatmentInitDto; -import com.openhis.web.datadictionary.dto.SupplierInitDto; import lombok.Data; import lombok.experimental.Accessors; -import org.hibernate.validator.constraints.Length; - -import java.util.List; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsSearchParam.java index f05955f7..ee90d55d 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsSearchParam.java @@ -1,10 +1,10 @@ package com.openhis.web.pharmacymanage.dto; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 发药明细查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummaryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummaryDto.java index 28a00eb1..ac5a2aba 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummaryDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummaryDto.java @@ -3,17 +3,16 @@ */ package com.openhis.web.pharmacymanage.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.core.common.annotation.Excel; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 汇总发药信息 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummaryInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummaryInitDto.java index a894e0a5..e64732e3 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummaryInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummaryInitDto.java @@ -3,15 +3,14 @@ */ package com.openhis.web.pharmacymanage.dto; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.administration.domain.Practitioner; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 住院发药初期dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummarySearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummarySearchParam.java index 900b118d..31d53934 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummarySearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummarySearchParam.java @@ -3,14 +3,13 @@ */ package com.openhis.web.pharmacymanage.dto; -import java.io.Serializable; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * 患者列表查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationPageDto.java index 7db449d0..ec0a6e21 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationPageDto.java @@ -1,7 +1,6 @@ package com.openhis.web.pharmacymanage.dto; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationSearchParam.java index e70346b6..8a756dd2 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationSearchParam.java @@ -1,7 +1,5 @@ package com.openhis.web.pharmacymanage.dto; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineDto.java index 46d85e9f..e32ad767 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineDto.java @@ -5,7 +5,6 @@ package com.openhis.web.pharmacymanage.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInfoDto.java index 5adca442..d2c991cc 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInfoDto.java @@ -3,15 +3,14 @@ */ package com.openhis.web.pharmacymanage.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 退药信息 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInitDto.java index 3d25e887..c7e278cb 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInitDto.java @@ -3,15 +3,13 @@ */ package com.openhis.web.pharmacymanage.dto; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - -import com.openhis.web.inventorymanage.dto.PurchaseInventoryInitDto; import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * * @author yangmo diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/UnDispenseInventoryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/UnDispenseInventoryDto.java index 8da69f3e..419d04cc 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/UnDispenseInventoryDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/UnDispenseInventoryDto.java @@ -3,13 +3,13 @@ */ package com.openhis.web.pharmacymanage.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -import lombok.Data; -import lombok.experimental.Accessors; - /** * 待发放库存信息 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicalDeviceDispenseMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicalDeviceDispenseMapper.java index 37b97bff..a8b06799 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicalDeviceDispenseMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicalDeviceDispenseMapper.java @@ -3,11 +3,6 @@ */ package com.openhis.web.pharmacymanage.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,6 +10,10 @@ import com.openhis.administration.domain.Practitioner; import com.openhis.web.pharmacymanage.dto.EncounterInfoDto; import com.openhis.web.pharmacymanage.dto.EncounterInfoSearchParam; import com.openhis.web.pharmacymanage.dto.ItemDispenseOrderDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public interface MedicalDeviceDispenseMapper { diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicationDetailsMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicationDetailsMapper.java index f41b389f..440596ef 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicationDetailsMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicationDetailsMapper.java @@ -3,14 +3,13 @@ */ package com.openhis.web.pharmacymanage.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.pharmacymanage.dto.MedDetailedAccountPageDto; import com.openhis.web.pharmacymanage.dto.MedDetailsSearchParam; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; @Repository public interface MedicationDetailsMapper { diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/PendingMedicationDetailsMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/PendingMedicationDetailsMapper.java index cd8e525f..469ca84f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/PendingMedicationDetailsMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/PendingMedicationDetailsMapper.java @@ -3,14 +3,13 @@ */ package com.openhis.web.pharmacymanage.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.pharmacymanage.dto.PendingMedicationPageDto; import com.openhis.web.pharmacymanage.dto.PendingMedicationSearchParam; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; @Repository public interface PendingMedicationDetailsMapper { diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/ReturnMedicineMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/ReturnMedicineMapper.java index cb9c5757..922fcf6b 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/ReturnMedicineMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/ReturnMedicineMapper.java @@ -3,11 +3,6 @@ */ package com.openhis.web.pharmacymanage.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,6 +10,10 @@ import com.openhis.web.pharmacymanage.dto.DispenseInventoryDto; import com.openhis.web.pharmacymanage.dto.EncounterInfoDto; import com.openhis.web.pharmacymanage.dto.ReturnMedicineInfoDto; import com.openhis.web.pharmacymanage.dto.UnDispenseInventoryDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public interface ReturnMedicineMapper { diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java index 6ca6f773..8e10832c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java @@ -3,11 +3,6 @@ */ package com.openhis.web.pharmacymanage.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,6 +11,10 @@ import com.openhis.web.pharmacymanage.dto.EncounterInfoDto; import com.openhis.web.pharmacymanage.dto.EncounterInfoSearchParam; import com.openhis.web.pharmacymanage.dto.InventoryDetailDto; import com.openhis.web.pharmacymanage.dto.ItemDispenseOrderDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public interface WesternMedicineDispenseMapper { 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 81e0e7a6..5c493e09 100644 --- 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 @@ -1,15 +1,14 @@ package com.openhis.web.regdoctorstation.appservice; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.core.common.core.domain.R; 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 java.util.List; + /** * 医嘱管理 应用Service */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java index 7157a765..60734e23 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java @@ -1,11 +1,11 @@ package com.openhis.web.regdoctorstation.appservice; -import java.util.List; - import com.core.common.core.domain.R; import com.openhis.web.regdoctorstation.dto.RequestFormQueryDto; import com.openhis.web.regdoctorstation.dto.RequestFormSaveDto; +import java.util.List; + /** * 申请单管理 应用Service */ 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 4fe1f0a2..bed2a2c5 100644 --- 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 @@ -1,17 +1,10 @@ package com.openhis.web.regdoctorstation.appservice.impl; -import java.util.LinkedList; -import java.util.List; - -import javax.annotation.Resource; - +import com.core.common.core.domain.R; import com.core.common.utils.AgeCalculatorUtil; +import com.core.common.utils.SecurityUtils; import com.core.common.utils.StringUtils; import com.core.common.utils.bean.BeanUtils; -import org.springframework.stereotype.Service; - -import com.core.common.core.domain.R; -import com.core.common.utils.SecurityUtils; import com.openhis.administration.domain.Patient; import com.openhis.administration.dto.EncounterDataDto; import com.openhis.administration.dto.LocationDataDto; @@ -25,8 +18,12 @@ import com.openhis.administration.service.IPractitionerRoleService; import com.openhis.common.enums.*; import com.openhis.common.utils.EnumUtils; import com.openhis.web.regdoctorstation.appservice.INurseManageService; - import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.LinkedList; +import java.util.List; /** * @ClassName NurseManageServiceImpl 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 e52468a7..5ceee725 100644 --- 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 @@ -1,13 +1,5 @@ package com.openhis.web.regdoctorstation.appservice.impl; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.core.common.core.domain.R; import com.core.common.exception.ServiceException; @@ -30,8 +22,13 @@ import com.openhis.workflow.domain.ActivityDefinition; import com.openhis.workflow.domain.ServiceRequest; import com.openhis.workflow.service.IActivityDefinitionService; import com.openhis.workflow.service.IServiceRequestService; - import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; /** * 申请单管理 应用实现类 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 c23dc155..bbd3e9d3 100644 --- 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 @@ -1,16 +1,5 @@ package com.openhis.web.regdoctorstation.appservice.impl; -import java.math.BigDecimal; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.core.common.core.domain.R; @@ -30,8 +19,16 @@ import com.openhis.web.regdoctorstation.mapper.SpecialAdviceAppMapper; import com.openhis.workflow.domain.ServiceRequest; import com.openhis.workflow.service.IActivityDefinitionService; import com.openhis.workflow.service.IServiceRequestService; - import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.Arrays; +import java.util.Date; +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/regdoctorstation/controller/AdviceManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/AdviceManageController.java index dc201a0e..f41c9ce2 100644 --- 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 @@ -3,21 +3,18 @@ */ package com.openhis.web.regdoctorstation.controller; -import javax.servlet.http.HttpServletRequest; - -import com.openhis.web.regdoctorstation.dto.AdviceBatchOpParam; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.common.enums.AdviceOpType; import com.openhis.web.regdoctorstation.appservice.IAdviceManageAppService; +import com.openhis.web.regdoctorstation.dto.AdviceBatchOpParam; import com.openhis.web.regdoctorstation.dto.RegAdviceSaveParam; import com.openhis.web.regdoctorstation.dto.RegDoctorStationInitDto; import com.openhis.web.regdoctorstation.dto.RegPatientMainInfoDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java index e7a25d5f..a8af3302 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java @@ -3,15 +3,13 @@ */ package com.openhis.web.regdoctorstation.controller; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.common.enums.ActivityDefCategory; import com.openhis.web.regdoctorstation.appservice.IRequestFormManageAppService; import com.openhis.web.regdoctorstation.dto.RequestFormSaveDto; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; /** * 申请单管理 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/SpecialAdviceController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/SpecialAdviceController.java index 298ef586..4777a43e 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/SpecialAdviceController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/SpecialAdviceController.java @@ -3,16 +3,14 @@ */ package com.openhis.web.regdoctorstation.controller; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.regdoctorstation.appservice.ISpecialAdviceAppService; import com.openhis.web.regdoctorstation.dto.LeaveHospitalParam; import com.openhis.web.regdoctorstation.dto.NursingOrdersSaveDto; import com.openhis.web.regdoctorstation.dto.TransferOrganizationParam; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; /** * 特殊医嘱 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/ActivityOrganizationConfigDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/ActivityOrganizationConfigDto.java index b16e2fba..ecc61448 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/ActivityOrganizationConfigDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/ActivityOrganizationConfigDto.java @@ -2,7 +2,6 @@ package com.openhis.web.regdoctorstation.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/ActivitySaveDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/ActivitySaveDto.java index f718dba0..76eeb4fb 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/ActivitySaveDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/ActivitySaveDto.java @@ -1,14 +1,13 @@ package com.openhis.web.regdoctorstation.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.enums.ChargeItemContext; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 诊疗保存dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/AdviceBatchOpParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/AdviceBatchOpParam.java index 296da298..4ecea8b8 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/AdviceBatchOpParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/AdviceBatchOpParam.java @@ -2,7 +2,6 @@ package com.openhis.web.regdoctorstation.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/LeaveHospitalParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/LeaveHospitalParam.java index af1dc963..64f295ad 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/LeaveHospitalParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/LeaveHospitalParam.java @@ -1,15 +1,13 @@ package com.openhis.web.regdoctorstation.dto; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * 出院参数类 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersDetailDto.java index b50931ab..5ed86f79 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersDetailDto.java @@ -2,7 +2,6 @@ package com.openhis.web.regdoctorstation.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersDto.java index c1866a3d..0a74ae79 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersDto.java @@ -1,10 +1,10 @@ package com.openhis.web.regdoctorstation.dto; -import java.util.List; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 护理医嘱dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersEncounterDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersEncounterDetailDto.java index f4ea699d..d7e5b775 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersEncounterDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersEncounterDetailDto.java @@ -2,7 +2,6 @@ package com.openhis.web.regdoctorstation.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersSaveDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersSaveDetailDto.java index 0b2e15f3..58454c2f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersSaveDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersSaveDetailDto.java @@ -2,7 +2,6 @@ package com.openhis.web.regdoctorstation.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersSaveDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersSaveDto.java index e8b88ff6..63e1a97b 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersSaveDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NursingOrdersSaveDto.java @@ -1,16 +1,14 @@ package com.openhis.web.regdoctorstation.dto; -import java.util.Date; -import java.util.List; - -import org.springframework.format.annotation.DateTimeFormat; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +import java.util.List; /** * 护理医嘱保存dto diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegAdviceSaveDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegAdviceSaveDto.java index 109f979a..da966e87 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegAdviceSaveDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegAdviceSaveDto.java @@ -1,7 +1,6 @@ package com.openhis.web.regdoctorstation.dto; import com.openhis.web.doctorstation.dto.AdviceSaveDto; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegAdviceSaveParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegAdviceSaveParam.java index 477ffd61..5d8868ae 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegAdviceSaveParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegAdviceSaveParam.java @@ -1,16 +1,14 @@ package com.openhis.web.regdoctorstation.dto; -import java.util.Date; -import java.util.List; - -import org.springframework.format.annotation.DateTimeFormat; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +import java.util.List; /** * 住院医嘱保存参数类 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegDoctorStationInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegDoctorStationInitDto.java index 418cfeac..150565ce 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegDoctorStationInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegDoctorStationInitDto.java @@ -1,14 +1,12 @@ package com.openhis.web.regdoctorstation.dto; -import java.util.ArrayList; -import java.util.List; - -import com.openhis.common.enums.EncounterStatus; - import com.openhis.common.enums.EncounterZyStatus; import lombok.Data; import lombok.experimental.Accessors; +import java.util.ArrayList; +import java.util.List; + /** * 住院医生站 init基础数据 */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegPatientMainInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegPatientMainInfoDto.java index 45ac4511..4c3cc3f7 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegPatientMainInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegPatientMainInfoDto.java @@ -1,17 +1,15 @@ package com.openhis.web.regdoctorstation.dto; -import java.math.BigDecimal; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; /** * 住院患者信息 dto diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegRequestBaseDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegRequestBaseDto.java index c4e69049..afaf52c0 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegRequestBaseDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegRequestBaseDto.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; import com.openhis.web.doctorstation.dto.RequestBaseDto; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDetailQueryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDetailQueryDto.java index 1df0b812..9011ec5f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDetailQueryDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDetailQueryDto.java @@ -1,12 +1,11 @@ package com.openhis.web.regdoctorstation.dto; -import java.math.BigDecimal; - import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 申请单详细查询dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java index 3faf7349..681d2010 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java @@ -1,17 +1,15 @@ package com.openhis.web.regdoctorstation.dto; -import java.util.Date; -import java.util.List; - -import org.springframework.format.annotation.DateTimeFormat; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +import java.util.List; /** * 申请单查询dto diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormSaveDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormSaveDto.java index 3cc3531a..74cf87cb 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormSaveDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormSaveDto.java @@ -1,13 +1,12 @@ package com.openhis.web.regdoctorstation.dto; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 申请单保存dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/TransferOrganizationParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/TransferOrganizationParam.java index af70813b..6d5c8db0 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/TransferOrganizationParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/TransferOrganizationParam.java @@ -1,15 +1,13 @@ package com.openhis.web.regdoctorstation.dto; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * 转科参数类 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/AdviceManageAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/AdviceManageAppMapper.java index 49598c8f..d1dc7502 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/AdviceManageAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/AdviceManageAppMapper.java @@ -1,10 +1,5 @@ package com.openhis.web.regdoctorstation.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; @@ -12,6 +7,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.inhospitalnursestation.dto.EncounterAccountDto; import com.openhis.web.regdoctorstation.dto.RegPatientMainInfoDto; import com.openhis.web.regdoctorstation.dto.RegRequestBaseDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 医嘱管理 应用Mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/RequestFormManageAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/RequestFormManageAppMapper.java index 6c7a90c6..87a374ae 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/RequestFormManageAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/RequestFormManageAppMapper.java @@ -1,13 +1,12 @@ package com.openhis.web.regdoctorstation.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.openhis.web.regdoctorstation.dto.ActivityOrganizationConfigDto; import com.openhis.web.regdoctorstation.dto.RequestFormDetailQueryDto; import com.openhis.web.regdoctorstation.dto.RequestFormQueryDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 申请单管理 应用Mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/SpecialAdviceAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/SpecialAdviceAppMapper.java index 005039e8..5ebf596f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/SpecialAdviceAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/SpecialAdviceAppMapper.java @@ -1,12 +1,11 @@ package com.openhis.web.regdoctorstation.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.openhis.web.regdoctorstation.dto.NursingOrdersDetailDto; import com.openhis.web.regdoctorstation.dto.NursingOrdersEncounterDetailDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 特殊医嘱 应用Mapper 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 f929f977..b4b3689f 100644 --- 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 @@ -1,16 +1,14 @@ package com.openhis.web.regdoctorstation.utils; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Component; - import com.core.common.utils.AssignSeqUtil; import com.openhis.common.enums.AssignSeqEnum; import com.openhis.web.regdoctorstation.dto.RegAdviceSaveDto; +import org.springframework.stereotype.Component; + +import javax.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/reportmanage/appservice/IChargeReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IChargeReportAppService.java index f72e3c4d..676e8354 100644 --- 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 @@ -3,12 +3,12 @@ */ package com.openhis.web.reportmanage.appservice; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.core.common.core.domain.R; import com.openhis.web.reportmanage.dto.ChargeReportSearchParam; +import javax.servlet.http.HttpServletRequest; +import javax.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 9fe10c9b..8779eb1a 100644 --- 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 @@ -3,10 +3,9 @@ */ package com.openhis.web.reportmanage.appservice; -import javax.servlet.http.HttpServletRequest; - import com.core.common.core.domain.R; -import com.openhis.web.reportmanage.dto.DrugDosageSettlementSearchParam; + +import javax.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 13d02d6d..578bf5b8 100644 --- 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 @@ -3,12 +3,10 @@ */ package com.openhis.web.reportmanage.appservice; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.core.common.core.domain.R; import com.openhis.web.reportmanage.dto.DrugDosageSettlementSearchParam; -import com.openhis.web.reportmanage.dto.TransferReportSearchParam; + +import javax.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 fb6dcf1d..033fa220 100644 --- 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 @@ -3,12 +3,12 @@ */ package com.openhis.web.reportmanage.appservice; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.core.common.core.domain.R; import com.openhis.web.reportmanage.dto.InboundReportSearchParam; +import javax.servlet.http.HttpServletRequest; +import javax.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 c55cc6c9..2438b37a 100644 --- 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 @@ -3,12 +3,11 @@ */ package com.openhis.web.reportmanage.appservice; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.core.common.core.domain.R; import com.openhis.web.reportmanage.dto.InventoryProductReportSearchParam; -import com.openhis.web.reportmanage.dto.OutboundReportSearchParam; + +import javax.servlet.http.HttpServletRequest; +import javax.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 0674a89d..81d30313 100644 --- 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 @@ -3,12 +3,12 @@ */ package com.openhis.web.reportmanage.appservice; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.core.common.core.domain.R; import com.openhis.web.reportmanage.dto.LossReportSearchParam; +import javax.servlet.http.HttpServletRequest; +import javax.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 0e450224..cd61d173 100644 --- 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 @@ -5,11 +5,8 @@ package com.openhis.web.reportmanage.appservice; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; -import com.openhis.web.reportmanage.dto.InboundReportSearchParam; import com.openhis.web.reportmanage.dto.MedUseReportInfoDto; -import org.springframework.web.bind.annotation.RequestParam; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMonthlySettlementReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMonthlySettlementReportAppService.java index 915eea6a..9b256afc 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMonthlySettlementReportAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IMonthlySettlementReportAppService.java @@ -4,7 +4,6 @@ package com.openhis.web.reportmanage.appservice; import com.core.common.core.domain.R; -import org.springframework.web.bind.annotation.GetMapping; /** * 月末结算报表 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 13172350..3d7c692b 100644 --- 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 @@ -1,11 +1,11 @@ package com.openhis.web.reportmanage.appservice; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.core.common.core.domain.R; import com.openhis.web.reportmanage.dto.OutboundReportSearchParam; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * 出库明细报表 appService * 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 4c78f242..668ef4ac 100644 --- 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 @@ -5,7 +5,6 @@ package com.openhis.web.reportmanage.appservice; import com.core.common.core.domain.R; import com.openhis.web.reportmanage.dto.RegisterReportSearchParam; -import com.openhis.web.reportmanage.dto.TransferReportSearchParam; import javax.servlet.http.HttpServletRequest; 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 184b6b34..97e46354 100644 --- 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 @@ -3,15 +3,14 @@ */ package com.openhis.web.reportmanage.appservice; -import java.time.LocalDateTime; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - 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 java.time.LocalDateTime; + /** * 报表 appService * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReportStatisticsAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReportStatisticsAppService.java index a7ad0924..4a585124 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReportStatisticsAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReportStatisticsAppService.java @@ -3,10 +3,7 @@ */ package com.openhis.web.reportmanage.appservice; -import javax.servlet.http.HttpServletRequest; - import com.core.common.core.domain.R; -import org.springframework.web.bind.annotation.RequestParam; /** * 报表统计 controller 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 b9085e91..667d9d1e 100644 --- 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 @@ -1,12 +1,11 @@ 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 com.core.common.core.domain.R; -import com.openhis.web.reportmanage.dto.OutboundReportSearchParam; -import com.openhis.web.reportmanage.dto.ReturnIssueReportSearchParam; - /** * 领用退库明细报表 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 c51e3a06..de06a12f 100644 --- 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 @@ -3,12 +3,12 @@ */ package com.openhis.web.reportmanage.appservice; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.core.common.core.domain.R; import com.openhis.web.reportmanage.dto.StocktakingReportSearchParam; +import javax.servlet.http.HttpServletRequest; +import javax.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 2642bb40..416d3e54 100644 --- 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 @@ -3,12 +3,12 @@ */ package com.openhis.web.reportmanage.appservice; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.core.common.core.domain.R; import com.openhis.web.reportmanage.dto.TransferReportSearchParam; +import javax.servlet.http.HttpServletRequest; +import javax.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 54c4c428..828bc2ba 100644 --- 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 @@ -3,13 +3,9 @@ */ package com.openhis.web.reportmanage.appservice; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.core.common.core.domain.R; -import com.openhis.web.reportmanage.dto.PurchaseReturnReportSearchParam; -import java.io.IOException; +import javax.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 139a8c42..d4618b2a 100644 --- 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 @@ -3,13 +3,12 @@ */ 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 com.core.common.core.domain.R; -import com.openhis.web.reportmanage.dto.OutboundReportSearchParam; -import com.openhis.web.reportmanage.dto.PurchaseReturnReportSearchParam; - /** * 采购退货明细报表 appService * 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 2be6f79c..56fad05f 100644 --- 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 @@ -3,24 +3,20 @@ */ package com.openhis.web.reportmanage.appservice.impl; -import javax.servlet.http.HttpServletRequest; - -import com.openhis.web.reportmanage.appservice.IDepartmentRevenueStatisticsAppService; -import com.openhis.web.reportmanage.dto.DepartmentRevenueStatisticsPageDto; -import com.openhis.web.reportmanage.mapper.DepartmentRevenueStatisticsMapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.openhis.common.enums.DispenseStatus; import com.openhis.common.enums.RequestStatus; import com.openhis.common.utils.HisQueryUtils; -import com.openhis.web.reportmanage.appservice.IDrugDosageSettlementAppService; -import com.openhis.web.reportmanage.dto.DrugDosageSettlementPageDto; +import com.openhis.web.reportmanage.appservice.IDepartmentRevenueStatisticsAppService; +import com.openhis.web.reportmanage.dto.DepartmentRevenueStatisticsPageDto; import com.openhis.web.reportmanage.dto.DrugDosageSettlementSearchParam; -import com.openhis.web.reportmanage.mapper.DrugDosageSettlementMapper; +import com.openhis.web.reportmanage.mapper.DepartmentRevenueStatisticsMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.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 d6412ca5..ecb9a0d5 100644 --- 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 @@ -4,18 +4,20 @@ package com.openhis.web.reportmanage.appservice.impl; -import javax.servlet.http.HttpServletRequest; -import com.openhis.common.enums.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.core.common.core.domain.R; +import com.openhis.common.enums.DispenseStatus; +import com.openhis.common.enums.RequestStatus; +import com.openhis.common.utils.HisQueryUtils; import com.openhis.web.reportmanage.appservice.IDrugDosageSettlementAppService; import com.openhis.web.reportmanage.dto.DrugDosageSettlementPageDto; import com.openhis.web.reportmanage.dto.DrugDosageSettlementSearchParam; import com.openhis.web.reportmanage.mapper.DrugDosageSettlementMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.core.common.core.domain.R; -import com.openhis.common.utils.HisQueryUtils; + +import javax.servlet.http.HttpServletRequest; /** * 药品用量结算 impl diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/IPrintReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/IPrintReportAppServiceImpl.java index b869d118..a4175d95 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/IPrintReportAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/IPrintReportAppServiceImpl.java @@ -1,11 +1,5 @@ package com.openhis.web.reportmanage.appservice.impl; -import java.util.List; - -import com.openhis.web.reportmanage.dto.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.core.common.core.domain.R; import com.core.common.utils.AgeCalculatorUtil; import com.core.common.utils.MessageUtils; @@ -18,9 +12,16 @@ import com.openhis.common.enums.Whether; import com.openhis.common.enums.ybenums.YbRxItemTypeCode; import com.openhis.common.utils.EnumUtils; import com.openhis.web.reportmanage.appservice.IPrintReportAppService; +import com.openhis.web.reportmanage.dto.BottleLabelDto; +import com.openhis.web.reportmanage.dto.CkInspAppDto; +import com.openhis.web.reportmanage.dto.DisposalDto; +import com.openhis.web.reportmanage.dto.PrescriptionPrintDto; import com.openhis.web.reportmanage.mapper.PrintReportMapper; import com.openhis.workflow.service.IServiceRequestService; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 院内处方和医嘱报告打印 接口实现类 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 398014a9..b06c4ea4 100644 --- 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 @@ -3,23 +3,12 @@ */ package com.openhis.web.reportmanage.appservice.impl; -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.core.common.utils.poi.ExcelUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.core.domain.entity.SysDictData; import com.core.common.utils.MessageUtils; +import com.core.common.utils.poi.ExcelUtil; import com.core.system.service.ISysDictTypeService; import com.openhis.administration.domain.Practitioner; import com.openhis.administration.domain.Supplier; @@ -36,7 +25,15 @@ import com.openhis.web.reportmanage.dto.InboundReportInitDto; import com.openhis.web.reportmanage.dto.InboundReportPageDto; import com.openhis.web.reportmanage.dto.InboundReportSearchParam; import com.openhis.web.reportmanage.mapper.InboundReportMapper; -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 java.math.BigDecimal; +import java.util.*; +import java.util.stream.Collectors; /** * 入库明细报表 impl 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 ba3fb25c..09ac8501 100644 --- 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 @@ -3,15 +3,8 @@ */ package com.openhis.web.reportmanage.appservice.impl; -import java.io.IOException; -import java.math.BigDecimal; -import java.text.DecimalFormat; -import java.util.*; -import java.util.stream.Collectors; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - import com.alibaba.fastjson2.JSONObject; +import com.core.common.core.domain.R; import com.core.common.utils.AgeCalculatorUtil; import com.core.common.utils.SecurityUtils; import com.openhis.administration.service.IEncounterService; @@ -24,8 +17,14 @@ import com.openhis.web.reportmanage.mapper.InpatientMedicalRecordHomePageCollect import com.openhis.web.reportmanage.utils.CsvFillerUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.core.common.core.domain.R; -import java.util.stream.Collectors; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.util.ArrayList; +import java.util.List; /** * 住院病案首页采集 impl 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 c0e54f89..cbd882dd 100644 --- 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 @@ -3,36 +3,32 @@ */ package com.openhis.web.reportmanage.appservice.impl; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.core.common.core.domain.entity.SysDictData; -import com.core.common.utils.MessageUtils; -import com.core.common.utils.SecurityUtils; -import com.core.system.service.ISysDictTypeService; -import com.openhis.administration.domain.Practitioner; -import com.openhis.administration.domain.Supplier; -import com.openhis.administration.service.IPractitionerService; -import com.openhis.common.constant.CommonConstants; -import com.openhis.common.constant.PromptMsgConstant; -import com.openhis.common.enums.*; -import com.openhis.web.reportmanage.dto.OutboundReportPageDto; -import com.openhis.web.reportmanage.dto.OutboundReportSearchParam; -import com.openhis.web.reportmanage.utils.ExcelFillerUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; +import com.core.common.core.domain.entity.SysDictData; +import com.core.common.utils.MessageUtils; +import com.core.system.service.ISysDictTypeService; +import com.openhis.administration.service.IPractitionerService; +import com.openhis.common.constant.CommonConstants; +import com.openhis.common.constant.PromptMsgConstant; +import com.openhis.common.enums.CategoryType; +import com.openhis.common.enums.ConditionCode; +import com.openhis.common.enums.LocationForm; +import com.openhis.common.enums.SupplyType; import com.openhis.common.utils.EnumUtils; import com.openhis.common.utils.HisQueryUtils; import com.openhis.web.reportmanage.appservice.IInventoryProductReportAppService; import com.openhis.web.reportmanage.dto.InventoryProductReportPageDto; import com.openhis.web.reportmanage.dto.InventoryProductReportSearchParam; import com.openhis.web.reportmanage.mapper.InventoryProductReportMapper; +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 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 2884ed11..1214e819 100644 --- 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 @@ -3,24 +3,12 @@ */ package com.openhis.web.reportmanage.appservice.impl; -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.core.common.annotation.Excel; -import com.core.common.utils.poi.ExcelUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.core.domain.entity.SysDictData; import com.core.common.utils.MessageUtils; +import com.core.common.utils.poi.ExcelUtil; import com.core.system.service.ISysDictTypeService; import com.openhis.administration.domain.Practitioner; import com.openhis.administration.service.IPractitionerService; @@ -34,7 +22,15 @@ import com.openhis.web.reportmanage.appservice.ILossReportAppService; import com.openhis.web.reportmanage.dto.LossReportPageDto; import com.openhis.web.reportmanage.dto.LossReportSearchParam; import com.openhis.web.reportmanage.mapper.LossReportMapper; -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 java.math.BigDecimal; +import java.util.*; +import java.util.stream.Collectors; /** * 报损明细报表 impl 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 e0008d66..1f3a59c4 100644 --- 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 @@ -3,36 +3,32 @@ */ package com.openhis.web.reportmanage.appservice.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.core.common.core.domain.R; import com.core.common.core.domain.entity.SysDictData; import com.core.common.utils.MessageUtils; import com.core.system.service.ISysDictTypeService; import com.openhis.administration.domain.Organization; -import com.openhis.administration.domain.Practitioner; import com.openhis.administration.service.IOrganizationService; +import com.openhis.common.constant.CommonConstants; import com.openhis.common.constant.PromptMsgConstant; -import com.openhis.common.enums.*; -import com.openhis.common.utils.HisQueryUtils; -import com.openhis.web.reportmanage.dto.InboundReportPageDto; -import com.openhis.web.reportmanage.dto.InboundReportSearchParam; +import com.openhis.common.enums.DispenseStatus; +import com.openhis.common.enums.OrganizationType; +import com.openhis.common.enums.RequestStatus; +import com.openhis.common.enums.SupplyType; +import com.openhis.web.reportmanage.appservice.IMedicationDeviceReportAppService; import com.openhis.web.reportmanage.dto.MedDevUseReportDto; import com.openhis.web.reportmanage.dto.MedUseReportInfoDto; +import com.openhis.web.reportmanage.mapper.MedicationDeviceReportMapper; import com.openhis.web.reportmanage.utils.ExcelFillerUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.core.common.core.domain.R; -import com.openhis.common.constant.CommonConstants; -import com.openhis.web.reportmanage.appservice.IMedicationDeviceReportAppService; -import com.openhis.web.reportmanage.mapper.MedicationDeviceReportMapper; - import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.math.BigDecimal; -import java.util.*; -import java.util.function.Function; +import java.util.LinkedHashMap; +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/reportmanage/appservice/impl/MonthlySettlementReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MonthlySettlementReportAppServiceImpl.java index 22d2e021..cf656977 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MonthlySettlementReportAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/MonthlySettlementReportAppServiceImpl.java @@ -3,19 +3,9 @@ */ package com.openhis.web.reportmanage.appservice.impl; -import java.math.BigDecimal; -import java.util.List; -import java.util.stream.Collectors; - -import com.openhis.administration.domain.Location; -import com.openhis.administration.domain.Supplier; -import com.openhis.administration.service.ILocationService; -import com.openhis.web.reportmanage.dto.InboundReportInitDto; -import com.openhis.web.reportmanage.dto.MonthlySettlementInitDto; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.core.common.core.domain.R; +import com.openhis.administration.domain.Location; +import com.openhis.administration.service.ILocationService; import com.openhis.common.constant.CommonConstants; import com.openhis.common.enums.DispenseStatus; import com.openhis.common.enums.RequestStatus; @@ -24,7 +14,14 @@ import com.openhis.common.enums.SupplyType; import com.openhis.web.reportmanage.appservice.IMonthlySettlementReportAppService; import com.openhis.web.reportmanage.dto.AmountNumberDto; import com.openhis.web.reportmanage.dto.MonthlySettlementDto; +import com.openhis.web.reportmanage.dto.MonthlySettlementInitDto; import com.openhis.web.reportmanage.mapper.MonthlySettlementReportMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.List; +import java.util.stream.Collectors; /** * 月末结算报表 impl 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 7619a6f5..54ee0237 100644 --- 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 @@ -1,22 +1,11 @@ package com.openhis.web.reportmanage.appservice.impl; -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.core.common.utils.poi.ExcelUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.core.domain.entity.SysDictData; import com.core.common.utils.MessageUtils; +import com.core.common.utils.poi.ExcelUtil; import com.core.system.service.ISysDictTypeService; import com.openhis.administration.domain.Practitioner; import com.openhis.administration.domain.Supplier; @@ -33,7 +22,15 @@ import com.openhis.web.reportmanage.dto.OutboundReportInitDto; import com.openhis.web.reportmanage.dto.OutboundReportPageDto; import com.openhis.web.reportmanage.dto.OutboundReportSearchParam; import com.openhis.web.reportmanage.mapper.OutboundReportMapper; -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 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/PurchaseReturnReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/PurchaseReturnReportAppServiceImpl.java index d1947c3e..680c1676 100644 --- 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 @@ -3,38 +3,37 @@ */ package com.openhis.web.reportmanage.appservice.impl; -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.core.common.core.domain.entity.SysDictData; -import com.core.common.utils.MessageUtils; -import com.core.common.utils.SecurityUtils; -import com.core.system.service.ISysDictTypeService; -import com.openhis.administration.domain.Practitioner; -import com.openhis.administration.service.IPractitionerService; -import com.openhis.common.constant.PromptMsgConstant; -import com.openhis.web.reportmanage.dto.*; -import com.openhis.web.reportmanage.utils.ExcelFillerUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; +import com.core.common.core.domain.entity.SysDictData; +import com.core.common.utils.MessageUtils; +import com.core.system.service.ISysDictTypeService; +import com.openhis.administration.domain.Practitioner; import com.openhis.administration.domain.Supplier; +import com.openhis.administration.service.IPractitionerService; import com.openhis.administration.service.ISupplierService; import com.openhis.common.constant.CommonConstants; +import com.openhis.common.constant.PromptMsgConstant; import com.openhis.common.enums.DispenseStatus; import com.openhis.common.enums.SupplyStatus; import com.openhis.common.enums.SupplyType; import com.openhis.common.utils.HisQueryUtils; import com.openhis.web.reportmanage.appservice.PurchaseReturnReportAppService; +import com.openhis.web.reportmanage.dto.PurchaseReturnReportInitDto; +import com.openhis.web.reportmanage.dto.PurchaseReturnReportPageDto; +import com.openhis.web.reportmanage.dto.PurchaseReturnReportSearchParam; import com.openhis.web.reportmanage.mapper.PurchaseReturnReportMapper; +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 java.math.BigDecimal; +import java.util.*; +import java.util.stream.Collectors; /** * 采购退货明细报表 impl 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 541a8553..731164db 100644 --- 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 @@ -12,25 +12,19 @@ import com.openhis.administration.service.IOrganizationService; import com.openhis.administration.service.IPractitionerService; import com.openhis.common.constant.CommonConstants; import com.openhis.common.enums.*; -import com.openhis.common.utils.EnumUtils; import com.openhis.common.utils.HisQueryUtils; import com.openhis.web.reportmanage.appservice.IRegisterReportAppService; -import com.openhis.web.reportmanage.appservice.IRegisterReportAppService; -import com.openhis.web.reportmanage.dto.ChargeReportInitDto; import com.openhis.web.reportmanage.dto.RegisterReportInitDto; import com.openhis.web.reportmanage.dto.RegisterReportPageDto; import com.openhis.web.reportmanage.dto.RegisterReportSearchParam; import com.openhis.web.reportmanage.mapper.RegisterReportMapper; -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 java.util.HashSet; import java.util.List; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * 挂号明细报表 impl 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 22a55c26..136f30d3 100644 --- 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 @@ -3,22 +3,6 @@ */ package com.openhis.web.reportmanage.appservice.impl; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Objects; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -38,6 +22,20 @@ import com.openhis.financial.service.IPaymentRecStaticService; import com.openhis.web.reportmanage.appservice.IReportAppService; import com.openhis.web.reportmanage.dto.*; 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 java.math.BigDecimal; +import java.math.RoundingMode; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; /** * 报表 impl diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReportStatisticsAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReportStatisticsAppServiceImpl.java index 424d72eb..ce2d3ed9 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReportStatisticsAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReportStatisticsAppServiceImpl.java @@ -3,21 +3,19 @@ */ package com.openhis.web.reportmanage.appservice.impl; -import javax.servlet.http.HttpServletRequest; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.core.common.core.domain.R; import com.core.common.utils.bean.BeanUtils; -import com.openhis.common.enums.*; +import com.openhis.common.enums.ChargeItemStatus; +import com.openhis.common.enums.EncounterClass; +import com.openhis.common.enums.LocationForm; +import com.openhis.common.enums.PractitionerRoles; import com.openhis.common.enums.ybenums.YbMedChrgItmType; -import com.openhis.common.utils.HisQueryUtils; +import com.openhis.web.reportmanage.appservice.IReportStatisticsAppService; import com.openhis.web.reportmanage.dto.AnnualReportStatisticsPageDto; import com.openhis.web.reportmanage.dto.DailyReportStatisticsPageDto; -import com.openhis.web.reportmanage.dto.DrugDosageSettlementSearchParam; +import com.openhis.web.reportmanage.mapper.ReportStatisticsMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.core.common.core.domain.R; -import com.openhis.web.reportmanage.appservice.IReportStatisticsAppService; -import com.openhis.web.reportmanage.mapper.ReportStatisticsMapper; /** * 科室收入统计 controller 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 c2dd06bf..2547faeb 100644 --- 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 @@ -1,37 +1,36 @@ package com.openhis.web.reportmanage.appservice.impl; -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.core.common.core.domain.entity.SysDictData; -import com.core.common.utils.MessageUtils; -import com.core.common.utils.SecurityUtils; -import com.core.system.service.ISysDictTypeService; -import com.openhis.administration.domain.Practitioner; -import com.openhis.administration.service.IPractitionerService; -import com.openhis.common.constant.PromptMsgConstant; -import com.openhis.web.reportmanage.dto.*; -import com.openhis.web.reportmanage.utils.ExcelFillerUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; +import com.core.common.core.domain.entity.SysDictData; +import com.core.common.utils.MessageUtils; +import com.core.system.service.ISysDictTypeService; +import com.openhis.administration.domain.Practitioner; import com.openhis.administration.domain.Supplier; +import com.openhis.administration.service.IPractitionerService; import com.openhis.administration.service.ISupplierService; import com.openhis.common.constant.CommonConstants; +import com.openhis.common.constant.PromptMsgConstant; import com.openhis.common.enums.DispenseStatus; import com.openhis.common.enums.SupplyStatus; import com.openhis.common.enums.SupplyType; import com.openhis.common.utils.HisQueryUtils; import com.openhis.web.reportmanage.appservice.IReturnIssueReportAppService; +import com.openhis.web.reportmanage.dto.ReturnIssueReportInitDto; +import com.openhis.web.reportmanage.dto.ReturnIssueReportPageDto; +import com.openhis.web.reportmanage.dto.ReturnIssueReportSearchParam; import com.openhis.web.reportmanage.mapper.ReturnIssueReportMapper; +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 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 74c57a24..fc83178e 100644 --- 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 @@ -3,23 +3,12 @@ */ package com.openhis.web.reportmanage.appservice.impl; -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.core.common.utils.poi.ExcelUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.core.domain.entity.SysDictData; import com.core.common.utils.MessageUtils; +import com.core.common.utils.poi.ExcelUtil; import com.core.system.service.ISysDictTypeService; import com.openhis.administration.domain.Practitioner; import com.openhis.administration.service.IPractitionerService; @@ -33,7 +22,15 @@ import com.openhis.web.reportmanage.appservice.IStocktakingReportAppService; import com.openhis.web.reportmanage.dto.StocktakingReportPageDto; import com.openhis.web.reportmanage.dto.StocktakingReportSearchParam; import com.openhis.web.reportmanage.mapper.StocktakingReportMapper; -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 java.math.BigDecimal; +import java.util.*; +import java.util.stream.Collectors; /** * 库存盘点明细报表 impl 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 c0b444cc..0ae2fc8f 100644 --- 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 @@ -3,23 +3,12 @@ */ package com.openhis.web.reportmanage.appservice.impl; -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.core.common.utils.poi.ExcelUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.core.domain.entity.SysDictData; import com.core.common.utils.MessageUtils; +import com.core.common.utils.poi.ExcelUtil; import com.core.system.service.ISysDictTypeService; import com.openhis.administration.domain.Practitioner; import com.openhis.administration.service.IPractitionerService; @@ -34,7 +23,15 @@ import com.openhis.web.reportmanage.appservice.ITransferReportAppService; import com.openhis.web.reportmanage.dto.TransferReportPageDto; import com.openhis.web.reportmanage.dto.TransferReportSearchParam; import com.openhis.web.reportmanage.mapper.TransferReportMapper; -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 java.math.BigDecimal; +import java.util.*; +import java.util.stream.Collectors; /** * 商品调拨明细报表 impl 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 556b64d5..4e612c62 100644 --- 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 @@ -3,20 +3,16 @@ */ package com.openhis.web.reportmanage.controller; -import javax.servlet.http.HttpServletRequest; - +import com.core.common.core.domain.R; import com.openhis.web.reportmanage.appservice.IDepartmentRevenueStatisticsAppService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.core.common.core.domain.R; -import com.openhis.web.reportmanage.appservice.IDrugDosageSettlementAppService; -import com.openhis.web.reportmanage.dto.DrugDosageSettlementSearchParam; - -import lombok.extern.slf4j.Slf4j; +import javax.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 7eb2d502..0d2620b0 100644 --- 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 @@ -3,22 +3,17 @@ */ package com.openhis.web.reportmanage.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.core.common.core.domain.R; import com.openhis.web.reportmanage.appservice.IDrugDosageSettlementAppService; import com.openhis.web.reportmanage.dto.DrugDosageSettlementSearchParam; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.core.common.core.domain.R; -import com.openhis.web.reportmanage.appservice.ITransferReportAppService; -import com.openhis.web.reportmanage.dto.TransferReportSearchParam; - -import lombok.extern.slf4j.Slf4j; +import javax.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 1f1e275f..c852e572 100644 --- 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 @@ -3,20 +3,18 @@ */ package com.openhis.web.reportmanage.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.core.common.core.domain.R; +import com.openhis.web.reportmanage.appservice.IInboundReportAppService; +import com.openhis.web.reportmanage.dto.InboundReportSearchParam; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.core.common.core.domain.R; -import com.openhis.web.reportmanage.appservice.IInboundReportAppService; -import com.openhis.web.reportmanage.dto.InboundReportSearchParam; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import javax.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 53dc1e3e..fb503494 100644 --- 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 @@ -3,19 +3,16 @@ */ package com.openhis.web.reportmanage.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.openhis.web.reportmanage.appservice.InpatientMedicalRecordHomePageCollectionAppService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; -import com.openhis.web.reportmanage.appservice.ITransferReportAppService; -import com.openhis.web.reportmanage.dto.TransferReportSearchParam; - +import com.openhis.web.reportmanage.appservice.InpatientMedicalRecordHomePageCollectionAppService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +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 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 8e49ad48..28bb1642 100644 --- 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 @@ -3,21 +3,18 @@ */ package com.openhis.web.reportmanage.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.openhis.web.reportmanage.dto.OutboundReportSearchParam; +import com.core.common.core.domain.R; +import com.openhis.web.reportmanage.appservice.IInventoryProductReportAppService; +import com.openhis.web.reportmanage.dto.InventoryProductReportSearchParam; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.core.common.core.domain.R; -import com.openhis.web.reportmanage.appservice.IInventoryProductReportAppService; -import com.openhis.web.reportmanage.dto.InventoryProductReportSearchParam; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import javax.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 980c6c33..3ee0df17 100644 --- 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 @@ -3,20 +3,18 @@ */ package com.openhis.web.reportmanage.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.core.common.core.domain.R; +import com.openhis.web.reportmanage.appservice.ILossReportAppService; +import com.openhis.web.reportmanage.dto.LossReportSearchParam; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.core.common.core.domain.R; -import com.openhis.web.reportmanage.appservice.ILossReportAppService; -import com.openhis.web.reportmanage.dto.LossReportSearchParam; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import javax.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 5c22f9ea..dc0302a1 100644 --- 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 @@ -3,18 +3,16 @@ */ package com.openhis.web.reportmanage.controller; -import javax.servlet.http.HttpServletResponse; - +import com.core.common.core.domain.R; +import com.openhis.web.reportmanage.appservice.IMedicationDeviceReportAppService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.core.common.core.domain.R; -import com.openhis.web.reportmanage.appservice.IMedicationDeviceReportAppService; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletResponse; /** * 药品耗材统计查询用 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MonthlySettlementController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MonthlySettlementController.java index 03e63944..ca802b7a 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MonthlySettlementController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/MonthlySettlementController.java @@ -3,17 +3,15 @@ */ package com.openhis.web.reportmanage.controller; +import com.core.common.core.domain.R; +import com.openhis.web.reportmanage.appservice.IMonthlySettlementReportAppService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.core.common.core.domain.R; -import com.openhis.web.reportmanage.appservice.IMonthlySettlementReportAppService; - -import lombok.extern.slf4j.Slf4j; - /** * 对账 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 782580a7..17c298cc 100644 --- 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 @@ -1,20 +1,18 @@ package com.openhis.web.reportmanage.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.core.common.core.domain.R; +import com.openhis.web.reportmanage.appservice.IOutboundReportAppService; +import com.openhis.web.reportmanage.dto.OutboundReportSearchParam; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.core.common.core.domain.R; -import com.openhis.web.reportmanage.appservice.IOutboundReportAppService; -import com.openhis.web.reportmanage.dto.OutboundReportSearchParam; - -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * 出库明细报表 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PrintReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PrintReportController.java index 8d2c433a..9e3e577d 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PrintReportController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/PrintReportController.java @@ -1,17 +1,15 @@ package com.openhis.web.reportmanage.controller; +import com.core.common.core.domain.R; +import com.openhis.web.reportmanage.appservice.IPrintReportAppService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.core.common.core.domain.R; -import com.openhis.web.reportmanage.appservice.IPrintReportAppService; - -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; - import java.util.List; /** 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 03531ed1..bc1e51ed 100644 --- 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 @@ -3,21 +3,18 @@ */ package com.openhis.web.reportmanage.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.core.common.core.domain.R; import com.openhis.web.reportmanage.appservice.PurchaseReturnReportAppService; -import com.openhis.web.reportmanage.dto.OutboundReportSearchParam; import com.openhis.web.reportmanage.dto.PurchaseReturnReportSearchParam; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.core.common.core.domain.R; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import javax.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 45abab42..b79de30a 100644 --- 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 @@ -4,7 +4,6 @@ package com.openhis.web.reportmanage.controller; import com.core.common.core.domain.R; -import com.openhis.web.reportmanage.appservice.IChargeReportAppService; import com.openhis.web.reportmanage.appservice.IRegisterReportAppService; import com.openhis.web.reportmanage.dto.RegisterReportSearchParam; import lombok.extern.slf4j.Slf4j; 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 5f11ddc5..62550e00 100644 --- 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 @@ -3,23 +3,20 @@ */ package com.openhis.web.reportmanage.controller; -import java.time.LocalDateTime; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.reportmanage.appservice.IReportAppService; import com.openhis.web.reportmanage.dto.ReportDetailsSearchParam; import com.openhis.web.reportmanage.dto.ReportPatientDetailsSearchParam; import com.openhis.web.reportmanage.dto.ReportPatientMasterDetailsSearchParam; import com.openhis.web.reportmanage.dto.ReportPhysicianWorkloadSearchParam; - import lombok.extern.slf4j.Slf4j; +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 java.time.LocalDateTime; /** * 报表 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReportStatisticsController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReportStatisticsController.java index b7094007..4635f3ca 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReportStatisticsController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReportStatisticsController.java @@ -3,19 +3,15 @@ */ package com.openhis.web.reportmanage.controller; -import javax.servlet.http.HttpServletRequest; - +import com.core.common.core.domain.R; +import com.openhis.web.reportmanage.appservice.IReportStatisticsAppService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.core.common.core.domain.R; -import com.openhis.web.reportmanage.appservice.IReportStatisticsAppService; - -import lombok.extern.slf4j.Slf4j; - /** * 报表统计 controller * 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 0fd0069a..f566e8ea 100644 --- 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 @@ -1,21 +1,18 @@ package com.openhis.web.reportmanage.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.core.common.core.domain.R; import com.openhis.web.reportmanage.appservice.IReturnIssueReportAppService; -import com.openhis.web.reportmanage.dto.OutboundReportSearchParam; import com.openhis.web.reportmanage.dto.ReturnIssueReportSearchParam; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.core.common.core.domain.R; - -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import javax.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 037cee9f..299c5794 100644 --- 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 @@ -3,20 +3,18 @@ */ package com.openhis.web.reportmanage.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.core.common.core.domain.R; +import com.openhis.web.reportmanage.appservice.IStocktakingReportAppService; +import com.openhis.web.reportmanage.dto.StocktakingReportSearchParam; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.core.common.core.domain.R; -import com.openhis.web.reportmanage.appservice.IStocktakingReportAppService; -import com.openhis.web.reportmanage.dto.StocktakingReportSearchParam; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import javax.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 fc2b0eaa..3d19267f 100644 --- 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 @@ -3,20 +3,18 @@ */ package com.openhis.web.reportmanage.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.core.common.core.domain.R; +import com.openhis.web.reportmanage.appservice.ITransferReportAppService; +import com.openhis.web.reportmanage.dto.TransferReportSearchParam; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.core.common.core.domain.R; -import com.openhis.web.reportmanage.appservice.ITransferReportAppService; -import com.openhis.web.reportmanage.dto.TransferReportSearchParam; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * 商品调拨明细报表 controller diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/AmountNumberDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/AmountNumberDto.java index aab341ce..49a364c4 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/AmountNumberDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/AmountNumberDto.java @@ -3,11 +3,11 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 金额数量 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/AnnualReportStatisticsPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/AnnualReportStatisticsPageDto.java index 87f1ccaf..37f3edf5 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/AnnualReportStatisticsPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/AnnualReportStatisticsPageDto.java @@ -3,11 +3,11 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 报表统计 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/BottleLabelDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/BottleLabelDto.java index db19157f..ebfe8132 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/BottleLabelDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/BottleLabelDto.java @@ -1,14 +1,13 @@ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 护士输液的瓶签实体类 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportDto.java index 48521166..5549ee22 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportDto.java @@ -1,14 +1,13 @@ package com.openhis.web.reportmanage.dto; -import java.util.List; - import com.core.common.annotation.Excel; - import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import java.util.List; + /** * 费用明细报表导出专用DTO * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportInitDto.java index cc497f86..deb0f945 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportInitDto.java @@ -4,11 +4,9 @@ package com.openhis.web.reportmanage.dto; import com.openhis.administration.domain.Practitioner; -import com.openhis.web.doctorstation.dto.ElepPrescriptionInitDto; import lombok.Data; import lombok.experimental.Accessors; -import java.math.BigDecimal; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportPageDto.java index 3fdcd1d1..968d06e9 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportPageDto.java @@ -3,17 +3,16 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.core.common.annotation.Excel; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 费用明细报表 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportSearchParam.java index 9e95d224..e6c76ff1 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ChargeReportSearchParam.java @@ -3,7 +3,6 @@ */ package com.openhis.web.reportmanage.dto; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DailyReportStatisticsPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DailyReportStatisticsPageDto.java index 5f70e7fe..ab03348a 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DailyReportStatisticsPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DailyReportStatisticsPageDto.java @@ -3,11 +3,11 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 报表统计 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DepartmentRevenueStatisticsPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DepartmentRevenueStatisticsPageDto.java index 0a61f1a4..bf835f66 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DepartmentRevenueStatisticsPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DepartmentRevenueStatisticsPageDto.java @@ -3,14 +3,13 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 科室收入统计 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DrugDosageSettlementPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DrugDosageSettlementPageDto.java index 76593486..1172e345 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DrugDosageSettlementPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DrugDosageSettlementPageDto.java @@ -3,18 +3,13 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; -import java.util.Date; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 药品用量结算 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DrugDosageSettlementSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DrugDosageSettlementSearchParam.java index 0e5991ad..ba56c949 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DrugDosageSettlementSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/DrugDosageSettlementSearchParam.java @@ -3,8 +3,6 @@ */ package com.openhis.web.reportmanage.dto; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportInitDto.java index 6d7faa38..56e04f1c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportInitDto.java @@ -3,14 +3,13 @@ */ package com.openhis.web.reportmanage.dto; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 入库明细报表初始化 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportPageDto.java index 8ef3af9c..87a004ba 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportPageDto.java @@ -3,20 +3,17 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; -import java.util.Date; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.core.common.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 入库明细报表 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportSearchParam.java index fccb9b39..166e6ea4 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InboundReportSearchParam.java @@ -3,11 +3,11 @@ */ package com.openhis.web.reportmanage.dto; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 入库明细查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InpatientMedicalRecordHomePageCollectionDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InpatientMedicalRecordHomePageCollectionDto.java index c8fdd0f4..434015bb 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InpatientMedicalRecordHomePageCollectionDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InpatientMedicalRecordHomePageCollectionDto.java @@ -1,10 +1,11 @@ package com.openhis.web.reportmanage.dto; -import java.util.Date; import lombok.Data; import lombok.experimental.Accessors; + import java.math.BigDecimal; +import java.util.Date; /** * 住院病案首页采集信息 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InpatientMedicalRecordHomePageMakeDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InpatientMedicalRecordHomePageMakeDto.java index 2a8f6bcd..40eb807f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InpatientMedicalRecordHomePageMakeDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InpatientMedicalRecordHomePageMakeDto.java @@ -1,12 +1,12 @@ package com.openhis.web.reportmanage.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import java.math.BigDecimal; import java.util.Date; import java.util.List; -import lombok.Data; -import lombok.experimental.Accessors; - /** * 住院病案首页采集信息搜索 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportPageDto.java index db6073fb..fee51cff 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportPageDto.java @@ -3,18 +3,17 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 库存商品明细报表 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportSearchParam.java index 3b50e6cf..d920f426 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InventoryProductReportSearchParam.java @@ -3,11 +3,11 @@ */ package com.openhis.web.reportmanage.dto; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 库存商品明细查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/LossReportPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/LossReportPageDto.java index 40a1ab82..276baf81 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/LossReportPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/LossReportPageDto.java @@ -3,18 +3,17 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.core.common.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 报损明细报表 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/LossReportSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/LossReportSearchParam.java index 53843b61..dabb3e3a 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/LossReportSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/LossReportSearchParam.java @@ -3,11 +3,11 @@ */ package com.openhis.web.reportmanage.dto; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 报损明细查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedDevUseReportDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedDevUseReportDto.java index 61ae4cca..dd9d6ea6 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedDevUseReportDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedDevUseReportDto.java @@ -3,15 +3,13 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 药品、耗材月结（筛选统计时间区间内的） dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedUseReportInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedUseReportInfoDto.java index 8fd4a912..ddd80870 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedUseReportInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MedUseReportInfoDto.java @@ -3,18 +3,16 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; -import java.util.Date; - -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; +import java.math.BigDecimal; +import java.util.Date; + /** * 统计科室药品开立情况 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MonthlySettlementDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MonthlySettlementDto.java index 8a1e2b67..f6ead9f1 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MonthlySettlementDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MonthlySettlementDto.java @@ -3,15 +3,14 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 月末结算报表 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MonthlySettlementInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MonthlySettlementInitDto.java index 473ef3ab..efd5e822 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MonthlySettlementInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/MonthlySettlementInitDto.java @@ -3,14 +3,13 @@ */ package com.openhis.web.reportmanage.dto; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 月末结算报表 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportInitDto.java index 52d46772..f970d469 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportInitDto.java @@ -3,14 +3,13 @@ */ package com.openhis.web.reportmanage.dto; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 出库明细报表初始化 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportPageDto.java index dcf10435..3078c6e5 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportPageDto.java @@ -1,7 +1,5 @@ package com.openhis.web.reportmanage.dto; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.core.common.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportSearchParam.java index 3b1928ea..86062f9e 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutboundReportSearchParam.java @@ -1,8 +1,5 @@ package com.openhis.web.reportmanage.dto; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutpatientSettlementDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutpatientSettlementDto.java index 8dba0f07..df82bf9b 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutpatientSettlementDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/OutpatientSettlementDto.java @@ -1,6 +1,5 @@ package com.openhis.web.reportmanage.dto; -import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PrescriptionPrintDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PrescriptionPrintDto.java index de2584e5..a29ac588 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PrescriptionPrintDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PrescriptionPrintDto.java @@ -1,15 +1,13 @@ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonFormat; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 西药(中成药)处方单 实体类 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportInitDto.java index 0cac4d83..ddff67e7 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportInitDto.java @@ -3,14 +3,13 @@ */ package com.openhis.web.reportmanage.dto; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 采购退货明细报表初始化 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportPageDto.java index 94a22fee..90d9edda 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportPageDto.java @@ -3,16 +3,15 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 采购退货明细报表 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportSearchParam.java index 3e2b1941..82731e40 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/PurchaseReturnReportSearchParam.java @@ -3,11 +3,11 @@ */ package com.openhis.web.reportmanage.dto; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 采购退货明细查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportInitDto.java index 9b8f51c7..80f52eb0 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportInitDto.java @@ -3,12 +3,12 @@ */ package com.openhis.web.reportmanage.dto; -import java.util.List; - import com.openhis.administration.domain.Practitioner; import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 挂号明细报表下拉框 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportPageDto.java index 9f653bd6..5b4b1653 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportPageDto.java @@ -3,17 +3,12 @@ */ package com.openhis.web.reportmanage.dto; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; import java.math.BigDecimal; -import java.util.Date; /** * 挂号明细报表 dto diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportSearchParam.java index 6b8179b7..2f866a37 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/RegisterReportSearchParam.java @@ -6,8 +6,6 @@ package com.openhis.web.reportmanage.dto; import lombok.Data; import lombok.experimental.Accessors; -import java.util.Date; - /** * 挂号明细查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportBasicInformationDetailsDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportBasicInformationDetailsDto.java index 3f7a8a74..4cf5e545 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportBasicInformationDetailsDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportBasicInformationDetailsDto.java @@ -3,14 +3,13 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; - import com.core.common.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 基本情况 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportDetailsSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportDetailsSearchParam.java index 43cb8eda..7205537f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportDetailsSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportDetailsSearchParam.java @@ -1,10 +1,10 @@ package com.openhis.web.reportmanage.dto; -import java.util.List; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 新增报表查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportDiseaseDetailsDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportDiseaseDetailsDto.java index b4a743e7..ee1f7585 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportDiseaseDetailsDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportDiseaseDetailsDto.java @@ -3,15 +3,6 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - -import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportDrugCostGrowthDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportDrugCostGrowthDto.java index 97b3e0cf..6b9be6d6 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportDrugCostGrowthDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportDrugCostGrowthDto.java @@ -3,11 +3,11 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 药品费用增长率 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationInboundDetailsDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationInboundDetailsDto.java index 16d01063..ba33ae72 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationInboundDetailsDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationInboundDetailsDto.java @@ -3,13 +3,12 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; - import com.core.common.annotation.Excel; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 报表:药品入库情况初始化 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationSaleDetailsDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationSaleDetailsDto.java index 088247fa..8cc16322 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationSaleDetailsDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationSaleDetailsDto.java @@ -3,15 +3,6 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - -import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationStockOutDetailsDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationStockOutDetailsDto.java index 307cdf3d..643cb216 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationStockOutDetailsDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationStockOutDetailsDto.java @@ -3,11 +3,11 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 药品出库情况 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationUsageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationUsageDto.java index a1f3963f..60cfa569 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationUsageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationUsageDto.java @@ -3,13 +3,12 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; - import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 药品使用情况报表始化 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportNonWinQtyRatioDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportNonWinQtyRatioDto.java index 17c47beb..c8e9897b 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportNonWinQtyRatioDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportNonWinQtyRatioDto.java @@ -3,11 +3,11 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 非中选产品采购量占比 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportOfflinePurchaseRatioDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportOfflinePurchaseRatioDto.java index ae3bca5e..60b5a5c0 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportOfflinePurchaseRatioDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportOfflinePurchaseRatioDto.java @@ -3,14 +3,11 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; -import java.util.Date; - -import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 线下采购占比报表初始化 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientDetailsDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientDetailsDto.java index c30f6d95..84b7632b 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientDetailsDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientDetailsDto.java @@ -3,13 +3,12 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; - import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 报表例子:患者明细初始化 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientDetailsSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientDetailsSearchParam.java index c384a01f..e708ccad 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientDetailsSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientDetailsSearchParam.java @@ -3,7 +3,6 @@ */ package com.openhis.web.reportmanage.dto; -import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientMasterDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientMasterDetailDto.java index fce46c7c..01701ad1 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientMasterDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientMasterDetailDto.java @@ -3,14 +3,13 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 报表例子:患者明细主表初始化 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPhysicianWorkloadPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPhysicianWorkloadPageDto.java index ba204d56..42a5fe5b 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPhysicianWorkloadPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPhysicianWorkloadPageDto.java @@ -3,14 +3,13 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 同一:医生工作量报表 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportProductUsageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportProductUsageDto.java index 7e963c84..37297fd3 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportProductUsageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportProductUsageDto.java @@ -3,13 +3,12 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; - import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 产品使用情况始化 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportStockOutDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportStockOutDetailDto.java index 8a425f8e..c00749c9 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportStockOutDetailDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportStockOutDetailDto.java @@ -3,18 +3,16 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 报表例子:出库明细表初始化 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportThirtyDayCollectionRateDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportThirtyDayCollectionRateDto.java index 648b2601..97e4b2d9 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportThirtyDayCollectionRateDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportThirtyDayCollectionRateDto.java @@ -3,11 +3,11 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 报表例子:30天回款率 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportInitDto.java index 569bbbd1..a541b26b 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportInitDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportInitDto.java @@ -3,14 +3,13 @@ */ package com.openhis.web.reportmanage.dto; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 退库明细报表初始化 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportPageDto.java index fdef558f..172b00b9 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportPageDto.java @@ -1,16 +1,15 @@ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 退库明细账分页列表 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportSearchParam.java index 128e8dd8..23c34fe5 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReturnIssueReportSearchParam.java @@ -1,10 +1,10 @@ package com.openhis.web.reportmanage.dto; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 领用退库明细查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/StocktakingReportPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/StocktakingReportPageDto.java index 862d2d7a..2c55d3c4 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/StocktakingReportPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/StocktakingReportPageDto.java @@ -3,9 +3,6 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.core.common.annotation.Excel; @@ -13,10 +10,12 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 库存盘点明细报表 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/StocktakingReportSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/StocktakingReportSearchParam.java index f56d8d14..71cc23bc 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/StocktakingReportSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/StocktakingReportSearchParam.java @@ -3,11 +3,11 @@ */ package com.openhis.web.reportmanage.dto; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 库存盘点明细查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/TransferReportPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/TransferReportPageDto.java index e64e70f1..95182692 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/TransferReportPageDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/TransferReportPageDto.java @@ -3,19 +3,18 @@ */ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.core.common.annotation.Excel; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 商品调拨明细报表 dto * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/TransferReportSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/TransferReportSearchParam.java index a0989157..43007574 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/TransferReportSearchParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/TransferReportSearchParam.java @@ -3,11 +3,11 @@ */ package com.openhis.web.reportmanage.dto; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 商品调拨明细查询条件 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/workloadReportDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/workloadReportDto.java index e8fe1168..dfdb1de3 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/workloadReportDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/workloadReportDto.java @@ -1,12 +1,11 @@ package com.openhis.web.reportmanage.dto; -import java.math.BigDecimal; - import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + @Data @Accessors(chain = true) public class workloadReportDto { diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ChargeReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ChargeReportMapper.java index 8f72e544..666d87f4 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ChargeReportMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ChargeReportMapper.java @@ -3,17 +3,16 @@ */ package com.openhis.web.reportmanage.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.reportmanage.dto.ChargeReportPageDto; import com.openhis.web.reportmanage.dto.ChargeReportSearchParam; import com.openhis.web.reportmanage.dto.workloadReportDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 费用明细报表查询用 mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/DepartmentRevenueStatisticsMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/DepartmentRevenueStatisticsMapper.java index 4c203f78..7db8f827 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/DepartmentRevenueStatisticsMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/DepartmentRevenueStatisticsMapper.java @@ -3,15 +3,14 @@ */ package com.openhis.web.reportmanage.mapper; -import com.openhis.web.reportmanage.dto.DepartmentRevenueStatisticsPageDto; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.openhis.web.reportmanage.dto.DepartmentRevenueStatisticsPageDto; import com.openhis.web.reportmanage.dto.DrugDosageSettlementPageDto; import com.openhis.web.reportmanage.dto.DrugDosageSettlementSearchParam; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; /** * 科室收入统计 mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/DrugDosageSettlementMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/DrugDosageSettlementMapper.java index 28760051..c7942971 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/DrugDosageSettlementMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/DrugDosageSettlementMapper.java @@ -3,13 +3,13 @@ */ package com.openhis.web.reportmanage.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.reportmanage.dto.DrugDosageSettlementPageDto; import com.openhis.web.reportmanage.dto.DrugDosageSettlementSearchParam; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; /** * 药品用量结算 mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InboundReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InboundReportMapper.java index f49afb55..f59c5cd6 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InboundReportMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InboundReportMapper.java @@ -3,14 +3,13 @@ */ package com.openhis.web.reportmanage.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.reportmanage.dto.InboundReportPageDto; import com.openhis.web.reportmanage.dto.InboundReportSearchParam; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InpatientMedicalRecordHomePageCollectionMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InpatientMedicalRecordHomePageCollectionMapper.java index 3eef5f9d..611a45b8 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InpatientMedicalRecordHomePageCollectionMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InpatientMedicalRecordHomePageCollectionMapper.java @@ -3,14 +3,10 @@ */ package com.openhis.web.reportmanage.mapper; -import com.openhis.web.reportmanage.dto.*; +import com.openhis.web.reportmanage.dto.InpatientMedicalRecordHomePageMakeDto; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InventoryProductReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InventoryProductReportMapper.java index a1c655fe..6bffd0f6 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InventoryProductReportMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InventoryProductReportMapper.java @@ -3,14 +3,13 @@ */ package com.openhis.web.reportmanage.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.reportmanage.dto.InventoryProductReportPageDto; import com.openhis.web.reportmanage.dto.InventoryProductReportSearchParam; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; /** * 库存商品明细查询用 mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/LossReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/LossReportMapper.java index da5a1b68..192e4b8f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/LossReportMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/LossReportMapper.java @@ -3,17 +3,14 @@ */ package com.openhis.web.reportmanage.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.reportmanage.dto.LossReportPageDto; import com.openhis.web.reportmanage.dto.LossReportSearchParam; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.openhis.web.reportmanage.dto.StocktakingReportPageDto; -import com.openhis.web.reportmanage.dto.StocktakingReportSearchParam; - import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/MedicationDeviceReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/MedicationDeviceReportMapper.java index ed9ae0be..26f9c84b 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/MedicationDeviceReportMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/MedicationDeviceReportMapper.java @@ -3,14 +3,13 @@ */ package com.openhis.web.reportmanage.mapper; -import java.util.List; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.openhis.web.reportmanage.dto.MedDevUseReportDto; +import com.openhis.web.reportmanage.dto.MedUseReportInfoDto; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.openhis.web.reportmanage.dto.MedDevUseReportDto; -import com.openhis.web.reportmanage.dto.MedUseReportInfoDto; +import java.util.List; /** * 药品耗材统计查询用 mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/MonthlySettlementReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/MonthlySettlementReportMapper.java index 5e62558e..9f45b00f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/MonthlySettlementReportMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/MonthlySettlementReportMapper.java @@ -3,12 +3,11 @@ */ package com.openhis.web.reportmanage.mapper; -import java.math.BigDecimal; - +import com.openhis.web.reportmanage.dto.AmountNumberDto; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.openhis.web.reportmanage.dto.AmountNumberDto; +import java.math.BigDecimal; /** * 月末结算报表 mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/OutboundReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/OutboundReportMapper.java index 07d34069..c2857acd 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/OutboundReportMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/OutboundReportMapper.java @@ -3,14 +3,13 @@ */ package com.openhis.web.reportmanage.mapper; -import com.openhis.web.reportmanage.dto.OutboundReportSearchParam; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.reportmanage.dto.OutboundReportPageDto; +import com.openhis.web.reportmanage.dto.OutboundReportSearchParam; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; import java.util.List; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/PurchaseReturnReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/PurchaseReturnReportMapper.java index 0fab791e..b3eceb16 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/PurchaseReturnReportMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/PurchaseReturnReportMapper.java @@ -3,15 +3,14 @@ */ package com.openhis.web.reportmanage.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.reportmanage.dto.PurchaseReturnReportPageDto; import com.openhis.web.reportmanage.dto.PurchaseReturnReportSearchParam; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - /** * 采购退货明细查询用 mapper * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/RegisterReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/RegisterReportMapper.java index a6918bc2..a4d5a5d4 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/RegisterReportMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/RegisterReportMapper.java @@ -8,8 +8,6 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.reportmanage.dto.RegisterReportPageDto; import com.openhis.web.reportmanage.dto.RegisterReportSearchParam; -import com.openhis.web.reportmanage.dto.TransferReportPageDto; -import com.openhis.web.reportmanage.dto.TransferReportSearchParam; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ReportMapper.java index e509514a..d5dbabf8 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ReportMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ReportMapper.java @@ -3,16 +3,15 @@ */ package com.openhis.web.reportmanage.mapper; -import java.time.LocalDate; -import java.time.LocalDateTime; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.reportmanage.dto.*; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.time.LocalDate; +import java.time.LocalDateTime; /** * 报表 mapper diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ReturnIssueReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ReturnIssueReportMapper.java index ff60c0d6..d9c9c991 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ReturnIssueReportMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/ReturnIssueReportMapper.java @@ -3,15 +3,14 @@ */ package com.openhis.web.reportmanage.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.reportmanage.dto.ReturnIssueReportPageDto; import com.openhis.web.reportmanage.dto.ReturnIssueReportSearchParam; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - /** * 退库明细查询用 mapper * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/StocktakingReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/StocktakingReportMapper.java index 4924ebac..8450aa2f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/StocktakingReportMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/StocktakingReportMapper.java @@ -3,16 +3,14 @@ */ package com.openhis.web.reportmanage.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.reportmanage.dto.StocktakingReportPageDto; import com.openhis.web.reportmanage.dto.StocktakingReportSearchParam; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; -import java.util.Date; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/TransferReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/TransferReportMapper.java index 8e8235f6..0107e158 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/TransferReportMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/TransferReportMapper.java @@ -3,14 +3,13 @@ */ package com.openhis.web.reportmanage.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.reportmanage.dto.TransferReportPageDto; import com.openhis.web.reportmanage.dto.TransferReportSearchParam; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; import java.util.List; 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 30ada2c8..36977a4f 100644 --- 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 @@ -1,22 +1,18 @@ package com.openhis.web.reportmanage.utils; -import com.core.common.core.domain.R; import com.openhis.common.constant.CommonConstants; import com.openhis.web.reportmanage.dto.InpatientMedicalRecordHomePageCollectionDto; -import org.apache.logging.log4j.util.Supplier; -import org.dom4j.DocumentException; import javax.servlet.http.HttpServletResponse; -import java.awt.*; -import java.io.*; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.text.SimpleDateFormat; +import java.io.BufferedWriter; +import java.io.File; +import java.io.IOException; +import java.io.OutputStreamWriter; import java.lang.reflect.Field; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.*; +import java.nio.charset.StandardCharsets; +import java.text.SimpleDateFormat; +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/reportmanage/utils/ExcelFillerUtil.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/utils/ExcelFillerUtil.java index a19fd7d5..82caca0e 100644 --- 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 @@ -1,7 +1,10 @@ package com.openhis.web.reportmanage.utils; -import java.io.File; -import java.io.FileOutputStream; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; + +import javax.servlet.http.HttpServletResponse; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.lang.reflect.Field; import java.math.BigDecimal; @@ -9,19 +12,11 @@ import java.math.RoundingMode; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.io.ByteArrayOutputStream; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; - -import javax.servlet.http.HttpServletResponse; - /** * excel报表做成 * 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 9119dac7..1094d78d 100644 --- 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 @@ -1,9 +1,6 @@ package com.openhis.web.tencentJH.appservice; -import java.util.List; - import com.baomidou.mybatisplus.core.metadata.IPage; -import com.openhis.web.doctorstation.dto.PatientInfoDto; import com.openhis.web.tencentJH.dto.CurrentDayEncounterTencentDto; import com.openhis.web.tencentJH.dto.PatientInfoTencentDto; 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 66f3ad63..83432127 100644 --- 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 @@ -1,29 +1,24 @@ package com.openhis.web.tencentJH.appservice.impl; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.utils.AgeCalculatorUtil; import com.core.common.utils.SecurityUtils; import com.openhis.common.enums.*; +import com.openhis.common.utils.EnumUtils; import com.openhis.common.utils.HisQueryUtils; -import com.openhis.web.doctorstation.dto.PatientInfoDto; +import com.openhis.web.tencentJH.appservice.ITencentAppService; import com.openhis.web.tencentJH.dto.CurrentDayEncounterTencentDto; import com.openhis.web.tencentJH.dto.PatientInfoTencentDto; +import com.openhis.web.tencentJH.mapper.TencentAppMapper; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import com.openhis.common.utils.EnumUtils; -import com.openhis.web.tencentJH.appservice.ITencentAppService; -import com.openhis.web.tencentJH.mapper.TencentAppMapper; - -import lombok.extern.slf4j.Slf4j; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Arrays; +import java.util.HashSet; /** * 交易QMI支付 应用实现类 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 92fd2595..b355bca8 100644 --- 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 @@ -1,19 +1,16 @@ package com.openhis.web.tencentJH.controller; +import com.core.common.core.domain.R; import com.openhis.common.enums.Whether; -import com.openhis.web.doctorstation.dto.PatientInfoDto; +import com.openhis.web.tencentJH.appservice.ITencentAppService; import com.openhis.web.tencentJH.dto.PatientInfoTencentDto; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.core.common.core.domain.R; -import com.openhis.web.tencentJH.appservice.ITencentAppService; - -import lombok.extern.slf4j.Slf4j; - import javax.servlet.http.HttpServletRequest; /* diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/dto/CurrentDayEncounterTencentDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/dto/CurrentDayEncounterTencentDto.java index aa9780df..c5df33d6 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/dto/CurrentDayEncounterTencentDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/dto/CurrentDayEncounterTencentDto.java @@ -1,14 +1,13 @@ package com.openhis.web.tencentJH.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 当天就诊信息 */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/dto/PatientInfoTencentDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/dto/PatientInfoTencentDto.java index fe9cd854..5b723ec1 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/dto/PatientInfoTencentDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/dto/PatientInfoTencentDto.java @@ -1,14 +1,13 @@ package com.openhis.web.tencentJH.dto; -import java.util.Date; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 就诊患者信息 dto */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/mapper/TencentAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/mapper/TencentAppMapper.java index fcd76040..2528446f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/mapper/TencentAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/mapper/TencentAppMapper.java @@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.openhis.web.chargemanage.dto.CurrentDayEncounterDto; -import com.openhis.web.doctorstation.dto.PatientInfoDto; import com.openhis.web.tencentJH.dto.CurrentDayEncounterTencentDto; import com.openhis.web.tencentJH.dto.PatientInfoTencentDto; import org.apache.ibatis.annotations.Param; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/CallNumberVoiceConfigAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/CallNumberVoiceConfigAppService.java index a4f8e84b..8bedc12d 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/CallNumberVoiceConfigAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/CallNumberVoiceConfigAppService.java @@ -7,4 +7,6 @@ public interface CallNumberVoiceConfigAppService { R addCallNumberVoiceConfig(CallNumberVoiceConfig callNumberVoiceConfig); R updateCallNumberVoiceConfig(CallNumberVoiceConfig callNumberVoiceConfig); + + R getCallNumberVoiceConfig(); } 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 a3cca1e7..c9add533 100644 --- 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 @@ -8,6 +8,7 @@ import com.openhis.web.triageandqueuemanage.appservice.CallNumberVoiceConfigAppS import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; @Service public class CallNumberVoiceConfigAppServiceImpl implements CallNumberVoiceConfigAppService { @@ -15,6 +16,12 @@ public class CallNumberVoiceConfigAppServiceImpl implements CallNumberVoiceConfi @Resource private CallNumberVoiceConfigService callNumberVoiceConfigService; + @Override + public R getCallNumberVoiceConfig() { + List list = callNumberVoiceConfigService.list(); + return R.ok(list); + } + @Override public R addCallNumberVoiceConfig(CallNumberVoiceConfig callNumberVoiceConfig) { if(ObjectUtil.isNull(callNumberVoiceConfig)){ @@ -32,4 +39,5 @@ public class CallNumberVoiceConfigAppServiceImpl implements CallNumberVoiceConfi boolean updateById = callNumberVoiceConfigService.updateById(callNumberVoiceConfig); return R.ok(updateById); } + } 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 5f5efa39..c107a1ba 100644 --- 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 @@ -16,6 +16,16 @@ public class CallNumberVoiceConfigController { @Resource private CallNumberVoiceConfigAppService callNumberVoiceConfigAppService; + /** + * 查询叫号语音设置 + * + * @return 结果 + */ + @GetMapping("/get") + public R getCallNumberVoiceConfig(){ + return R.ok(callNumberVoiceConfigAppService.getCallNumberVoiceConfig()); + } + /** * 新增叫号语音设置实体 * 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 da424e08..5c6e52a6 100644 --- 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 @@ -3,29 +3,6 @@ */ package com.openhis.web.ybmanage.controller; -import java.io.*; -import java.math.BigDecimal; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.time.ZoneId; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.io.Resource; -import org.springframework.core.io.ResourceLoader; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.core.common.annotation.Anonymous; @@ -62,6 +39,27 @@ import com.openhis.yb.service.IPerinfoService; import com.openhis.yb.service.YbDao; import com.openhis.yb.service.YbHttpUtils; import com.openhis.yb.util.CommonConstant; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.io.Resource; +import org.springframework.core.io.ResourceLoader; +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 java.io.*; +import java.math.BigDecimal; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.ZoneId; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; /** * 医保接口 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 384a5c7d..c212ee1e 100644 --- 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 @@ -3,21 +3,19 @@ */ package com.openhis.web.ybmanage.controller; -import java.rmi.ServerException; -import java.util.Date; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.domain.R; import com.openhis.web.ybmanage.dto.VeriPrescriptionParam; import com.openhis.web.ybmanage.service.IYbEleBaseService; import com.openhis.web.ybmanage.service.IYbEleHttpService; import com.openhis.ybelep.domain.*; +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 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 67417e4d..e391a473 100644 --- 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 @@ -1,22 +1,21 @@ package com.openhis.web.ybmanage.controller; -import javax.servlet.http.HttpServletRequest; - +import com.baomidou.mybatisplus.core.metadata.IPage; import com.core.common.annotation.Anonymous; +import com.core.common.core.domain.R; +import com.openhis.web.inhospitalcharge.appservice.IInHospitalRegisterAppService; import com.openhis.web.ybmanage.dto.PerinfoParamDto; +import com.openhis.web.ybmanage.dto.Yb2401InputInpatientParamDto; +import com.openhis.web.ybmanage.dto.Yb2403InputInpatientParamDto; +import com.openhis.web.ybmanage.dto.YbInHospitalRegisterQueryDto; +import com.openhis.web.ybmanage.service.IYbService; import com.openhis.yb.dto.*; import com.openhis.yb.service.YbDao; import com.openhis.yb.service.YbHttpUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.core.common.core.domain.R; -import com.openhis.web.inhospitalcharge.appservice.IInHospitalRegisterAppService; -import com.openhis.web.ybmanage.dto.Yb2401InputInpatientParamDto; -import com.openhis.web.ybmanage.dto.Yb2403InputInpatientParamDto; -import com.openhis.web.ybmanage.dto.YbInHospitalRegisterQueryDto; -import com.openhis.web.ybmanage.service.IYbService; +import javax.servlet.http.HttpServletRequest; /** * 医保接口 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Catalogue1312Output.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Catalogue1312Output.java index ac25d3d0..9913a0f4 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Catalogue1312Output.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Catalogue1312Output.java @@ -1,16 +1,15 @@ package com.openhis.web.ybmanage.dto; -import java.io.Serializable; -import java.util.Date; - import com.core.common.core.domain.HisBaseEntity; - import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; +import java.util.Date; + /** * 【1312】医保目录信息查询 * 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 115460aa..c4c36d35 100644 --- 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 @@ -4,7 +4,6 @@ package com.openhis.web.ybmanage.dto; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2207OrderOutput.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2207OrderOutput.java index c357494e..92a9d0b9 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2207OrderOutput.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2207OrderOutput.java @@ -3,7 +3,6 @@ */ package com.openhis.web.ybmanage.dto; -import com.alibaba.fastjson2.annotation.JSONField; import com.openhis.yb.dto.Clinic2206FundPaymentResult; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2208UnSetlInfoOutput.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2208UnSetlInfoOutput.java index 46338c43..a0b21f07 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2208UnSetlInfoOutput.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2208UnSetlInfoOutput.java @@ -3,8 +3,6 @@ */ package com.openhis.web.ybmanage.dto; -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; import com.openhis.yb.dto.Clinic2206FundPaymentResult; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ClinicReg2201Output.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ClinicReg2201Output.java index 19f03e5e..d3371b98 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ClinicReg2201Output.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ClinicReg2201Output.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; -import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; 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 1082e395..49fca955 100644 --- 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 @@ -5,10 +5,8 @@ package com.openhis.web.ybmanage.dto; import lombok.Data; import lombok.experimental.Accessors; -import org.apache.poi.hssf.record.chart.DatRecord; import javax.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/ybmanage/dto/FinancialHand3201WebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3201WebParam.java index 1a19eff4..4ade156d 100644 --- 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 @@ -1,11 +1,10 @@ package com.openhis.web.ybmanage.dto; -import java.math.BigDecimal; +import lombok.Data; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; - -import lombok.Data; +import java.math.BigDecimal; @Data public class FinancialHand3201WebParam { 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 25f9c0c3..2d9a2d4e 100644 --- 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 @@ -1,13 +1,10 @@ package com.openhis.web.ybmanage.dto; -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.math.BigDecimal; -import java.util.Date; @Data public class FinancialHand3203AWebParam { diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Info1101Output.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Info1101Output.java index f28541c6..8eaf8c96 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Info1101Output.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Info1101Output.java @@ -1,6 +1,5 @@ package com.openhis.web.ybmanage.dto; -import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.core.common.core.domain.HisBaseEntity; import com.openhis.yb.dto.Info5301SpecialConditionResult; 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 c0e5afe5..f22a2cb0 100644 --- 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,12 +1,12 @@ package com.openhis.web.ybmanage.dto; -import java.io.Serializable; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + @Data @ApiModel(value="接口返回对象", description="接口返回对象") diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ResultBody.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ResultBody.java index 5a192f00..7c3ffc54 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ResultBody.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ResultBody.java @@ -1,7 +1,6 @@ package com.openhis.web.ybmanage.dto; import com.alibaba.fastjson2.annotation.JSONField; - import lombok.Data; /** 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 921bbe4b..ef40deed 100644 --- 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 @@ -6,8 +6,6 @@ package com.openhis.web.ybmanage.dto; import lombok.Data; import javax.validation.constraints.NotNull; -import java.math.BigDecimal; -import java.util.Date; /** * 【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 0e3cbe0d..ad6b36e7 100644 --- 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 @@ -6,7 +6,6 @@ package com.openhis.web.ybmanage.dto; import lombok.Data; import javax.validation.constraints.NotNull; -import java.math.BigDecimal; /** * 【3202】前台入参 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionDetailInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionDetailInfoDto.java index 4acabb7e..cd974eb1 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionDetailInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionDetailInfoDto.java @@ -3,14 +3,14 @@ */ package com.openhis.web.ybmanage.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 医保电子处方信息 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionInfoDto.java index ab869fca..d32af0ac 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionInfoDto.java @@ -3,16 +3,14 @@ */ package com.openhis.web.ybmanage.dto; -import java.util.Date; - -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 医保电子处方信息 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionParam.java index b83353f2..b2459458 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionParam.java @@ -5,7 +5,6 @@ package com.openhis.web.ybmanage.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301FeeDetailParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301FeeDetailParam.java index a65ec867..faeb3311 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301FeeDetailParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301FeeDetailParam.java @@ -1,12 +1,9 @@ package com.openhis.web.ybmanage.dto; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import java.math.BigDecimal; -import java.time.LocalDateTime; import java.util.Date; @Data diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2401InputInpatientParamDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2401InputInpatientParamDto.java index 78c2ba9d..82ac1059 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2401InputInpatientParamDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2401InputInpatientParamDto.java @@ -3,7 +3,6 @@ */ package com.openhis.web.ybmanage.dto; -import com.alibaba.fastjson2.annotation.JSONField; import com.openhis.administration.domain.Patient; import com.openhis.yb.dto.PatientInfoDto; import com.openhis.yb.dto.Yb2401InputInpatientDiseInfo; @@ -11,9 +10,6 @@ import com.openhis.yb.dto.Yb2401InputInpatientMdtrtInfo; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.util.Date; import java.util.List; /** 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 3d133f96..358f8309 100644 --- 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 @@ -3,8 +3,6 @@ */ package com.openhis.web.ybmanage.dto; -import com.alibaba.fastjson2.annotation.JSONField; -import com.openhis.yb.dto.Yb2401InputInpatientDiseInfo; import com.openhis.yb.dto.Yb2403InputAdmInfo; import com.openhis.yb.dto.Yb2403InputDiseInfo; import com.openhis.yb.dto.Yb2403InputMdtrtGrpContent; @@ -12,8 +10,6 @@ import lombok.Data; import lombok.experimental.Accessors; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.util.Date; import java.util.List; /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb5205SpecialDiseaseWebParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb5205SpecialDiseaseWebParam.java index 65088db7..a9e783ca 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb5205SpecialDiseaseWebParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb5205SpecialDiseaseWebParam.java @@ -3,13 +3,11 @@ */ package com.openhis.web.ybmanage.dto; -import java.util.Date; - +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import com.fasterxml.jackson.annotation.JsonFormat; - -import lombok.Data; +import java.util.Date; /** * 医保5205接口请求参数 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbMapper.java index 319d55a9..24a792ab 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbMapper.java @@ -1,7 +1,5 @@ package com.openhis.web.ybmanage.mapper; -import java.util.List; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; @@ -9,10 +7,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.web.inhospitalcharge.dto.InHospitalRegisterQueryDto; import com.openhis.web.ybmanage.dto.EncounterDiagnosisDto; import com.openhis.web.ybmanage.dto.YbInHospitalRegisterQueryDto; +import com.openhis.yb.dto.*; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.openhis.yb.dto.*; +import java.util.List; /** * 医保Mapper 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 8801def4..496021d5 100644 --- 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 @@ -3,16 +3,15 @@ */ package com.openhis.web.ybmanage.service; -import java.rmi.ServerException; -import java.util.Date; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - 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 java.rmi.ServerException; +import java.util.Date; +import java.util.Map; + /** * * @author yuxj 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 56a11d39..9fcae1bd 100644 --- 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 @@ -1,7 +1,5 @@ package com.openhis.web.ybmanage.service; -import javax.servlet.http.HttpServletRequest; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.core.common.core.domain.R; import com.openhis.web.ybmanage.dto.Yb2401InputInpatientParamDto; @@ -11,6 +9,8 @@ import com.openhis.yb.dto.Info1101Output; import com.openhis.yb.dto.PrePaymentDto; import com.openhis.yb.dto.Yb2402InputParam; +import javax.servlet.http.HttpServletRequest; + /** * 医保Service * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbEleHttpServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbEleHttpServiceImpl.java index 7e9cabb8..5b68a6b3 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbEleHttpServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbEleHttpServiceImpl.java @@ -3,19 +3,6 @@ */ package com.openhis.web.ybmanage.service.impl; -import java.io.IOException; - -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.ContentType; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.util.EntityUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.alibaba.fastjson2.JSON; import com.core.common.core.domain.R; import com.core.common.exception.ServiceException; @@ -28,6 +15,18 @@ import com.openhis.yb.dto.BaseInfo; import com.openhis.yb.dto.BaseParam; import com.openhis.yb.util.YbParamBuilderUtil; import com.openhis.ybelep.domain.*; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.ContentType; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.util.EntityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.io.IOException; /** * http请求接口 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 f20409c9..cd630813 100644 --- 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 @@ -3,18 +3,6 @@ */ package com.openhis.web.ybmanage.service.impl; -import java.rmi.ServerException; -import java.util.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import com.openhis.common.enums.ybenums.YbMedType; -import com.openhis.ybcatalog.service.ICatalogSpecialInsuranceDiseaseService; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -38,6 +26,7 @@ import com.openhis.common.constant.YbCommonConstants; import com.openhis.common.enums.PrescriptionType; import com.openhis.common.enums.RequestStatus; import com.openhis.common.enums.Whether; +import com.openhis.common.enums.ybenums.YbMedType; import com.openhis.common.utils.EnumUtils; import com.openhis.common.utils.HisQueryUtils; import com.openhis.financial.service.IContractService; @@ -57,8 +46,17 @@ import com.openhis.yb.service.IRegService; import com.openhis.yb.service.YbHttpUtils; import com.openhis.ybcatalog.domain.CatalogSpecialInsuranceDisease; import com.openhis.ybcatalog.service.ICatalogSpecialDiseaseService; +import com.openhis.ybcatalog.service.ICatalogSpecialInsuranceDiseaseService; import com.openhis.ybelep.domain.*; import com.openhis.ybelep.service.*; +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 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 09f752a7..24d085ad 100644 --- 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 @@ -1,34 +1,13 @@ package com.openhis.web.ybmanage.service.impl; -import java.io.IOException; -import java.math.BigDecimal; -import java.time.*; -import java.util.*; -import java.util.stream.Collectors; - -import javax.servlet.http.HttpServletRequest; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.core.common.enums.DelFlag; -import com.openhis.administration.dto.ChargeItemBaseInfoDto; -import com.openhis.common.constant.YbCommonConstants; -import com.openhis.financial.domain.PaymentReconciliation; -import com.openhis.web.paymentmanage.dto.InpatientPreSettleDto; -import com.openhis.web.ybmanage.dto.*; -import com.openhis.web.ybmanage.util.CsvHelperZipProcessor; -import com.openhis.workflow.domain.ServiceRequest; -import com.openhis.yb.domain.*; -import com.openhis.yb.dto.Info1101Output; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; +import com.core.common.enums.DelFlag; import com.core.common.enums.TenantOptionDict; import com.core.common.exception.ServiceException; import com.core.common.utils.AgeCalculatorUtil; @@ -38,29 +17,40 @@ import com.core.common.utils.StringUtils; import com.core.system.service.impl.SysUserServiceImpl; import com.core.web.util.TenantOptionUtil; import com.openhis.administration.domain.*; +import com.openhis.administration.dto.ChargeItemBaseInfoDto; import com.openhis.administration.service.*; import com.openhis.clinical.domain.Condition; import com.openhis.clinical.domain.ConditionDefinition; import com.openhis.clinical.service.IConditionDefinitionService; import com.openhis.clinical.service.IConditionService; import com.openhis.common.constant.CommonConstants; +import com.openhis.common.constant.YbCommonConstants; import com.openhis.common.enums.*; import com.openhis.common.enums.ybenums.*; import com.openhis.common.utils.EnumUtils; import com.openhis.common.utils.HisQueryUtils; import com.openhis.financial.domain.Contract; +import com.openhis.financial.domain.PaymentReconciliation; import com.openhis.financial.service.IContractService; import com.openhis.financial.service.IPaymentRecDetailService; import com.openhis.financial.service.IPaymentReconciliationService; import com.openhis.medication.service.IMedicationDispenseService; import com.openhis.web.document.appservice.IDocRecordAppService; import com.openhis.web.inhospitalcharge.dto.InHospitalRegisterQueryDto; +import com.openhis.web.paymentmanage.dto.InpatientPreSettleDto; +import com.openhis.web.ybmanage.dto.EncounterDiagnosisDto; +import com.openhis.web.ybmanage.dto.Yb2401InputInpatientParamDto; +import com.openhis.web.ybmanage.dto.Yb2403InputInpatientParamDto; +import com.openhis.web.ybmanage.dto.YbInHospitalRegisterQueryDto; import com.openhis.web.ybmanage.mapper.YbMapper; import com.openhis.web.ybmanage.service.IYbService; +import com.openhis.web.ybmanage.util.CsvHelperZipProcessor; import com.openhis.workflow.domain.ActivityDefinition; +import com.openhis.workflow.domain.ServiceRequest; import com.openhis.workflow.service.IActivityDefinitionService; import com.openhis.workflow.service.IDeviceDispenseService; import com.openhis.workflow.service.IServiceRequestService; +import com.openhis.yb.domain.*; import com.openhis.yb.dto.*; import com.openhis.yb.mapper.MedicalInsuranceMapper; import com.openhis.yb.service.*; @@ -68,6 +58,16 @@ import com.openhis.yb.service.impl.DirectoryCheckRecordServiceImpl; import com.openhis.yb.util.YbParamBuilderUtil; import com.openhis.ybcatalog.domain.*; import com.openhis.ybcatalog.service.*; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; +import java.math.BigDecimal; +import java.time.*; +import java.util.*; +import java.util.stream.Collectors; /** * 医保ServiceImpl diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/util/YbEleParamBuilderUtil.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/util/YbEleParamBuilderUtil.java index 4409de0a..6652dd26 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/util/YbEleParamBuilderUtil.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/util/YbEleParamBuilderUtil.java @@ -3,24 +3,9 @@ */ package com.openhis.web.ybmanage.util; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.math.BigDecimal; -import java.rmi.ServerException; -import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.time.Period; -import java.time.ZoneId; -import java.time.format.DateTimeFormatter; -import java.util.*; - -import com.core.common.exception.ServiceException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.core.common.exception.ServiceException; import com.core.common.utils.DateUtils; import com.core.common.utils.SecurityUtils; import com.openhis.administration.domain.*; @@ -46,6 +31,19 @@ import com.openhis.ybcatalog.service.ICatalogDrugInfoService; import com.openhis.ybelep.domain.*; import com.openhis.ybelep.service.IElepVeriPrescriptionInfoService; import com.openhis.ybelep.service.IElepVeriVisitInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.Period; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +import java.util.*; /** * 医保接口调用工具 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Financial3203VO.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Financial3203VO.java index e4fa81d3..d725f1ed 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Financial3203VO.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Financial3203VO.java @@ -2,7 +2,7 @@ * Copyright ©2023 CJB-CNIT Team. All rights reserved */ package com.openhis.web.ybmanage.vo; -import com.alibaba.fastjson2.annotation.JSONField; + import lombok.Data; import java.math.BigDecimal; diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201DetailVO.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201DetailVO.java index 9eacbafa..41d8bb69 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201DetailVO.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201DetailVO.java @@ -1,6 +1,5 @@ package com.openhis.web.ybmanage.vo; -import javax.validation.constraints.NotNull; import java.math.BigDecimal; public class Settlement3201DetailVO { diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201VO.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201VO.java index 7f867de1..e540075b 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201VO.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201VO.java @@ -3,12 +3,10 @@ */ package com.openhis.web.ybmanage.vo; -import java.math.BigDecimal; - -import javax.validation.constraints.NotNull; - import lombok.Data; +import java.math.BigDecimal; + /** * 【3201】后台计算结果 DB映射实体 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3202VO.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3202VO.java index ddf35c03..de67511f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3202VO.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3202VO.java @@ -3,10 +3,10 @@ */ package com.openhis.web.ybmanage.vo; -import java.math.BigDecimal; - import lombok.Data; +import java.math.BigDecimal; + /** * Settlement3202 Result DB mapping entity * diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/clinical/SurgeryMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/clinical/SurgeryMapper.xml new file mode 100644 index 00000000..ee1001ab --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/clinical/SurgeryMapper.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT + id, surgery_no, patient_id, patient_name, encounter_id, surgery_name, surgery_code, + surgery_type_enum, surgery_level, status_enum, planned_time, actual_start_time, actual_end_time, + main_surgeon_id, main_surgeon_name, assistant_1_id, assistant_1_name, assistant_2_id, assistant_2_name, + anesthetist_id, anesthetist_name, scrub_nurse_id, scrub_nurse_name, anesthesia_type_enum, + body_site, incision_level, healing_level, operating_room_id, operating_room_name, + org_id, org_name, preoperative_diagnosis, postoperative_diagnosis, surgery_description, + postoperative_advice, complications, surgery_fee, anesthesia_fee, total_fee, remark, + create_by, create_time, update_by, update_time, delete_flag + FROM cli_surgery + + + + + + + + + diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgeryMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgeryMapper.xml new file mode 100644 index 00000000..8ebf2ca6 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgeryMapper.xml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT + s.id, + s.surgery_no, + s.patient_id, + p.name as patient_name, + CASE p.gender_enum WHEN 1 THEN '男' WHEN 2 THEN '女' ELSE '未知' END as patient_gender, + EXTRACT(YEAR FROM AGE(p.birth_date)) as patient_age, + s.encounter_id, + e.bus_no as encounter_no, + s.surgery_name, + s.surgery_code, + s.surgery_type_enum, + s.surgery_type_enum as surgery_type_enum_dictText, + s.surgery_level, + s.surgery_level as surgery_level_dictText, + s.status_enum, + s.status_enum as status_enum_dictText, + s.planned_time, + s.actual_start_time, + s.actual_end_time, + s.main_surgeon_id, + s.main_surgeon_name, + s.assistant_1_id, + s.assistant_1_name, + s.assistant_2_id, + s.assistant_2_name, + s.anesthetist_id, + s.anesthetist_name, + s.scrub_nurse_id, + s.scrub_nurse_name, + s.anesthesia_type_enum, + s.anesthesia_type_enum as anesthesia_type_enum_dictText, + s.body_site, + s.incision_level, + s.incision_level as incision_level_dictText, + s.healing_level, + s.healing_level as healing_level_dictText, + s.operating_room_id, + s.operating_room_name, + s.org_id, + o.name as org_name, + s.preoperative_diagnosis, + s.postoperative_diagnosis, + s.surgery_description, + s.postoperative_advice, + s.complications, + s.surgery_fee, + s.anesthesia_fee, + s.total_fee, + s.remark, + s.create_time, + s.update_time + FROM cli_surgery s + LEFT JOIN adm_patient p ON s.patient_id = p.id + LEFT JOIN adm_encounter e ON s.encounter_id = e.id + LEFT JOIN adm_organization o ON s.org_id = o.id + + + + + + + diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml index 4c4a31e8..54cb6e85 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml @@ -29,9 +29,9 @@ T3.price_code, T3.retail_price, T3.maximum_retail_price, - T3.chrgitm_lv,--医保等级 - T3.children_json,--子项json - T3.pricing_flag--划价标记 + T3.chrgitm_lv, + T3.children_json, + T3.pricing_flag FROM ( SELECT @@ -54,18 +54,18 @@ T1.description_text, T1.rule_id, T1.tenant_id, - T1.chrgitm_lv,--医保等级 + T1.chrgitm_lv, T2.type_code as item_type_code, T2.yb_type, T2.price_code, - T2.price as retail_price,--零售价 - T4.amount as maximum_retail_price,--最高零售价 - T1.children_json,--子项json - T1.pricing_flag--划价标记 + T2.price as retail_price, + T4.amount as maximum_retail_price, + T1.children_json, + T1.pricing_flag FROM wor_activity_definition T1 LEFT JOIN adm_charge_item_definition T2 ON T1.id = T2.instance_id LEFT JOIN adm_charge_item_definition T5 ON T5.instance_id = T1.id AND T5.instance_table = 'wor_activity_definition' - LEFT JOIN adm_charge_item_def_detail T4 ON T4.definition_id = T5.id AND T4.condition_code = '4'--4:限制 + LEFT JOIN adm_charge_item_def_detail T4 ON T4.definition_id = T5.id AND T4.condition_code = '4' T1.delete_flag = '0' AND T2.instance_table = 'wor_activity_definition' @@ -81,6 +81,7 @@ ORDER BY T1.bus_no DESC + ) T3 @@ -108,22 +109,23 @@ T2.type_code as item_type_code, T2.yb_type, T2.price_code, - T2.price as retail_price,--零售价, - ( SELECT T4.amount - FROM adm_charge_item_definition T5 - LEFT JOIN adm_charge_item_def_detail T4 ON T4.definition_id = T5.id - WHERE T4.condition_code = '4'--4:限制 - AND T5.instance_id = T1.id - AND T5.instance_table = 'wor_activity_definition' - ) as maximum_retail_price,--最高零售价 - T1.chrgitm_lv,--医保等级 - T1.children_json,--子项json - T1.pricing_flag--划价标记 + T2.price as retail_price, + ( + SELECT T4.amount + FROM adm_charge_item_definition T5 + LEFT JOIN adm_charge_item_def_detail T4 ON T4.definition_id = T5.id + WHERE T4.condition_code = '4' + AND T5.instance_id = T1.id + AND T5.instance_table = 'wor_activity_definition' + ) as maximum_retail_price, + T1.chrgitm_lv, + T1.children_json, + T1.pricing_flag FROM wor_activity_definition T1 LEFT JOIN adm_charge_item_definition T2 ON T1.id = T2.instance_id T1.delete_flag = '0' - AND T2.instance_table = 'wor_activity_definition' + AND T2.instance_table = 'wor_activity_definition' AND T1.id = #{id} @@ -134,4 +136,4 @@ - \ No newline at end of file + diff --git a/openhis-server-new/openhis-application/src/test/java/com/openhis/MedicationApplicationTests.java b/openhis-server-new/openhis-application/src/test/java/com/openhis/MedicationApplicationTests.java index 0ef1809a..af7e6537 100644 --- a/openhis-server-new/openhis-application/src/test/java/com/openhis/MedicationApplicationTests.java +++ b/openhis-server-new/openhis-application/src/test/java/com/openhis/MedicationApplicationTests.java @@ -3,13 +3,12 @@ */ package com.openhis; -import java.io.IOException; - +import lombok.extern.slf4j.Slf4j; import org.junit.Test; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import lombok.extern.slf4j.Slf4j; +import java.io.IOException; /** * 测试类 diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java index 23c80725..82d75965 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java @@ -1,8 +1,8 @@ package com.openhis.common.aspectj; -import java.lang.reflect.Field; -import java.util.List; - +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.core.common.core.domain.R; +import com.openhis.common.annotation.Dict; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -12,9 +12,8 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.core.common.core.domain.R; -import com.openhis.common.annotation.Dict; +import java.lang.reflect.Field; +import java.util.List; @Aspect @Component 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 1f3d13c4..b74c6d89 100644 --- 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 @@ -1,14 +1,11 @@ package com.openhis.common.aspectj; -import java.lang.reflect.Method; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.alibaba.fastjson2.JSON; +import com.core.common.core.domain.R; +import com.core.common.utils.SecurityUtils; +import com.core.system.domain.SysOperLog; +import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.Aspect; @@ -22,12 +19,12 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.multipart.MultipartFile; -import com.alibaba.fastjson2.JSON; -import com.core.common.core.domain.R; -import com.core.common.utils.SecurityUtils; -import com.core.system.domain.SysOperLog; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.lang.reflect.Method; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; @Aspect @Component diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountBillingStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountBillingStatus.java index 98d077e3..59490f35 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountBillingStatus.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountBillingStatus.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountStatus.java index e77dfdc8..01d2cdcf 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountStatus.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountStatus.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountType.java index 4303a1b9..a238dde8 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountType.java @@ -4,7 +4,6 @@ package com.openhis.common.enums; import com.core.common.utils.StringUtils; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActPriority.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActPriority.java index 9ac2a2cd..d9e04e63 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActPriority.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActPriority.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActivityDefCategory.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActivityDefCategory.java index 5c79f9b4..073b06a0 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActivityDefCategory.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActivityDefCategory.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActivityType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActivityType.java index 19d2b6ee..07ad5cd3 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActivityType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActivityType.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdministrativeGender.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdministrativeGender.java index 9785f720..4a8c7d2c 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdministrativeGender.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdministrativeGender.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdmissionMethod.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdmissionMethod.java index 1ba8c086..6c180194 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdmissionMethod.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdmissionMethod.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdmissionType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdmissionType.java index eabb4f8e..0178375a 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdmissionType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdmissionType.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdviceOpType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdviceOpType.java index 7ef67f66..68b87fca 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdviceOpType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdviceOpType.java @@ -4,7 +4,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AnesthesiaTypeEnum.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AnesthesiaTypeEnum.java new file mode 100644 index 00000000..0158a854 --- /dev/null +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AnesthesiaTypeEnum.java @@ -0,0 +1,36 @@ +package com.openhis.common.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 麻醉方式枚举 + */ +@Getter +@AllArgsConstructor +public enum AnesthesiaTypeEnum { + + /** 局部麻醉 */ + LOCAL(1, "局部麻醉"), + + /** 区域麻醉 */ + REGIONAL(2, "区域麻醉"), + + /** 全身麻醉 */ + GENERAL(3, "全身麻醉"), + + /** 脊椎麻醉 */ + SPINAL(4, "脊椎麻醉"), + + /** 硬膜外麻醉 */ + EPIDURAL(5, "硬膜外麻醉"), + + /** 表面麻醉 */ + SURFACE(6, "表面麻醉"), + + /** 无麻醉 */ + NONE(0, "无麻醉"); + + private final Integer code; + private final String info; +} diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ApplicableScope.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ApplicableScope.java index f408d040..fde2aef0 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ApplicableScope.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ApplicableScope.java @@ -2,7 +2,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; import com.fasterxml.jackson.annotation.JsonValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BindingType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BindingType.java index 1dc47b99..36f2017a 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BindingType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BindingType.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeABO.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeABO.java index e9ec62a3..6701441d 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeABO.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeABO.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeRH.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeRH.java index 0bef41e3..84bfc401 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeRH.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeRH.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/CatalogType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/CatalogType.java index 920404ee..05012852 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/CatalogType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/CatalogType.java @@ -3,7 +3,6 @@ */ package com.openhis.common.enums; -import io.swagger.models.auth.In; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/CategoryType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/CategoryType.java index 826c8957..05cc6b95 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/CategoryType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/CategoryType.java @@ -4,7 +4,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClaimType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClaimType.java index 17bd88af..bdd23247 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClaimType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClaimType.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClaimUse.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClaimUse.java index b4e89600..ee740bfc 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClaimUse.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClaimUse.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClinicalStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClinicalStatus.java index ef47f871..febbc175 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClinicalStatus.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClinicalStatus.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionCategory.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionCategory.java index 142b4ac2..c737518d 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionCategory.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionCategory.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionClinicalStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionClinicalStatus.java index 4e21ba95..7381dfc5 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionClinicalStatus.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionClinicalStatus.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionCode.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionCode.java index efd73d40..10a9c14d 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionCode.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionCode.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionDefinitionSource.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionDefinitionSource.java index fcee235c..a75ee5c6 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionDefinitionSource.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionDefinitionSource.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionSeverity.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionSeverity.java index e368bd3a..bcff67d8 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionSeverity.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionSeverity.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionVerificationStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionVerificationStatus.java index 4a94b097..a5f90de1 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionVerificationStatus.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionVerificationStatus.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ContractCategory.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ContractCategory.java index 09d39567..c0cf942c 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ContractCategory.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ContractCategory.java @@ -4,7 +4,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ContrastTypeEnum.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ContrastTypeEnum.java index b6a73555..476c18a9 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ContrastTypeEnum.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ContrastTypeEnum.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Criticality.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Criticality.java index ff84feb2..7d09ae4c 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Criticality.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Criticality.java @@ -2,7 +2,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; import com.fasterxml.jackson.annotation.JsonValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DbOpType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DbOpType.java index a8643000..82a6ab25 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DbOpType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DbOpType.java @@ -4,7 +4,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DeviceSafety.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DeviceSafety.java index 6cb6792c..51ef5bcc 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DeviceSafety.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DeviceSafety.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DeviceStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DeviceStatus.java index 720f2c83..f4de2087 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DeviceStatus.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DeviceStatus.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocDefinitionEnum.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocDefinitionEnum.java index 0ff4131d..c5bcea9e 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocDefinitionEnum.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocDefinitionEnum.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocTypeEnum.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocTypeEnum.java index 03cd95bd..44d5fef8 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocTypeEnum.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocTypeEnum.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EducationLevel.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EducationLevel.java index 1f3f10ac..48487542 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EducationLevel.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EducationLevel.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterActivityStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterActivityStatus.java index b050907d..5e051529 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterActivityStatus.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterActivityStatus.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterClass.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterClass.java index a6fae296..1fc1991e 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterClass.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterClass.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterStatus.java index 80cd29c9..1fceaebb 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterStatus.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterStatus.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterSubjectStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterSubjectStatus.java index 2a8a40ed..777e0c57 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterSubjectStatus.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterSubjectStatus.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterType.java index d39eb84d..3b6298b5 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterType.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterYbClass.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterYbClass.java index 6438ab48..6c8424bc 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterYbClass.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterYbClass.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterZyStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterZyStatus.java index bfd34b53..5546ed2b 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterZyStatus.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterZyStatus.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FamilyRelationshipType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FamilyRelationshipType.java index 18099ba4..c7cd03de 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FamilyRelationshipType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FamilyRelationshipType.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FinCategory.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FinCategory.java index fd7c1644..439ed332 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FinCategory.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FinCategory.java @@ -1,6 +1,5 @@ package com.openhis.common.enums; -import com.baomidou.mybatisplus.annotation.EnumValue; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FinancialResourceStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FinancialResourceStatus.java index 57f577b2..2ce36527 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FinancialResourceStatus.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FinancialResourceStatus.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfApplicationStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfApplicationStatus.java index 89db9c9f..09644e57 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfApplicationStatus.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfApplicationStatus.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfApprovalRole.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfApprovalRole.java index fbbcd0d8..d4cca7a6 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfApprovalRole.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfApprovalRole.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfItemType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfItemType.java index a3f5428b..ac4958e6 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfItemType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfItemType.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfRatioType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfRatioType.java index f82f6b61..8e8721c6 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfRatioType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfRatioType.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/HealingLevelEnum.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/HealingLevelEnum.java new file mode 100644 index 00000000..29fa1982 --- /dev/null +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/HealingLevelEnum.java @@ -0,0 +1,24 @@ +package com.openhis.common.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 手术切口愈合等级枚举 + */ +@Getter +@AllArgsConstructor +public enum HealingLevelEnum { + + /** 甲级愈合 */ + GRADE_A(1, "甲级愈合"), + + /** 乙级愈合 */ + GRADE_B(2, "乙级愈合"), + + /** 丙级愈合 */ + GRADE_C(3, "丙级愈合"); + + private final Integer code; + private final String info; +} diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/IdentityDocumentType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/IdentityDocumentType.java index 725a6364..12e53bc4 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/IdentityDocumentType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/IdentityDocumentType.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/IncisionLevelEnum.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/IncisionLevelEnum.java new file mode 100644 index 00000000..c7d81428 --- /dev/null +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/IncisionLevelEnum.java @@ -0,0 +1,27 @@ +package com.openhis.common.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 手术切口等级枚举 + */ +@Getter +@AllArgsConstructor +public enum IncisionLevelEnum { + + /** I级切口 */ + LEVEL_I(1, "I级切口"), + + /** II级切口 */ + LEVEL_II(2, "II级切口"), + + /** III级切口 */ + LEVEL_III(3, "III级切口"), + + /** IV级切口 */ + LEVEL_IV(4, "IV级切口"); + + private final Integer code; + private final String info; +} diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InsuranceLevel.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InsuranceLevel.java index fee0f89b..c2037991 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InsuranceLevel.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InsuranceLevel.java @@ -2,7 +2,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; import com.fasterxml.jackson.annotation.JsonValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InventoryType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InventoryType.java index fc664ad8..c5cb87df 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InventoryType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InventoryType.java @@ -4,7 +4,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InvoiceStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InvoiceStatus.java index 7400cbcd..212173ef 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InvoiceStatus.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InvoiceStatus.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InvoiceType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InvoiceType.java index 36d5418d..d3b0d178 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InvoiceType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InvoiceType.java @@ -4,7 +4,6 @@ package com.openhis.common.enums; import com.github.pagehelper.util.StringUtil; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ItemType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ItemType.java index 086c8165..5e9e7474 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ItemType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ItemType.java @@ -4,7 +4,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationBedStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationBedStatus.java index 377da557..09ac53da 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationBedStatus.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationBedStatus.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationForm.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationForm.java index e3731fdf..2a222f7c 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationForm.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationForm.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationMode.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationMode.java index c94dae99..5fb16b63 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationMode.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationMode.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationOperational.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationOperational.java index e5893343..e6299784 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationOperational.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationOperational.java @@ -4,7 +4,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationStatus.java index 402e7794..a837d92d 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationStatus.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationStatus.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/MaritalStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/MaritalStatus.java index ba1f5df3..379a3f7f 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/MaritalStatus.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/MaritalStatus.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/MedCategoryCode.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/MedCategoryCode.java index d8a9a54b..3a376d4f 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/MedCategoryCode.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/MedCategoryCode.java @@ -8,7 +8,6 @@ package com.openhis.common.enums; */ import com.github.pagehelper.util.StringUtil; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NotPerformedReason.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NotPerformedReason.java index 6c4b41cb..4af98b20 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NotPerformedReason.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NotPerformedReason.java @@ -4,7 +4,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NursingOrdersClass.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NursingOrdersClass.java index d109eea2..67ae0dda 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NursingOrdersClass.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NursingOrdersClass.java @@ -4,7 +4,6 @@ package com.openhis.common.enums; import com.core.common.utils.StringUtils; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OccupationType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OccupationType.java index 9b2bbe17..93c2c69e 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OccupationType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OccupationType.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrderGroupType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrderGroupType.java index b273fa79..0256a3a2 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrderGroupType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrderGroupType.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrderPricingSource.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrderPricingSource.java index b991cdd5..6cffbc67 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrderPricingSource.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrderPricingSource.java @@ -4,7 +4,6 @@ package com.openhis.common.enums; import com.core.common.utils.StringUtils; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrganizationClass.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrganizationClass.java index 70bc91dd..34d6cf73 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrganizationClass.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrganizationClass.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrganizationType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrganizationType.java index b354da53..56f15fc9 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrganizationType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrganizationType.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OutpatientClass.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OutpatientClass.java index 0bd513e0..01e40606 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OutpatientClass.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OutpatientClass.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ParticipantType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ParticipantType.java index 20256823..3fc7ae8d 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ParticipantType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ParticipantType.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentKind.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentKind.java index 46a03617..0bebf2c4 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentKind.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentKind.java @@ -4,7 +4,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentType.java index 15fa49b6..6b344fe3 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PaymentType.java @@ -3,13 +3,12 @@ */ package com.openhis.common.enums; -import java.math.BigDecimal; - import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; +import java.math.BigDecimal; + /** * PaymentType (0: MEMBER_FIRST; 1: MEMBER_SECOND;) * diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PermissionLimit.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PermissionLimit.java index 21d097db..8dd7e633 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PermissionLimit.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PermissionLimit.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PhysicalExamResult.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PhysicalExamResult.java index 6a209877..c1f1ec49 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PhysicalExamResult.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PhysicalExamResult.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PractitionerRoles.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PractitionerRoles.java index 404dc79c..5d83d670 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PractitionerRoles.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PractitionerRoles.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PrescriptionType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PrescriptionType.java index 51d03ad9..014fce06 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PrescriptionType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PrescriptionType.java @@ -1,8 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.github.pagehelper.util.StringUtil; -import com.openhis.common.enums.ybenums.YbRxItemTypeCode; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PriorityLevel.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PriorityLevel.java index 2e82fe19..2c8c8acf 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PriorityLevel.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PriorityLevel.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ProcedureCategory.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ProcedureCategory.java index 6251c917..ee6e5fc9 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ProcedureCategory.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ProcedureCategory.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PublicationStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PublicationStatus.java index 06b7ab49..3476a5b6 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PublicationStatus.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PublicationStatus.java @@ -2,7 +2,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; import com.fasterxml.jackson.annotation.JsonValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ReportCodeEnum.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ReportCodeEnum.java index de982dca..5338d38f 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ReportCodeEnum.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ReportCodeEnum.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/RequestStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/RequestStatus.java index a20efada..20689eaa 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/RequestStatus.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/RequestStatus.java @@ -4,7 +4,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SplitPropertyCode.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SplitPropertyCode.java index e6a80b71..7bde3fea 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SplitPropertyCode.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SplitPropertyCode.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/StudentStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/StudentStatus.java index 7236a9c4..eaabe6fc 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/StudentStatus.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/StudentStatus.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/StudyMode.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/StudyMode.java index 11ca5265..b7052553 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/StudyMode.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/StudyMode.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplierType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplierType.java index eb3c8c69..6b74fdb2 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplierType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplierType.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyRequestType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyRequestType.java index d3d5c1f1..44ff571d 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyRequestType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyRequestType.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgeryLevelEnum.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgeryLevelEnum.java new file mode 100644 index 00000000..ea7a4ebf --- /dev/null +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgeryLevelEnum.java @@ -0,0 +1,30 @@ +package com.openhis.common.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 手术等级枚举 + */ +@Getter +@AllArgsConstructor +public enum SurgeryLevelEnum { + + /** 一级手术 */ + LEVEL_1(1, "一级手术"), + + /** 二级手术 */ + LEVEL_2(2, "二级手术"), + + /** 三级手术 */ + LEVEL_3(3, "三级手术"), + + /** 四级手术 */ + LEVEL_4(4, "四级手术"), + + /** 特级手术 */ + SPECIAL(5, "特级手术"); + + private final Integer code; + private final String info; +} diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgeryStatusEnum.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgeryStatusEnum.java new file mode 100644 index 00000000..77a0144b --- /dev/null +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgeryStatusEnum.java @@ -0,0 +1,33 @@ +package com.openhis.common.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 手术状态枚举 + */ +@Getter +@AllArgsConstructor +public enum SurgeryStatusEnum { + + /** 待排期 */ + PENDING_SCHEDULE(0, "待排期"), + + /** 已排期 */ + SCHEDULED(1, "已排期"), + + /** 手术中 */ + IN_PROGRESS(2, "手术中"), + + /** 已完成 */ + COMPLETED(3, "已完成"), + + /** 已取消 */ + CANCELLED(4, "已取消"), + + /** 暂停 */ + SUSPENDED(5, "暂停"); + + private final Integer code; + private final String info; +} diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgeryTypeEnum.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgeryTypeEnum.java new file mode 100644 index 00000000..a6190763 --- /dev/null +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgeryTypeEnum.java @@ -0,0 +1,27 @@ +package com.openhis.common.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 手术类型枚举 + */ +@Getter +@AllArgsConstructor +public enum SurgeryTypeEnum { + + /** 门诊手术 */ + OUTPATIENT(1, "门诊手术"), + + /** 住院手术 */ + INPATIENT(2, "住院手术"), + + /** 急诊手术 */ + EMERGENCY(3, "急诊手术"), + + /** 择期手术 */ + ELECTIVE(4, "择期手术"); + + private final Integer code; + private final String info; +} diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TempOrderSplitPropertyCode.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TempOrderSplitPropertyCode.java index fed2d8b0..829b2bee 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TempOrderSplitPropertyCode.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TempOrderSplitPropertyCode.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TherapyTimeType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TherapyTimeType.java index 1c23038e..69059dd7 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TherapyTimeType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TherapyTimeType.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Whether.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Whether.java index 23dee398..5db36837 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Whether.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Whether.java @@ -1,7 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbChrgitmLv.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbChrgitmLv.java index f80c97bd..b62454fa 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbChrgitmLv.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbChrgitmLv.java @@ -6,7 +6,6 @@ package com.openhis.common.enums.ybenums; import com.baomidou.mybatisplus.annotation.EnumValue; import com.core.common.utils.StringUtils; import com.openhis.common.enums.HisEnumInterface; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrStas.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrStas.java index 5de2e40b..14e4ba0f 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrStas.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrStas.java @@ -4,7 +4,6 @@ package com.openhis.common.enums.ybenums; import com.github.pagehelper.util.StringUtil; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrType.java index 84af83e4..960d3771 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrType.java @@ -4,7 +4,6 @@ package com.openhis.common.enums.ybenums; import com.github.pagehelper.util.StringUtil; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrWay.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrWay.java index 75c27825..ae7285f8 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrWay.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbClrWay.java @@ -4,7 +4,6 @@ package com.openhis.common.enums.ybenums; import com.github.pagehelper.util.StringUtil; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDoctorTitle.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDoctorTitle.java index b1aae1d0..ac82c878 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDoctorTitle.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDoctorTitle.java @@ -1,7 +1,6 @@ package com.openhis.common.enums.ybenums; import com.github.pagehelper.util.StringUtil; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrordBhvr.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrordBhvr.java index 36d932d5..045e0b81 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrordBhvr.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrordBhvr.java @@ -4,7 +4,6 @@ package com.openhis.common.enums.ybenums; import com.github.pagehelper.util.StringUtil; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrugMedWay.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrugMedWay.java index 48ec7714..4ec48ef5 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrugMedWay.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDrugMedWay.java @@ -1,7 +1,6 @@ package com.openhis.common.enums.ybenums; import com.github.pagehelper.util.StringUtil; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDspoWay.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDspoWay.java index 7ec60362..21c23d59 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDspoWay.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDspoWay.java @@ -1,7 +1,6 @@ package com.openhis.common.enums.ybenums; import com.github.pagehelper.util.StringUtil; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbEncounterClass.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbEncounterClass.java index 21d92827..7447ce1b 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbEncounterClass.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbEncounterClass.java @@ -1,7 +1,6 @@ package com.openhis.common.enums.ybenums; import com.github.pagehelper.util.StringUtil; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbHospApprFlag.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbHospApprFlag.java index e9130637..8a830db7 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbHospApprFlag.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbHospApprFlag.java @@ -4,7 +4,6 @@ package com.openhis.common.enums.ybenums; import com.github.pagehelper.util.StringUtil; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIdDocumentType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIdDocumentType.java index bc261219..420a6b82 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIdDocumentType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIdDocumentType.java @@ -1,7 +1,6 @@ package com.openhis.common.enums.ybenums; import com.github.pagehelper.util.StringUtil; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInvChgType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInvChgType.java index ffa2f559..2f731f00 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInvChgType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbInvChgType.java @@ -4,7 +4,6 @@ package com.openhis.common.enums.ybenums; import com.github.pagehelper.util.StringUtil; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIptDiseTypeCode.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIptDiseTypeCode.java index 6d910486..ffde1cf5 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIptDiseTypeCode.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbIptDiseTypeCode.java @@ -4,7 +4,6 @@ package com.openhis.common.enums.ybenums; import com.github.pagehelper.util.StringUtil; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMdcsType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMdcsType.java index 68f1e5ca..386d6fa1 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMdcsType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMdcsType.java @@ -1,8 +1,6 @@ package com.openhis.common.enums.ybenums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.openhis.common.enums.ClaimType; -import com.openhis.common.enums.HisEnumInterface; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMdtrtCertType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMdtrtCertType.java index 1e7de88e..8e47ef8a 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMdtrtCertType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMdtrtCertType.java @@ -4,7 +4,6 @@ package com.openhis.common.enums.ybenums; import com.github.pagehelper.util.StringUtil; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedChrgItmType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedChrgItmType.java index d8497109..1033e178 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedChrgItmType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedChrgItmType.java @@ -3,7 +3,6 @@ */ package com.openhis.common.enums.ybenums; -import com.openhis.common.enums.ChargeItemEnum; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedinsLv.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedinsLv.java index d4151c50..3b609308 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedinsLv.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedinsLv.java @@ -1,7 +1,6 @@ package com.openhis.common.enums.ybenums; import com.github.pagehelper.util.StringUtil; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayLoc.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayLoc.java index 9b11114f..e142b946 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayLoc.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayLoc.java @@ -4,7 +4,6 @@ package com.openhis.common.enums.ybenums; import com.github.pagehelper.util.StringUtil; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayment.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayment.java index 6db8fae0..1a977dd0 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayment.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayment.java @@ -4,7 +4,6 @@ package com.openhis.common.enums.ybenums; import com.baomidou.mybatisplus.annotation.EnumValue; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPharmacistTitle.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPharmacistTitle.java index d5018346..ec01f6b9 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPharmacistTitle.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPharmacistTitle.java @@ -1,7 +1,6 @@ package com.openhis.common.enums.ybenums; import com.github.pagehelper.util.StringUtil; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPrescriptionStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPrescriptionStatus.java index 9080d7b5..8267b464 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPrescriptionStatus.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPrescriptionStatus.java @@ -1,7 +1,6 @@ package com.openhis.common.enums.ybenums; import com.github.pagehelper.util.StringUtil; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbRxItemTypeCode.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbRxItemTypeCode.java index 9a778d3c..4de2b83e 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbRxItemTypeCode.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbRxItemTypeCode.java @@ -1,7 +1,6 @@ package com.openhis.common.enums.ybenums; import com.github.pagehelper.util.StringUtil; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbTrigScen.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbTrigScen.java index b1c72599..4452c7b0 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbTrigScen.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbTrigScen.java @@ -1,7 +1,6 @@ package com.openhis.common.enums.ybenums; import com.github.pagehelper.util.StringUtil; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbWarnType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbWarnType.java index cfc81a71..82bf0fda 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbWarnType.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbWarnType.java @@ -1,7 +1,6 @@ package com.openhis.common.enums.ybenums; import com.github.pagehelper.util.StringUtil; - import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/CommonUtil.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/CommonUtil.java index 0231c873..bfd90f55 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/CommonUtil.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/CommonUtil.java @@ -1,5 +1,14 @@ package com.openhis.common.utils; +import com.core.common.core.domain.R; +import com.core.common.utils.poi.ExcelUtil; +import org.apache.http.conn.ssl.NoopHostnameVerifier; +import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.springframework.web.multipart.MultipartFile; + +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; import java.io.IOException; import java.security.KeyManagementException; import java.security.NoSuchAlgorithmException; @@ -7,17 +16,6 @@ import java.security.SecureRandom; import java.security.cert.X509Certificate; import java.util.List; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; - -import org.apache.http.conn.ssl.NoopHostnameVerifier; -import org.apache.http.conn.ssl.SSLConnectionSocketFactory; -import org.springframework.web.multipart.MultipartFile; - -import com.core.common.core.domain.R; -import com.core.common.utils.poi.ExcelUtil; - /** * 共通工具类 * diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/EnumUtils.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/EnumUtils.java index ddf82416..6888b5c5 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/EnumUtils.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/EnumUtils.java @@ -1,9 +1,9 @@ package com.openhis.common.utils; -import java.util.Arrays; - import com.openhis.common.enums.HisEnumInterface; +import java.util.Arrays; + public class EnumUtils { /** diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/HisPageUtils.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/HisPageUtils.java index eb80405e..ad83f533 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/HisPageUtils.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/HisPageUtils.java @@ -1,13 +1,12 @@ package com.openhis.common.utils; -import java.util.List; -import java.util.stream.Collectors; - -import org.springframework.beans.BeanUtils; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.beans.BeanUtils; + +import java.util.List; +import java.util.stream.Collectors; public class HisPageUtils { 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 83b30fb8..f794bf28 100644 --- 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 @@ -1,5 +1,12 @@ package com.openhis.common.utils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.core.common.utils.DateUtils; +import com.core.common.utils.SecurityUtils; +import com.core.framework.config.TenantContext; +import com.openhis.common.constant.CommonConstants; + +import javax.servlet.http.HttpServletRequest; import java.lang.reflect.Field; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -9,14 +16,6 @@ import java.util.Date; import java.util.HashSet; import java.util.Map; -import javax.servlet.http.HttpServletRequest; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.core.common.utils.DateUtils; -import com.core.common.utils.SecurityUtils; -import com.core.framework.config.TenantContext; -import com.openhis.common.constant.CommonConstants; - /** * His查询工具类 */ diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/IdCardUtil.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/IdCardUtil.java index a0cff496..2b71a2fc 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/IdCardUtil.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/IdCardUtil.java @@ -3,6 +3,8 @@ */ package com.openhis.common.utils; +import com.openhis.common.constant.CommonConstants; + import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.LocalDate; @@ -11,8 +13,6 @@ import java.util.Calendar; import java.util.Date; import java.util.concurrent.ThreadLocalRandom; -import com.openhis.common.constant.CommonConstants; - /** * 身份证号生成工具类 * diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/RedisUtil.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/RedisUtil.java index 36d62655..a57d7bf5 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/RedisUtil.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/RedisUtil.java @@ -4,7 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.*; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import org.springframework.data.redis.core.RedisTemplate; + import java.util.*; import java.util.concurrent.TimeUnit; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java index bc072512..0c99fe49 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java @@ -1,16 +1,15 @@ package com.openhis.administration.domain; -import java.math.BigDecimal; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 就诊账户管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUser.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUser.java index 3c830920..fb6fb49c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUser.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUser.java @@ -1,16 +1,15 @@ package com.openhis.administration.domain; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; + /** * 用户管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUserRole.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUserRole.java index 95112ea8..c4947916 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUserRole.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUserRole.java @@ -3,7 +3,6 @@ package com.openhis.administration.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BodyStructure.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BodyStructure.java index 15891be3..b7ef5134 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BodyStructure.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BodyStructure.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChangePriceRecord.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChangePriceRecord.java index 6c52f479..78086073 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChangePriceRecord.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChangePriceRecord.java @@ -1,17 +1,16 @@ package com.openhis.administration.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 修改价格记录Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java index 36dac472..25a717cd 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java @@ -1,17 +1,16 @@ package com.openhis.administration.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 费用项管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefDetail.java index fffcb643..4290c369 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefDetail.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefDetail.java @@ -1,18 +1,16 @@ package com.openhis.administration.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.openhis.common.enums.ActPriority; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 费用定价管理子Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java index c034e812..b9db5174 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java @@ -1,17 +1,16 @@ package com.openhis.administration.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 费用定价管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java index 3c956389..2c2bba2c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java @@ -1,7 +1,5 @@ package com.openhis.administration.domain; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -11,6 +9,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; + /** * 器材基本信息管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java index 1c3f13b0..9bfe08bd 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java @@ -1,18 +1,17 @@ package com.openhis.administration.domain; -import java.math.BigDecimal; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 器材定义管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java index 72a3a796..9d30b90c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.java index 2bc55738..3cfcac3b 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.java @@ -1,16 +1,15 @@ package com.openhis.administration.domain; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; + /** * 就诊位置管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java index 968879d5..39423d35 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java @@ -1,17 +1,15 @@ package com.openhis.administration.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; + /** * 就诊参与者管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java index 91b19489..46265037 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java @@ -1,12 +1,8 @@ package com.openhis.administration.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Frequency.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Frequency.java index 1d6396d1..0c285344 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Frequency.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Frequency.java @@ -2,7 +2,6 @@ package com.openhis.administration.domain ; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; @@ -12,9 +11,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import java.io.Serializable; -import java.util.Date; - /** * 频次配置表，用于频次、周期和相关信息 * @TableName adm_frequency diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java index f4774a0a..9ef2eac9 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/IdentifierUse.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/IdentifierUse.java index bb1255be..7a3c9301 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/IdentifierUse.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/IdentifierUse.java @@ -1,7 +1,6 @@ package com.openhis.administration.domain; import com.baomidou.mybatisplus.annotation.EnumValue; -import lombok.AllArgsConstructor; import lombok.Getter; @Getter diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Instrument.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Instrument.java index 4d21d8b5..b19b82ee 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Instrument.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Instrument.java @@ -1,12 +1,8 @@ package com.openhis.administration.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -15,6 +11,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 存储各类仪器的信息，包括设备基本信息、状态、维护记录等Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java index 68596b2f..e624cc7b 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java @@ -1,19 +1,17 @@ package com.openhis.administration.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import com.openhis.common.enums.InvoiceStatus; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 发票管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/InvoiceSegment.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/InvoiceSegment.java index 5b996e87..1ee1ecb6 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/InvoiceSegment.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/InvoiceSegment.java @@ -1,11 +1,12 @@ package com.openhis.administration.domain; -import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; +import java.util.Date; + /** * 发票段管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java index 3a114ddb..90c8eed5 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java @@ -4,11 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.enums.LocationMode; -import com.openhis.common.enums.LocationOperational; import com.openhis.common.enums.LocationStatus; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ObservationDefinition.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ObservationDefinition.java index d1d059ef..57476f3c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ObservationDefinition.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ObservationDefinition.java @@ -1,12 +1,8 @@ package com.openhis.administration.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OrgContrast.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OrgContrast.java index c5aceea0..e89950d2 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OrgContrast.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OrgContrast.java @@ -4,7 +4,6 @@ package com.openhis.administration.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java index 4b1a0e7e..6a566762 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java @@ -6,9 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.openhis.common.enums.OrganizationClass; -import com.openhis.common.enums.OrganizationType; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OrganizationLocation.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OrganizationLocation.java index f94002f4..ed039ebb 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OrganizationLocation.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OrganizationLocation.java @@ -1,18 +1,16 @@ package com.openhis.administration.domain; -import java.sql.Time; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.sql.Time; + /** * 机构位置关系管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OutpatientNoSegment.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OutpatientNoSegment.java index 706b4b5e..ed3f966d 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OutpatientNoSegment.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OutpatientNoSegment.java @@ -1,19 +1,18 @@ package com.openhis.administration.domain; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - -import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; + /** * 门诊号码段管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java index 27801f38..2ac177c0 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java @@ -1,18 +1,17 @@ package com.openhis.administration.domain; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; + /** * 患者管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java index e562f15d..61b2ac95 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java @@ -1,16 +1,15 @@ package com.openhis.administration.domain; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; + /** * 患者标识管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PatientStudent.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PatientStudent.java index b1062ad4..9800d541 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PatientStudent.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PatientStudent.java @@ -1,16 +1,15 @@ package com.openhis.administration.domain; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; + /** * 公费医疗学生名单管理表Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java index 8a8910f2..7e3f478a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java @@ -1,18 +1,17 @@ package com.openhis.administration.domain; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; + /** * 医疗参与者管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java index 13b1eef4..b3b0b4ce 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/SpecimenDefinition.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/SpecimenDefinition.java index 24f69fd7..49decf5d 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/SpecimenDefinition.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/SpecimenDefinition.java @@ -1,12 +1,8 @@ package com.openhis.administration.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java index 6bdca327..2c525370 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java @@ -1,12 +1,8 @@ package com.openhis.administration.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/TraceNoManage.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/TraceNoManage.java index cf8075f1..455ea06f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/TraceNoManage.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/TraceNoManage.java @@ -1,12 +1,8 @@ package com.openhis.administration.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChangePriceDataDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChangePriceDataDto.java index 67a38e3a..2ab7b170 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChangePriceDataDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChangePriceDataDto.java @@ -1,13 +1,12 @@ package com.openhis.administration.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; +import java.math.BigDecimal; +import java.util.Date; + /** * @ClassName ChangePricePageDto * @Description TODO diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemBaseInfoDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemBaseInfoDto.java index 2c78947c..fb68affc 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemBaseInfoDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemBaseInfoDto.java @@ -1,13 +1,12 @@ package com.openhis.administration.dto; +import com.openhis.administration.domain.ChargeItem; +import lombok.Data; +import lombok.experimental.Accessors; + import java.math.BigDecimal; import java.util.Date; -import com.openhis.administration.domain.ChargeItem; - -import lombok.Data; -import lombok.experimental.Accessors; - @Data @Accessors(chain = true) public class ChargeItemBaseInfoDto extends ChargeItem { diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemDefInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemDefInfo.java index 2bbe628b..d0355f76 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemDefInfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemDefInfo.java @@ -3,15 +3,14 @@ */ package com.openhis.administration.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.openhis.administration.domain.ChargeItem; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * chargeItem 关联def的信息 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/CostDetailDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/CostDetailDto.java index 7983c902..ed761ac4 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/CostDetailDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/CostDetailDto.java @@ -1,15 +1,14 @@ package com.openhis.administration.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.core.common.annotation.Excel; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 费用明细Dto * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/CostDetailSearchParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/CostDetailSearchParam.java index 0f727fb9..6cda0c6a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/CostDetailSearchParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/CostDetailSearchParam.java @@ -1,13 +1,12 @@ package com.openhis.administration.dto; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 费用明细查询条件 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterAccountDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterAccountDto.java index 5114758f..fdfadc59 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterAccountDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterAccountDto.java @@ -3,15 +3,14 @@ */ package com.openhis.administration.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 挂号和账户的集合实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterDataDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterDataDto.java index ff7e203a..36a87477 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterDataDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterDataDto.java @@ -2,7 +2,6 @@ package com.openhis.administration.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterLocationDataDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterLocationDataDto.java index 89efa457..48c1c540 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterLocationDataDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterLocationDataDto.java @@ -2,7 +2,6 @@ package com.openhis.administration.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/LocationDataDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/LocationDataDto.java index 0d3237a5..2317b926 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/LocationDataDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/LocationDataDto.java @@ -2,7 +2,6 @@ package com.openhis.administration.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import java.util.List; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/PatientDataDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/PatientDataDto.java index 22aded41..dde4dc37 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/PatientDataDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/PatientDataDto.java @@ -2,7 +2,6 @@ package com.openhis.administration.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/TracePatientInfoDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/TracePatientInfoDto.java index 1f96f390..ff50c6c9 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/TracePatientInfoDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/TracePatientInfoDto.java @@ -1,10 +1,10 @@ package com.openhis.administration.dto; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 药品追溯患者信息Dto * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/AccountMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/AccountMapper.java index 5844d46b..3f430578 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/AccountMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/AccountMapper.java @@ -1,9 +1,8 @@ package com.openhis.administration.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.Account; +import org.springframework.stereotype.Repository; /** * 就诊账户管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserMapper.java index d31ae0ac..e4db6525 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserMapper.java @@ -1,9 +1,8 @@ package com.openhis.administration.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.BizUser; +import org.springframework.stereotype.Repository; /** * 用户管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserRoleMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserRoleMapper.java index 28773514..f8c308d0 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserRoleMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BizUserRoleMapper.java @@ -1,11 +1,9 @@ package com.openhis.administration.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.BizUserRole; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.openhis.administration.domain.BizUser; - /** * 用户角色Mapper接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BodyStructureMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BodyStructureMapper.java index 14da365b..6c9a3d9b 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BodyStructureMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/BodyStructureMapper.java @@ -1,9 +1,8 @@ package com.openhis.administration.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.BodyStructure; +import org.springframework.stereotype.Repository; /** * 身体部位管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChangePriceRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChangePriceRecordMapper.java index 161db7bc..2bd548be 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChangePriceRecordMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChangePriceRecordMapper.java @@ -1,11 +1,10 @@ package com.openhis.administration.mapper; -import com.openhis.administration.dto.ChangePriceDataDto; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.ChangePriceRecord; +import com.openhis.administration.dto.ChangePriceDataDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; import java.util.List; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefDetailAppMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefDetailAppMapper.java index c63c6041..6cdf67b9 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefDetailAppMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefDetailAppMapper.java @@ -1,11 +1,10 @@ package com.openhis.administration.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.ChargeItemDefDetail; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - import java.util.List; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefinitionMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefinitionMapper.java index 44ba870b..a72d58f9 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefinitionMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefinitionMapper.java @@ -1,11 +1,10 @@ package com.openhis.administration.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.ChargeItemDefinition; import com.openhis.administration.dto.ChargeItemDefDetailPriceDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; /** * 费用定价管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemMapper.java index 25049428..2e115958 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemMapper.java @@ -1,10 +1,5 @@ package com.openhis.administration.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; @@ -13,6 +8,10 @@ import com.openhis.administration.dto.ChargeItemBaseInfoDto; import com.openhis.administration.dto.ChargeItemDefInfo; import com.openhis.administration.dto.CostDetailDto; import com.openhis.administration.dto.CostDetailSearchParam; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 费用项管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DeviceDefinitionMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DeviceDefinitionMapper.java index 19797f62..5299614b 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DeviceDefinitionMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DeviceDefinitionMapper.java @@ -1,11 +1,10 @@ package com.openhis.administration.mapper; -import com.openhis.medication.dto.AdjustPriceMedListDto; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.DeviceDefinition; +import com.openhis.medication.dto.AdjustPriceMedListDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; import java.util.List; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DeviceMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DeviceMapper.java index b53290f2..165627eb 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DeviceMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/DeviceMapper.java @@ -1,9 +1,8 @@ package com.openhis.administration.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.Device; +import org.springframework.stereotype.Repository; /** * 器材基本信息管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterDiagnosisMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterDiagnosisMapper.java index 0e8a2acc..76d10e3e 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterDiagnosisMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterDiagnosisMapper.java @@ -1,10 +1,9 @@ package com.openhis.administration.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.EncounterDiagnosis; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; /** * 就诊诊断管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterLocationMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterLocationMapper.java index e1752d16..31bd8b43 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterLocationMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterLocationMapper.java @@ -1,11 +1,10 @@ package com.openhis.administration.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.EncounterLocation; import com.openhis.administration.dto.PatientBedInfoDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; /** * 就诊位置管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterMapper.java index 1012ec4a..8efca076 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterMapper.java @@ -1,15 +1,14 @@ package com.openhis.administration.mapper; -import java.util.Date; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.Encounter; import com.openhis.administration.dto.EncounterAccountDto; import com.openhis.administration.dto.EncounterDataDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.Date; +import java.util.List; /** * 就诊管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterParticipantMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterParticipantMapper.java index 607acf30..5f92d868 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterParticipantMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterParticipantMapper.java @@ -1,9 +1,8 @@ package com.openhis.administration.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.EncounterParticipant; +import org.springframework.stereotype.Repository; /** * 就诊参与者管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterReasonMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterReasonMapper.java index 328d913a..91f75a15 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterReasonMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/EncounterReasonMapper.java @@ -1,9 +1,8 @@ package com.openhis.administration.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.EncounterReason; +import org.springframework.stereotype.Repository; /** * 就诊原因管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/HealthcareServiceMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/HealthcareServiceMapper.java index 31226fb3..ed55610a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/HealthcareServiceMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/HealthcareServiceMapper.java @@ -1,14 +1,13 @@ package com.openhis.administration.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.HealthcareService; import com.openhis.administration.dto.HealthcareDto; import com.openhis.medication.dto.AdjustPriceMedListDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 服务项目管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InstrumentMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InstrumentMapper.java index 3f7b346e..008e483c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InstrumentMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InstrumentMapper.java @@ -1,9 +1,8 @@ package com.openhis.administration.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.Instrument; +import org.springframework.stereotype.Repository; /** * 存储各类仪器的信息，包括设备基本信息、状态、维护记录等Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InvoiceMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InvoiceMapper.java index 4c0d732a..ce5dcecf 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InvoiceMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InvoiceMapper.java @@ -1,9 +1,8 @@ package com.openhis.administration.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.Invoice; +import org.springframework.stereotype.Repository; /** * 发票管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InvoiceSegmentMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InvoiceSegmentMapper.java index f93452e9..bd5d09f5 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InvoiceSegmentMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InvoiceSegmentMapper.java @@ -1,9 +1,8 @@ package com.openhis.administration.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.InvoiceSegment; +import org.springframework.stereotype.Repository; /** * 发票段管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/LocationMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/LocationMapper.java index 8446abf3..1498c94e 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/LocationMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/LocationMapper.java @@ -1,14 +1,13 @@ package com.openhis.administration.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.Location; import com.openhis.administration.dto.LocationDataDto; import com.openhis.administration.dto.PatientBedInfoDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 位置管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ObservationDefinitionMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ObservationDefinitionMapper.java index 627dd007..75c7ce7a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ObservationDefinitionMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ObservationDefinitionMapper.java @@ -1,9 +1,8 @@ package com.openhis.administration.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.ObservationDefinition; +import org.springframework.stereotype.Repository; /** * 观测定义Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrgContrastMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrgContrastMapper.java index c3d54b2e..06168150 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrgContrastMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrgContrastMapper.java @@ -1,10 +1,9 @@ package com.openhis.administration.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.OrgContrast; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - /** * 【对照表】Mapper接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrganizationLocationMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrganizationLocationMapper.java index 53bca8dc..3147ed42 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrganizationLocationMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrganizationLocationMapper.java @@ -1,9 +1,8 @@ package com.openhis.administration.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.OrganizationLocation; +import org.springframework.stereotype.Repository; /** * 机构位置关系管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrganizationMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrganizationMapper.java index c027796b..820ea0b1 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrganizationMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OrganizationMapper.java @@ -1,10 +1,9 @@ package com.openhis.administration.mapper; -import com.openhis.administration.dto.OrgDataDto; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.Organization; +import com.openhis.administration.dto.OrgDataDto; +import org.springframework.stereotype.Repository; import java.util.List; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OutpatientNoSegmentMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OutpatientNoSegmentMapper.java index 881fcce2..6af59db4 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OutpatientNoSegmentMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/OutpatientNoSegmentMapper.java @@ -1,9 +1,8 @@ package com.openhis.administration.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.OutpatientNoSegment; +import org.springframework.stereotype.Repository; /** * 门诊号码段管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientIdentifierMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientIdentifierMapper.java index bfa64449..b28ba92d 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientIdentifierMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientIdentifierMapper.java @@ -1,9 +1,8 @@ package com.openhis.administration.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.PatientIdentifier; +import org.springframework.stereotype.Repository; /** * 患者标识管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientMapper.java index aac3507a..e7a91496 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientMapper.java @@ -1,11 +1,10 @@ package com.openhis.administration.mapper; -import com.openhis.administration.dto.PatientDataDto; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.Patient; +import com.openhis.administration.dto.PatientDataDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; import java.util.List; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientStudentMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientStudentMapper.java index 957361cb..ee8307eb 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientStudentMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientStudentMapper.java @@ -1,9 +1,8 @@ package com.openhis.administration.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.PatientStudent; +import org.springframework.stereotype.Repository; /** * 公费医疗学生名单管理表Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerMapper.java index c476c31d..0e133b05 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerMapper.java @@ -1,9 +1,8 @@ package com.openhis.administration.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.Practitioner; +import org.springframework.stereotype.Repository; /** * 医疗参与者管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerRoleMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerRoleMapper.java index 37caa073..5784426a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerRoleMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PractitionerRoleMapper.java @@ -1,13 +1,12 @@ package com.openhis.administration.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.PractitionerRole; import com.openhis.administration.dto.RoleDataDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 岗位管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/SpecimenDefinitionMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/SpecimenDefinitionMapper.java index 43b4c16d..02f67549 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/SpecimenDefinitionMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/SpecimenDefinitionMapper.java @@ -1,9 +1,8 @@ package com.openhis.administration.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.SpecimenDefinition; +import org.springframework.stereotype.Repository; /** * 样本定义Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/SupplierMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/SupplierMapper.java index f90ccdb2..2e0fdddf 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/SupplierMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/SupplierMapper.java @@ -1,9 +1,8 @@ package com.openhis.administration.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.Supplier; +import org.springframework.stereotype.Repository; /** * 供应商管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/TraceNoManageMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/TraceNoManageMapper.java index fe753da3..b07d51c0 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/TraceNoManageMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/TraceNoManageMapper.java @@ -1,13 +1,12 @@ package com.openhis.administration.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.administration.domain.TraceNoManage; import com.openhis.administration.dto.TracePatientInfoDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 【追溯码管理】Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IAccountService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IAccountService.java index ba63524a..549d1c81 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IAccountService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IAccountService.java @@ -1,10 +1,10 @@ package com.openhis.administration.service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.administration.domain.Account; +import java.util.List; + /** * 就诊账户管理Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IBodyStructureService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IBodyStructureService.java index b83ae979..aed74203 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IBodyStructureService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IBodyStructureService.java @@ -1,10 +1,9 @@ package com.openhis.administration.service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.administration.domain.BodyStructure; -import com.openhis.administration.domain.Organization; + +import java.util.List; /** * 身体部位管理Service接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChangePriceRecordService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChangePriceRecordService.java index 57d40bde..065b4574 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChangePriceRecordService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChangePriceRecordService.java @@ -1,12 +1,12 @@ package com.openhis.administration.service; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.administration.domain.ChangePriceRecord; import com.openhis.administration.dto.ChangePriceDataDto; +import java.util.Date; +import java.util.List; + /** * 修改价格记录Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefDetailService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefDetailService.java index 805dd7ec..62a263e7 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefDetailService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefDetailService.java @@ -1,10 +1,10 @@ package com.openhis.administration.service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.administration.domain.ChargeItemDefDetail; +import java.util.List; + /** * 费用定价管理子Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefinitionService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefinitionService.java index 86aff64c..f342cd98 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefinitionService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefinitionService.java @@ -1,14 +1,14 @@ package com.openhis.administration.service; -import java.math.BigDecimal; -import java.util.List; - import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.administration.domain.ChargeItemDefinition; import com.openhis.administration.domain.HealthcareService; import com.openhis.administration.dto.ChargeItemDefDetailPriceDto; +import java.math.BigDecimal; +import java.util.List; + /** * 费用定价管理Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java index d41506d5..acff1fe5 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java @@ -1,7 +1,5 @@ package com.openhis.administration.service; -import java.util.List; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.administration.domain.ChargeItem; @@ -10,6 +8,8 @@ import com.openhis.administration.dto.ChargeItemDefInfo; import com.openhis.administration.dto.CostDetailDto; import com.openhis.administration.dto.CostDetailSearchParam; +import java.util.List; + /** * 费用项管理Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IDeviceDefinitionService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IDeviceDefinitionService.java index 3b2552eb..3dbd9b48 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IDeviceDefinitionService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IDeviceDefinitionService.java @@ -1,11 +1,11 @@ package com.openhis.administration.service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.administration.domain.DeviceDefinition; import com.openhis.medication.dto.AdjustPriceMedListDto; +import java.util.List; + /** * 器材定义管理Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterDiagnosisService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterDiagnosisService.java index 16cf5d5b..52aa0b84 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterDiagnosisService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterDiagnosisService.java @@ -1,11 +1,11 @@ package com.openhis.administration.service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.administration.domain.EncounterDiagnosis; import com.openhis.common.enums.ybenums.YbIptDiseTypeCode; +import java.util.List; + /** * 就诊诊断管理Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterLocationService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterLocationService.java index 0adcbe7a..6338f5c6 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterLocationService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterLocationService.java @@ -1,13 +1,13 @@ package com.openhis.administration.service; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.administration.domain.EncounterLocation; import com.openhis.common.enums.EncounterActivityStatus; import com.openhis.common.enums.LocationForm; +import java.util.Date; +import java.util.List; + /** * 就诊位置管理Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterParticipantService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterParticipantService.java index 49fbfaa1..927a971b 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterParticipantService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterParticipantService.java @@ -1,11 +1,10 @@ package com.openhis.administration.service; -import java.util.Date; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.administration.domain.EncounterParticipant; import com.openhis.common.enums.ParticipantType; +import java.util.Date; import java.util.List; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterService.java index 562a2eb5..00e8b312 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IEncounterService.java @@ -1,13 +1,12 @@ package com.openhis.administration.service; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.administration.domain.Encounter; import com.openhis.administration.dto.EncounterAccountDto; import com.openhis.administration.dto.EncounterDataDto; -import org.apache.ibatis.annotations.Param; + +import java.util.Date; +import java.util.List; /** * 就诊管理Service接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IHealthcareServiceService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IHealthcareServiceService.java index c2d36201..dc1fcb17 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IHealthcareServiceService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IHealthcareServiceService.java @@ -5,7 +5,6 @@ import com.openhis.administration.domain.HealthcareService; import com.openhis.administration.dto.HealthcareDto; import com.openhis.medication.dto.AdjustPriceMedListDto; import org.apache.ibatis.annotations.Param; -import org.springframework.security.core.parameters.P; import java.util.List; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ILocationService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ILocationService.java index c2f9658c..2e489764 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ILocationService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ILocationService.java @@ -1,12 +1,11 @@ package com.openhis.administration.service; -import java.util.List; - -import org.apache.ibatis.annotations.Param; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.administration.domain.Location; import com.openhis.administration.dto.LocationDataDto; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 位置管理Service接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrgContrastService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrgContrastService.java index f3bd0b96..560bed70 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrgContrastService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrgContrastService.java @@ -2,7 +2,6 @@ package com.openhis.administration.service; import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.administration.domain.OrgContrast; -import com.openhis.yb.domain.ClinicSettle; /** * 【对照表】Service接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationService.java index 2bc6010f..20cd945f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationService.java @@ -1,11 +1,11 @@ package com.openhis.administration.service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.administration.domain.Organization; import com.openhis.administration.dto.OrgDataDto; +import java.util.List; + /** * 机构管理Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerRoleService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerRoleService.java index a0b32868..971378ff 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerRoleService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerRoleService.java @@ -1,7 +1,6 @@ package com.openhis.administration.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.openhis.administration.domain.Practitioner; import com.openhis.administration.domain.PractitionerRole; import com.openhis.administration.dto.RoleDataDto; import org.apache.ibatis.annotations.Param; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerService.java index bf6fb413..2432c33a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerService.java @@ -2,7 +2,6 @@ package com.openhis.administration.service; import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.administration.domain.Practitioner; -import com.openhis.administration.domain.PractitionerRole; import java.util.List; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ISpecimenDefinitionService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ISpecimenDefinitionService.java index 6bbe404a..3ac49a5c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ISpecimenDefinitionService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ISpecimenDefinitionService.java @@ -1,11 +1,8 @@ package com.openhis.administration.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.core.common.core.domain.R; import com.openhis.administration.domain.SpecimenDefinition; -import javax.servlet.http.HttpServletRequest; - /** * 样本定义Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ISupplierService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ISupplierService.java index f1dc2c4c..e868ef6d 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ISupplierService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ISupplierService.java @@ -1,14 +1,8 @@ package com.openhis.administration.service; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.core.common.core.domain.R; import com.openhis.administration.domain.Supplier; -import com.openhis.clinical.domain.ConditionDefinition; -import com.openhis.workflow.domain.SupplyRequest; -import org.springframework.web.bind.annotation.RequestParam; -import javax.servlet.http.HttpServletRequest; import java.util.List; /** 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 6803a6ce..78a34430 100644 --- 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 @@ -1,11 +1,5 @@ package com.openhis.administration.service.impl; -import java.util.List; - -import javax.validation.constraints.NotNull; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.administration.domain.Account; @@ -16,6 +10,10 @@ import com.openhis.common.constant.YbCommonConstants; import com.openhis.common.enums.AccountStatus; import com.openhis.common.enums.AccountType; import com.openhis.common.enums.Whether; +import org.springframework.stereotype.Service; + +import javax.validation.constraints.NotNull; +import java.util.List; /** * 就诊账户管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserRoleServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserRoleServiceImpl.java index 63e75825..142e46d2 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserRoleServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserRoleServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.administration.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.administration.domain.BizUserRole; import com.openhis.administration.mapper.BizUserRoleMapper; import com.openhis.administration.service.IBizUserRoleService; +import org.springframework.stereotype.Service; /** * 用户角色Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserServiceImpl.java index fc108152..8833735f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BizUserServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.administration.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.administration.domain.BizUser; import com.openhis.administration.mapper.BizUserMapper; import com.openhis.administration.service.IBizUserService; +import org.springframework.stereotype.Service; /** * 用户管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BodyStructureServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BodyStructureServiceImpl.java index 9fcbaf36..b56adb7e 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BodyStructureServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/BodyStructureServiceImpl.java @@ -1,9 +1,5 @@ package com.openhis.administration.service.impl; -import java.util.List; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -11,6 +7,9 @@ import com.openhis.administration.domain.BodyStructure; import com.openhis.administration.mapper.BodyStructureMapper; import com.openhis.administration.service.IBodyStructureService; import com.openhis.common.enums.PublicationStatus; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 身体部位管理Service业务层处理 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 0b0bb3b5..48a2eb55 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.administration.service.impl; -import java.util.Date; -import java.util.List; - -import javax.annotation.Resource; - -import com.core.common.core.domain.entity.SysDictData; -import com.openhis.common.constant.CommonConstants; -import com.openhis.workflow.domain.SupplyRequest; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.core.common.utils.DateUtils; @@ -20,6 +10,11 @@ import com.openhis.administration.dto.ChangePriceDataDto; import com.openhis.administration.mapper.ChangePriceRecordMapper; import com.openhis.administration.service.IChangePriceRecordService; import com.openhis.common.enums.SupplyStatus; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; /** * 修改价格记录Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefDetailServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefDetailServiceImpl.java index 801fcf93..824fdd98 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefDetailServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefDetailServiceImpl.java @@ -1,16 +1,15 @@ package com.openhis.administration.service.impl; -import java.util.List; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.core.common.enums.DelFlag; import com.openhis.administration.domain.ChargeItemDefDetail; import com.openhis.administration.mapper.ChargeItemDefDetailAppMapper; import com.openhis.administration.service.IChargeItemDefDetailService; import com.openhis.common.enums.ConditionCode; -import com.core.common.enums.DelFlag; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 费用定价管理子Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefinitionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefinitionServiceImpl.java index 50a6aa3b..dc368088 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefinitionServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefinitionServiceImpl.java @@ -1,12 +1,5 @@ package com.openhis.administration.service.impl; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -23,6 +16,12 @@ import com.openhis.common.constant.CommonConstants; import com.openhis.common.enums.ConditionCode; import com.openhis.common.enums.PublicationStatus; import com.openhis.common.enums.Whether; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; /** * 费用定价管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java index a9ac779c..3f912c99 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java @@ -1,13 +1,5 @@ package com.openhis.administration.service.impl; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -29,8 +21,14 @@ import com.openhis.administration.mapper.ChargeItemMapper; import com.openhis.administration.service.IChargeItemService; import com.openhis.common.enums.*; import com.openhis.common.utils.EnumUtils; - import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; /** * 费用项管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeviceDefinitionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeviceDefinitionServiceImpl.java index 1c9b458d..3185fdd5 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeviceDefinitionServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeviceDefinitionServiceImpl.java @@ -1,18 +1,16 @@ package com.openhis.administration.service.impl; -import java.util.List; - -import com.openhis.medication.dto.AdjustPriceMedListDto; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.administration.domain.DeviceDefinition; import com.openhis.administration.mapper.DeviceDefinitionMapper; import com.openhis.administration.service.IDeviceDefinitionService; - +import com.openhis.medication.dto.AdjustPriceMedListDto; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 器材定义管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeviceServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeviceServiceImpl.java index feae4d10..0813a20d 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeviceServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/DeviceServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.administration.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.administration.domain.Device; import com.openhis.administration.mapper.DeviceMapper; import com.openhis.administration.service.IDeviceService; +import org.springframework.stereotype.Service; /** * 器材基本信息管理Service业务层处理 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 dfa8b5ba..8b9875b8 100644 --- 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 @@ -1,13 +1,5 @@ package com.openhis.administration.service.impl; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.administration.domain.EncounterDiagnosis; @@ -16,6 +8,12 @@ import com.openhis.administration.service.IEncounterDiagnosisService; import com.openhis.clinical.mapper.ConditionMapper; import com.openhis.common.enums.Whether; import com.openhis.common.enums.ybenums.YbIptDiseTypeCode; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; /** * 就诊诊断管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterLocationServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterLocationServiceImpl.java index 02055cbf..7c0e84fc 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterLocationServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterLocationServiceImpl.java @@ -1,11 +1,5 @@ package com.openhis.administration.service.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -15,6 +9,11 @@ import com.openhis.administration.mapper.EncounterLocationMapper; import com.openhis.administration.service.IEncounterLocationService; import com.openhis.common.enums.EncounterActivityStatus; import com.openhis.common.enums.LocationForm; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; /** * 就诊位置管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterParticipantServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterParticipantServiceImpl.java index 9aca96dc..f97483e6 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterParticipantServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterParticipantServiceImpl.java @@ -1,20 +1,19 @@ package com.openhis.administration.service.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.core.common.enums.DelFlag; import com.openhis.administration.domain.EncounterParticipant; import com.openhis.administration.mapper.EncounterParticipantMapper; import com.openhis.administration.service.IEncounterParticipantService; -import com.core.common.enums.DelFlag; import com.openhis.common.enums.EncounterActivityStatus; import com.openhis.common.enums.ParticipantType; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; /** * 就诊参与者管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterReasonServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterReasonServiceImpl.java index eb300ebf..57e46b27 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterReasonServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterReasonServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.administration.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.administration.domain.EncounterReason; import com.openhis.administration.mapper.EncounterReasonMapper; import com.openhis.administration.service.IEncounterReasonService; +import org.springframework.stereotype.Service; /** * 就诊原因管理Service业务层处理 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 7114d714..e25d5060 100644 --- 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 @@ -1,13 +1,5 @@ package com.openhis.administration.service.impl; -import java.util.Date; -import java.util.List; - -import javax.annotation.Resource; - -import com.openhis.administration.dto.EncounterDataDto; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -15,12 +7,18 @@ import com.core.common.utils.AssignSeqUtil; import com.core.common.utils.StringUtils; import com.openhis.administration.domain.Encounter; import com.openhis.administration.dto.EncounterAccountDto; +import com.openhis.administration.dto.EncounterDataDto; import com.openhis.administration.mapper.EncounterMapper; import com.openhis.administration.service.IEncounterService; import com.openhis.common.constant.YbCommonConstants; import com.openhis.common.enums.AssignSeqEnum; import com.openhis.common.enums.EncounterStatus; import com.openhis.common.enums.EncounterType; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; /** * 就诊管理Service业务层处理 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 418d47b8..adec574c 100644 --- 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 @@ -1,6 +1,5 @@ package com.openhis.administration.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InstrumentServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InstrumentServiceImpl.java index 42724c55..893407c6 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InstrumentServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InstrumentServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.administration.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.administration.domain.Instrument; import com.openhis.administration.mapper.InstrumentMapper; import com.openhis.administration.service.IInstrumentService; +import org.springframework.stereotype.Service; /** * 存储各类仪器的信息，包括设备基本信息、状态、维护记录等Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceSegmentServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceSegmentServiceImpl.java index 805fb760..48952474 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceSegmentServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceSegmentServiceImpl.java @@ -1,15 +1,14 @@ package com.openhis.administration.service.impl; -import java.util.List; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.openhis.administration.domain.InvoiceSegment; import com.openhis.administration.mapper.InvoiceSegmentMapper; import com.openhis.administration.service.IInvoiceSegmentService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 发票段管理Service实现 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceServiceImpl.java index 9bd80fa8..d3e65487 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceServiceImpl.java @@ -1,13 +1,14 @@ package com.openhis.administration.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.core.common.enums.DelFlag; import com.openhis.administration.domain.Invoice; import com.openhis.administration.mapper.InvoiceMapper; import com.openhis.administration.service.IInvoiceService; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + import java.util.List; /** 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 bd1b8180..59025f57 100644 --- 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 @@ -1,11 +1,5 @@ package com.openhis.administration.service.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,8 +10,10 @@ import com.openhis.administration.mapper.LocationMapper; import com.openhis.administration.service.ILocationService; import com.openhis.common.enums.LocationForm; import com.openhis.common.enums.LocationStatus; +import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * 位置管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ObservationDefinitionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ObservationDefinitionServiceImpl.java index b7be7617..6761d196 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ObservationDefinitionServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ObservationDefinitionServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.administration.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.administration.domain.ObservationDefinition; import com.openhis.administration.mapper.ObservationDefinitionMapper; import com.openhis.administration.service.IObservationDefinitionService; +import org.springframework.stereotype.Service; /** * 观测定义Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrgContrastServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrgContrastServiceImpl.java index 7556f65e..4f4f11f2 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrgContrastServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrgContrastServiceImpl.java @@ -1,13 +1,11 @@ package com.openhis.administration.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.openhis.yb.domain.ClinicSettle; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.administration.domain.OrgContrast; import com.openhis.administration.mapper.OrgContrastMapper; import com.openhis.administration.service.IOrgContrastService; +import org.springframework.stereotype.Service; /** * 【对照表】Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationLocationServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationLocationServiceImpl.java index 9306e255..c9e680fa 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationLocationServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationLocationServiceImpl.java @@ -1,15 +1,14 @@ package com.openhis.administration.service.impl; -import java.sql.Time; -import java.util.List; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.administration.domain.OrganizationLocation; import com.openhis.administration.mapper.OrganizationLocationMapper; import com.openhis.administration.service.IOrganizationLocationService; +import org.springframework.stereotype.Service; + +import java.sql.Time; +import java.util.List; /** * 机构位置关系管理Service业务层处理 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 3c4714b7..9eeb1ede 100644 --- 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 @@ -1,11 +1,5 @@ package com.openhis.administration.service.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -15,6 +9,10 @@ import com.openhis.administration.dto.OrgDataDto; import com.openhis.administration.mapper.OrganizationMapper; import com.openhis.administration.service.IOrganizationService; import com.openhis.common.enums.AccountStatus; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; /** * 机构管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OutpatientNoSegmentServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OutpatientNoSegmentServiceImpl.java index 44e335cb..a89ada95 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OutpatientNoSegmentServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OutpatientNoSegmentServiceImpl.java @@ -1,18 +1,17 @@ package com.openhis.administration.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.openhis.administration.domain.OutpatientNoSegment; +import com.openhis.administration.mapper.OutpatientNoSegmentMapper; +import com.openhis.administration.service.IOutpatientNoSegmentService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.openhis.administration.domain.OutpatientNoSegment; -import com.openhis.administration.mapper.OutpatientNoSegmentMapper; -import com.openhis.administration.service.IOutpatientNoSegmentService; - /** * 门诊号码段管理Service实现 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientIdentifierServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientIdentifierServiceImpl.java index 12299c9c..57e7ee34 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientIdentifierServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientIdentifierServiceImpl.java @@ -1,14 +1,13 @@ package com.openhis.administration.service.impl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.administration.domain.PatientIdentifier; import com.openhis.administration.mapper.PatientIdentifierMapper; import com.openhis.administration.service.IPatientIdentifierService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import java.util.List; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java index 7b139c82..449d1b6e 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java @@ -1,8 +1,5 @@ package com.openhis.administration.service.impl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.core.common.utils.AssignSeqUtil; @@ -13,6 +10,8 @@ import com.openhis.administration.domain.Patient; import com.openhis.administration.mapper.PatientMapper; import com.openhis.administration.service.IPatientService; import com.openhis.common.enums.AssignSeqEnum; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; /** * 患者管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientStudentServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientStudentServiceImpl.java index 0ad627c5..956595f9 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientStudentServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientStudentServiceImpl.java @@ -1,19 +1,18 @@ package com.openhis.administration.service.impl; -import java.util.Date; -import java.util.List; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.core.common.enums.DelFlag; import com.core.common.exception.ServiceException; import com.openhis.administration.domain.Patient; import com.openhis.administration.domain.PatientStudent; import com.openhis.administration.mapper.PatientStudentMapper; import com.openhis.administration.service.IPatientStudentService; -import com.core.common.enums.DelFlag; import com.openhis.common.enums.PhysicalExamResult; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; /** * 公费医疗学生名单管理表Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerRoleServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerRoleServiceImpl.java index 3577facc..941af61a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerRoleServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerRoleServiceImpl.java @@ -1,19 +1,18 @@ package com.openhis.administration.service.impl; -import java.util.List; -import java.util.stream.Collectors; - -import com.openhis.administration.dto.RoleDataDto; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.administration.domain.PractitionerRole; +import com.openhis.administration.dto.RoleDataDto; import com.openhis.administration.mapper.PractitionerRoleMapper; import com.openhis.administration.service.IPractitionerRoleService; import com.openhis.common.enums.PractitionerRoles; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; /** * 岗位管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerServiceImpl.java index 4252ace0..75205703 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerServiceImpl.java @@ -1,16 +1,15 @@ package com.openhis.administration.service.impl; -import java.util.List; - -import com.core.common.enums.DelFlag; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.core.common.enums.DelFlag; import com.openhis.administration.domain.Practitioner; import com.openhis.administration.mapper.PractitionerMapper; import com.openhis.administration.service.IPractitionerService; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 医疗参与者管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/SpecimenDefinitionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/SpecimenDefinitionServiceImpl.java index bc550011..ecdc4cc3 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/SpecimenDefinitionServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/SpecimenDefinitionServiceImpl.java @@ -1,14 +1,10 @@ package com.openhis.administration.service.impl; -import com.core.common.core.domain.R; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.administration.domain.SpecimenDefinition; import com.openhis.administration.mapper.SpecimenDefinitionMapper; import com.openhis.administration.service.ISpecimenDefinitionService; - -import javax.servlet.http.HttpServletRequest; +import org.springframework.stereotype.Service; /** * 样本定义Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/SupplierServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/SupplierServiceImpl.java index 853e4f43..d2ae7227 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/SupplierServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/SupplierServiceImpl.java @@ -1,21 +1,19 @@ package com.openhis.administration.service.impl; -import java.util.List; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.core.common.enums.DelFlag; import com.openhis.administration.domain.Supplier; import com.openhis.administration.mapper.SupplierMapper; import com.openhis.administration.service.ISupplierService; -import com.core.common.enums.DelFlag; import com.openhis.common.enums.SupplierType; import com.openhis.common.enums.Whether; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; /** * 供应商管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/TraceNoManageServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/TraceNoManageServiceImpl.java index edf963a3..ed94ba4a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/TraceNoManageServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/TraceNoManageServiceImpl.java @@ -1,18 +1,17 @@ package com.openhis.administration.service.impl; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.administration.domain.TraceNoManage; import com.openhis.administration.mapper.TraceNoManageMapper; import com.openhis.administration.service.ITraceNoManageService; import com.openhis.common.enums.TraceNoStatus; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 【追溯码管理】Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/ClinicRoom.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/ClinicRoom.java index e664f347..37b5d589 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/ClinicRoom.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/ClinicRoom.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckMethod.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckMethod.java index 25413a19..c996fea7 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckMethod.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckMethod.java @@ -1,9 +1,9 @@ package com.openhis.check.domain; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPackage.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPackage.java index 0931f021..25bda9dd 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPackage.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPackage.java @@ -1,10 +1,9 @@ package com.openhis.check.domain; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPart.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPart.java index 4dd58eb9..ebf0450a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPart.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPart.java @@ -1,9 +1,9 @@ package com.openhis.check.domain; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckType.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckType.java index e8c01da7..5a17bfa7 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckType.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckType.java @@ -1,10 +1,9 @@ package com.openhis.check.domain; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/LisGroupInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/LisGroupInfo.java index 5e53f220..b7351046 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/LisGroupInfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/LisGroupInfo.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.experimental.Accessors; + import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/LisGroupInfoServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/LisGroupInfoServiceImpl.java index 44a2414b..cc91ff5a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/LisGroupInfoServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/service/impl/LisGroupInfoServiceImpl.java @@ -2,8 +2,8 @@ package com.openhis.check.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.openhis.check.mapper.LisGroupInfoMapper; import com.openhis.check.domain.LisGroupInfo; +import com.openhis.check.mapper.LisGroupInfoMapper; import com.openhis.check.service.ILisGroupInfoService; import org.springframework.stereotype.Service; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/AllergyIntolerance.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/AllergyIntolerance.java index bc1d2fdd..fd7e1580 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/AllergyIntolerance.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/AllergyIntolerance.java @@ -1,17 +1,15 @@ package com.openhis.clinical.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; + /** * 过敏与不耐受Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java index 8b36ec42..3ad69a0c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java @@ -1,16 +1,15 @@ package com.openhis.clinical.domain; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; + /** * 疾病与诊断管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java index 71f0f588..fb4f688a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/DiagnosisBelongBinding.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/DiagnosisBelongBinding.java index 7550ec43..5f6dc617 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/DiagnosisBelongBinding.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/DiagnosisBelongBinding.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java index 4208c61c..ec98bbbf 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java @@ -1,16 +1,15 @@ package com.openhis.clinical.domain; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; + /** * 手术与医嘱管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ProcedurePerformer.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ProcedurePerformer.java index 94fac9e7..1df84e57 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ProcedurePerformer.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ProcedurePerformer.java @@ -1,16 +1,15 @@ package com.openhis.clinical.domain; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; + /** * 手术与医嘱执行人管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ReservationRecord.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ReservationRecord.java index 72f50b2c..b76def9f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ReservationRecord.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ReservationRecord.java @@ -1,16 +1,15 @@ package com.openhis.clinical.domain; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; + /** * 门诊预约记录Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Surgery.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Surgery.java new file mode 100644 index 00000000..7d81e6b5 --- /dev/null +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Surgery.java @@ -0,0 +1,160 @@ +package com.openhis.clinical.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.core.common.core.domain.HisBaseEntity; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 手术管理Entity实体 + * + * @author system + * @date 2025-12-30 + */ +@Data +@TableName("cli_surgery") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +public class Surgery extends HisBaseEntity { + + /** ID */ + @TableId(type = IdType.ASSIGN_ID) + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** 手术编号 */ + private String surgeryNo; + + /** 患者ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long patientId; + + /** 就诊ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long encounterId; + + /** 手术名称 */ + private String surgeryName; + + /** 手术编码 */ + private String surgeryCode; + + /** 手术类型编码 */ + private Integer surgeryTypeEnum; + + /** 手术等级 */ + private Integer surgeryLevel; + + /** 手术状态 */ + private Integer statusEnum; + + /** 计划手术时间 */ + private Date plannedTime; + + /** 实际开始时间 */ + private Date actualStartTime; + + /** 实际结束时间 */ + private Date actualEndTime; + + /** 主刀医生ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long mainSurgeonId; + + /** 主刀医生姓名 */ + private String mainSurgeonName; + + /** 助手1 ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long assistant1Id; + + /** 助手1 姓名 */ + private String assistant1Name; + + /** 助手2 ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long assistant2Id; + + /** 助手2 姓名 */ + private String assistant2Name; + + /** 麻醉医生ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long anesthetistId; + + /** 麻醉医生姓名 */ + private String anesthetistName; + + /** 巡回护士ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long scrubNurseId; + + /** 巡回护士姓名 */ + private String scrubNurseName; + + /** 麻醉方式编码 */ + private Integer anesthesiaTypeEnum; + + /** 手术部位 */ + private String bodySite; + + /** 手术切口等级 */ + private Integer incisionLevel; + + /** 手术切口愈合等级 */ + private Integer healingLevel; + + /** 手术室 */ + @JsonSerialize(using = ToStringSerializer.class) + private Long operatingRoomId; + + /** 手术室名称 */ + private String operatingRoomName; + + /** 执行科室ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long orgId; + + /** 执行科室名称 */ + private String orgName; + + /** 术前诊断 */ + private String preoperativeDiagnosis; + + /** 术后诊断 */ + private String postoperativeDiagnosis; + + /** 手术经过描述 */ + private String surgeryDescription; + + /** 术后医嘱 */ + private String postoperativeAdvice; + + /** 并发症描述 */ + private String complications; + + /** 手术费用 */ + private BigDecimal surgeryFee; + + /** 麻醉费用 */ + private BigDecimal anesthesiaFee; + + /** 总费用 */ + private BigDecimal totalFee; + + /** 备注信息 */ + private String remark; + + /** 租户ID（表不存在此字段，仅用于继承基类） */ + @TableField(exist = false) + private Integer tenantId; +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/AllergyIntoleranceMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/AllergyIntoleranceMapper.java index bd8b9eea..b8714998 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/AllergyIntoleranceMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/AllergyIntoleranceMapper.java @@ -1,9 +1,8 @@ package com.openhis.clinical.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.clinical.domain.AllergyIntolerance; +import org.springframework.stereotype.Repository; /** * 过敏与不耐受Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionDefinitionMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionDefinitionMapper.java index b6f0542f..10d32a94 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionDefinitionMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionDefinitionMapper.java @@ -1,9 +1,8 @@ package com.openhis.clinical.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.clinical.domain.ConditionDefinition; +import org.springframework.stereotype.Repository; /** * 诊断定义管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionMapper.java index b0b62198..cd344b89 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionMapper.java @@ -1,10 +1,9 @@ package com.openhis.clinical.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.clinical.domain.Condition; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; /** * 疾病与诊断管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionNoDefinitionMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionNoDefinitionMapper.java index dfb9b66d..a53eb696 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionNoDefinitionMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionNoDefinitionMapper.java @@ -1,7 +1,6 @@ package com.openhis.clinical.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.openhis.clinical.domain.Condition; import com.openhis.clinical.domain.ConditionNoDefinition; import org.springframework.stereotype.Repository; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/DiagnosisBelongBindingMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/DiagnosisBelongBindingMapper.java index 1539d197..209bed04 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/DiagnosisBelongBindingMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/DiagnosisBelongBindingMapper.java @@ -1,9 +1,8 @@ package com.openhis.clinical.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.clinical.domain.DiagnosisBelongBinding; +import org.springframework.stereotype.Repository; /** * 诊断归属绑定Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedureMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedureMapper.java index 82fcb694..ec2ab5de 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedureMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedureMapper.java @@ -1,9 +1,8 @@ package com.openhis.clinical.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.clinical.domain.Procedure; +import org.springframework.stereotype.Repository; /** * 手术与治疗管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedurePerformerMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedurePerformerMapper.java index caa80be6..4ee81551 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedurePerformerMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedurePerformerMapper.java @@ -1,9 +1,8 @@ package com.openhis.clinical.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.clinical.domain.ProcedurePerformer; +import org.springframework.stereotype.Repository; /** * 手术与治疗执行人管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ReservationRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ReservationRecordMapper.java index 7c4cc7b3..c4b14107 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ReservationRecordMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ReservationRecordMapper.java @@ -1,9 +1,8 @@ package com.openhis.clinical.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.clinical.domain.ReservationRecord; +import org.springframework.stereotype.Repository; /** * 门诊预约记录Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/SurgeryMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/SurgeryMapper.java new file mode 100644 index 00000000..eb4f66bb --- /dev/null +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/SurgeryMapper.java @@ -0,0 +1,42 @@ +package com.openhis.clinical.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.openhis.clinical.domain.Surgery; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 手术管理Mapper接口 + * + * @author system + * @date 2025-12-30 + */ +@Mapper +public interface SurgeryMapper extends BaseMapper { + + /** + * 根据患者ID查询手术列表 + * + * @param patientId 患者ID + * @return 手术列表 + */ + List selectByPatientId(@Param("patientId") Long patientId); + + /** + * 根据就诊ID查询手术列表 + * + * @param encounterId 就诊ID + * @return 手术列表 + */ + List selectByEncounterId(@Param("encounterId") Long encounterId); + + /** + * 根据手术编号查询 + * + * @param surgeryNo 手术编号 + * @return 手术信息 + */ + Surgery selectBySurgeryNo(@Param("surgeryNo") String surgeryNo); +} 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 944593bd..a597ae2a 100644 --- 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 @@ -1,12 +1,11 @@ package com.openhis.clinical.service; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.clinical.domain.ConditionDefinition; +import javax.servlet.http.HttpServletRequest; +import java.util.List; + /** * 诊断定义管理Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionNoDefinitionService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionNoDefinitionService.java index 76b027bb..41cc5525 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionNoDefinitionService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionNoDefinitionService.java @@ -1,7 +1,6 @@ package com.openhis.clinical.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.openhis.clinical.domain.ConditionDefinition; import com.openhis.clinical.domain.ConditionNoDefinition; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IDiagnosisBelongBindingService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IDiagnosisBelongBindingService.java index f08f08ae..e9ddc3a8 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IDiagnosisBelongBindingService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IDiagnosisBelongBindingService.java @@ -1,7 +1,6 @@ package com.openhis.clinical.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.core.common.core.domain.R; import com.openhis.clinical.domain.DiagnosisBelongBinding; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedurePerformerService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedurePerformerService.java index f6a954df..6f30233c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedurePerformerService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedurePerformerService.java @@ -1,11 +1,10 @@ package com.openhis.clinical.service; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.clinical.domain.ProcedurePerformer; +import java.util.Date; + /** * 手术与治疗执行人管理Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedureService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedureService.java index 2ccf0b57..dda1d4e5 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedureService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedureService.java @@ -1,14 +1,14 @@ package com.openhis.clinical.service; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.clinical.domain.Procedure; import com.openhis.common.enums.EventStatus; import com.openhis.common.enums.ProcedureCategory; import com.openhis.medication.domain.MedicationRequest; +import java.util.Date; +import java.util.List; + /** * 手术与治疗管理Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/ISurgeryService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/ISurgeryService.java new file mode 100644 index 00000000..bfc52ec9 --- /dev/null +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/ISurgeryService.java @@ -0,0 +1,72 @@ +package com.openhis.clinical.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.openhis.clinical.domain.Surgery; + +import java.util.List; + +/** + * 手术管理Service接口 + * + * @author system + * @date 2025-12-30 + */ +public interface ISurgeryService extends IService { + + /** + * 新增手术信息 + * + * @param surgery 手术信息 + * @return 手术ID + */ + Long insertSurgery(Surgery surgery); + + /** + * 修改手术信息 + * + * @param surgery 手术信息 + * @return 结果 + */ + boolean updateSurgery(Surgery surgery); + + /** + * 删除手术信息 + * + * @param id 手术ID + * @return 结果 + */ + boolean deleteSurgery(Long id); + + /** + * 根据ID查询手术信息 + * + * @param id 手术ID + * @return 手术信息 + */ + Surgery getSurgeryById(Long id); + + /** + * 根据患者ID查询手术列表 + * + * @param patientId 患者ID + * @return 手术列表 + */ + List getSurgeryListByPatientId(Long patientId); + + /** + * 根据就诊ID查询手术列表 + * + * @param encounterId 就诊ID + * @return 手术列表 + */ + List getSurgeryListByEncounterId(Long encounterId); + + /** + * 更新手术状态 + * + * @param id 手术ID + * @param statusEnum 状态 + * @return 结果 + */ + boolean updateSurgeryStatus(Long id, Integer statusEnum); +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/AllergyIntoleranceServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/AllergyIntoleranceServiceImpl.java index e347ec70..88fa2d8c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/AllergyIntoleranceServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/AllergyIntoleranceServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.clinical.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.clinical.domain.AllergyIntolerance; import com.openhis.clinical.mapper.AllergyIntoleranceMapper; import com.openhis.clinical.service.IAllergyIntoleranceService; +import org.springframework.stereotype.Service; /** * 过敏与不耐受Service业务层处理 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 247e5816..2e30d38e 100644 --- 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 @@ -1,25 +1,22 @@ package com.openhis.clinical.service.impl; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.core.common.enums.DelFlag; import com.openhis.clinical.domain.ConditionDefinition; import com.openhis.clinical.mapper.ConditionDefinitionMapper; import com.openhis.clinical.service.IConditionDefinitionService; -import com.core.common.enums.DelFlag; import com.openhis.common.utils.HisQueryUtils; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletRequest; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; /** * 诊断定义管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionNoDefinitionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionNoDefinitionServiceImpl.java index 95d2a51c..7d3f0923 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionNoDefinitionServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionNoDefinitionServiceImpl.java @@ -1,15 +1,12 @@ package com.openhis.clinical.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.openhis.clinical.domain.ConditionDefinition; -import com.openhis.clinical.mapper.ConditionDefinitionMapper; -import com.openhis.clinical.service.IConditionDefinitionService; +import com.openhis.clinical.domain.ConditionNoDefinition; +import com.openhis.clinical.mapper.ConditionNoDefinitionMapper; import com.openhis.clinical.service.IConditionNoDefinitionService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import com.openhis.clinical.mapper.ConditionNoDefinitionMapper; -import com.openhis.clinical.domain.ConditionNoDefinition; /** * 新增国临码功能单表增删改查 * @author ws diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionServiceImpl.java index f81d7a34..0c531d57 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionServiceImpl.java @@ -1,17 +1,16 @@ package com.openhis.clinical.service.impl; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.core.common.enums.DelFlag; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.core.common.enums.DelFlag; import com.core.common.utils.SecurityUtils; import com.openhis.clinical.domain.Condition; import com.openhis.clinical.mapper.ConditionMapper; import com.openhis.clinical.service.IConditionService; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; /** * 疾病与诊断管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/DiagnosisBelongBindingServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/DiagnosisBelongBindingServiceImpl.java index 54773d62..0d88ff63 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/DiagnosisBelongBindingServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/DiagnosisBelongBindingServiceImpl.java @@ -1,14 +1,12 @@ package com.openhis.clinical.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.clinical.domain.DiagnosisBelongBinding; import com.openhis.clinical.mapper.DiagnosisBelongBindingMapper; import com.openhis.clinical.service.IDiagnosisBelongBindingService; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; /** * 诊断归属绑定Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedurePerformerServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedurePerformerServiceImpl.java index f655067e..e22a477e 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedurePerformerServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedurePerformerServiceImpl.java @@ -1,14 +1,13 @@ package com.openhis.clinical.service.impl; -import java.util.Date; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.core.common.utils.SecurityUtils; import com.openhis.clinical.domain.ProcedurePerformer; import com.openhis.clinical.mapper.ProcedurePerformerMapper; import com.openhis.clinical.service.IProcedurePerformerService; +import org.springframework.stereotype.Service; + +import java.util.Date; /** * 手术与治疗执行人管理Service业务层处理 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 72fae0c3..59bb91bf 100644 --- 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 @@ -1,12 +1,5 @@ package com.openhis.clinical.service.impl; -import java.util.Date; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.core.common.enums.DelFlag; @@ -20,6 +13,11 @@ import com.openhis.common.constant.CommonConstants; import com.openhis.common.enums.EventStatus; import com.openhis.common.enums.ProcedureCategory; import com.openhis.medication.domain.MedicationRequest; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; /** * 手术与治疗管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ReservationRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ReservationRecordServiceImpl.java index 226a49b0..18a536a8 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ReservationRecordServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ReservationRecordServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.clinical.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.clinical.domain.ReservationRecord; import com.openhis.clinical.mapper.ReservationRecordMapper; import com.openhis.clinical.service.IReservationRecordService; +import org.springframework.stereotype.Service; /** * 门诊预约记录Service业务层处理 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 new file mode 100644 index 00000000..ad444590 --- /dev/null +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/SurgeryServiceImpl.java @@ -0,0 +1,145 @@ +package com.openhis.clinical.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.core.common.utils.AssignSeqUtil; +import com.openhis.clinical.domain.Surgery; +import com.openhis.clinical.mapper.SurgeryMapper; +import com.openhis.clinical.service.ISurgeryService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +/** + * 手术管理Service业务层处理 + * + * @author system + * @date 2025-12-30 + */ +@Service +public class SurgeryServiceImpl extends ServiceImpl implements ISurgeryService { + + @Resource + private SurgeryMapper surgeryMapper; + + @Resource + private AssignSeqUtil assignSeqUtil; + + /** + * 新增手术信息 + * + * @param surgery 手术信息 + * @return 手术ID + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Long insertSurgery(Surgery surgery) { + // 生成手术编号 + String surgeryNo = assignSeqUtil.getSeq("SS", 10); + surgery.setSurgeryNo(surgeryNo); + surgery.setCreateTime(new Date()); + surgery.setUpdateTime(new Date()); + surgery.setDeleteFlag("0"); + + // 默认状态为待排期 + if (surgery.getStatusEnum() == null) { + surgery.setStatusEnum(0); + } + + surgeryMapper.insert(surgery); + return surgery.getId(); + } + + /** + * 修改手术信息 + * + * @param surgery 手术信息 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean updateSurgery(Surgery surgery) { + surgery.setUpdateTime(new Date()); + return surgeryMapper.updateById(surgery) > 0; + } + + /** + * 删除手术信息 + * + * @param id 手术ID + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean deleteSurgery(Long id) { + return surgeryMapper.deleteById(id) > 0; + } + + /** + * 根据ID查询手术信息 + * + * @param id 手术ID + * @return 手术信息 + */ + @Override + public Surgery getSurgeryById(Long id) { + return surgeryMapper.selectById(id); + } + + /** + * 根据患者ID查询手术列表 + * + * @param patientId 患者ID + * @return 手术列表 + */ + @Override + public List getSurgeryListByPatientId(Long patientId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(Surgery::getPatientId, patientId) + .eq(Surgery::getDeleteFlag, "0") + .orderByDesc(Surgery::getCreateTime); + return surgeryMapper.selectList(wrapper); + } + + /** + * 根据就诊ID查询手术列表 + * + * @param encounterId 就诊ID + * @return 手术列表 + */ + @Override + public List getSurgeryListByEncounterId(Long encounterId) { + return surgeryMapper.selectByEncounterId(encounterId); + } + + /** + * 更新手术状态 + * + * @param id 手术ID + * @param statusEnum 状态 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean updateSurgeryStatus(Long id, Integer statusEnum) { + Surgery surgery = new Surgery(); + surgery.setId(id); + surgery.setStatusEnum(statusEnum); + surgery.setUpdateTime(new Date()); + + // 如果状态为手术中，更新开始时间 + if (statusEnum == 2) { + surgery.setActualStartTime(new Date()); + } + + // 如果状态为已完成，更新结束时间 + if (statusEnum == 3) { + surgery.setActualEndTime(new Date()); + } + + return surgeryMapper.updateById(surgery) > 0; + } +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisApplyDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisApplyDto.java index 20b7cc2b..47faea03 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisApplyDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/LisApplyDto.java @@ -1,15 +1,14 @@ package com.openhis.crosssystem.dto; -import java.util.Date; -import java.util.List; - import com.openhis.crosssystem.enums.LisOutsideFlg; import com.openhis.crosssystem.enums.LisPatientSex; import com.openhis.crosssystem.enums.LisPatientType; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; +import java.util.List; + /** * LIS申请参数 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/PacsApplyDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/PacsApplyDto.java index b6d7f4bb..e812ba5f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/PacsApplyDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/dto/PacsApplyDto.java @@ -1,13 +1,12 @@ package com.openhis.crosssystem.dto; -import java.util.Date; - import com.openhis.crosssystem.enums.PacsPatientSex; import com.openhis.crosssystem.enums.PacsPatientType; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * PACS申请参数 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/utils/CrossSystemSendApplyUtil.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/utils/CrossSystemSendApplyUtil.java index 3d9fed78..bbda5a9b 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/utils/CrossSystemSendApplyUtil.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/crosssystem/utils/CrossSystemSendApplyUtil.java @@ -1,20 +1,5 @@ package com.openhis.crosssystem.utils; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; -import java.util.stream.Collectors; - -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.ContentType; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.util.EntityUtils; -import org.springframework.stereotype.Component; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.core.common.enums.TenantOptionDict; @@ -26,8 +11,21 @@ import com.openhis.common.utils.CommonUtil; import com.openhis.crosssystem.dto.*; import com.openhis.crosssystem.enums.LisAgeUnit; import com.openhis.crosssystem.enums.PacsAgeUnit; - import lombok.extern.slf4j.Slf4j; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.ContentType; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.util.EntityUtils; +import org.springframework.stereotype.Component; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.stream.Collectors; /** * 跨系统发送申请工具类 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocInventoryItemStatic.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocInventoryItemStatic.java index 199959f5..514d0cc4 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocInventoryItemStatic.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocInventoryItemStatic.java @@ -3,18 +3,17 @@ */ package com.openhis.document.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 历史库存静态记录表 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatisticsDefinition.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatisticsDefinition.java index 5bdc7b12..aed0b835 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatisticsDefinition.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatisticsDefinition.java @@ -6,8 +6,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import java.util.Date; - @Data @TableName("doc_statistics_definition") @Accessors(chain = true) diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocTemplate.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocTemplate.java index 9cf6aedb..e52c60f4 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocTemplate.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocTemplate.java @@ -2,7 +2,6 @@ package com.openhis.document.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/Emr.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/Emr.java index cd4a85bb..51728e6e 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/Emr.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/Emr.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrDetail.java index 14e19e31..1bb44136 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrDetail.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrDetail.java @@ -1,12 +1,8 @@ package com.openhis.document.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrDict.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrDict.java index 853824ec..ce000032 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrDict.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrDict.java @@ -1,12 +1,8 @@ package com.openhis.document.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrTemplate.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrTemplate.java index 2a1763d1..87ecffc7 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrTemplate.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrTemplate.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/OrderProcess.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/OrderProcess.java index 931d9e30..34ea6477 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/OrderProcess.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/OrderProcess.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/RequestForm.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/RequestForm.java index 956ac422..e52ffd07 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/RequestForm.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/RequestForm.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/VitalSigns.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/VitalSigns.java index 7b5c411c..953513ed 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/VitalSigns.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/VitalSigns.java @@ -1,16 +1,15 @@ package com.openhis.document.domain; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; + /** * 生命体征管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionMapper.java index 9aca1cf0..9b2697d6 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionMapper.java @@ -1,10 +1,9 @@ package com.openhis.document.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.document.domain.DocDefinition; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - @Repository public interface DocDefinitionMapper extends BaseMapper { } diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionOrganizationMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionOrganizationMapper.java index 38373714..c7ff7cae 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionOrganizationMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionOrganizationMapper.java @@ -1,7 +1,6 @@ package com.openhis.document.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.openhis.document.domain.DocDefinition; import com.openhis.document.domain.DocDefinitionOrganization; import org.springframework.stereotype.Repository; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocInventoryItemStaticMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocInventoryItemStaticMapper.java index e1a9b714..46e9b83d 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocInventoryItemStaticMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocInventoryItemStaticMapper.java @@ -3,10 +3,9 @@ */ package com.openhis.document.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.document.domain.DocInventoryItemStatic; +import org.springframework.stereotype.Repository; /** * 历史库存静态记录 mapper diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsMapper.java index 36d33f81..5cdb1bf2 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsMapper.java @@ -1,13 +1,12 @@ package com.openhis.document.mapper; -import java.util.List; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.openhis.document.domain.DocStatistics; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.openhis.document.domain.DocStatistics; +import java.util.List; @Repository public interface DocStatisticsMapper extends BaseMapper { diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocTemplateMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocTemplateMapper.java index ffc03c7a..ba52f97f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocTemplateMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocTemplateMapper.java @@ -2,7 +2,6 @@ package com.openhis.document.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.openhis.document.domain.DocRecord; import com.openhis.document.domain.DocTemplate; import org.springframework.stereotype.Repository; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDetailMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDetailMapper.java index d824360e..603f874a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDetailMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDetailMapper.java @@ -1,9 +1,8 @@ package com.openhis.document.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.document.domain.EmrDetail; +import org.springframework.stereotype.Repository; /** * 电子病历详情Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDictMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDictMapper.java index 264778ee..e99414e8 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDictMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDictMapper.java @@ -1,9 +1,8 @@ package com.openhis.document.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.document.domain.EmrDict; +import org.springframework.stereotype.Repository; /** * 电子病历字典Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrMapper.java index 8a66627a..005adde6 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrMapper.java @@ -1,9 +1,8 @@ package com.openhis.document.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.document.domain.Emr; +import org.springframework.stereotype.Repository; /** * 病历信息Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrTemplateMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrTemplateMapper.java index 23ef1433..9e6fb8bc 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrTemplateMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrTemplateMapper.java @@ -1,9 +1,8 @@ package com.openhis.document.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.document.domain.EmrTemplate; +import org.springframework.stereotype.Repository; /** * 病历模板Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/OrderProcessMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/OrderProcessMapper.java index 3968bf29..f09cc879 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/OrderProcessMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/OrderProcessMapper.java @@ -1,11 +1,9 @@ package com.openhis.document.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.document.domain.OrderProcess; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.openhis.document.domain.Emr; - /** * 医嘱过程Mapper接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/RequestFormMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/RequestFormMapper.java index 4875a25c..1c64b377 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/RequestFormMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/RequestFormMapper.java @@ -1,9 +1,8 @@ package com.openhis.document.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.document.domain.RequestForm; +import org.springframework.stereotype.Repository; /** * 申请单管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/VitalSignsMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/VitalSignsMapper.java index ade53455..ab9abe05 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/VitalSignsMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/VitalSignsMapper.java @@ -1,9 +1,8 @@ package com.openhis.document.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.document.domain.VitalSigns; +import org.springframework.stereotype.Repository; /** * 生命体征管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocInventoryItemStaticService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocInventoryItemStaticService.java index 420f1f22..3bd6315a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocInventoryItemStaticService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocInventoryItemStaticService.java @@ -3,11 +3,11 @@ */ package com.openhis.document.service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.document.domain.DocInventoryItemStatic; +import java.util.List; + /** * 历史库存静态记录接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IVitalSignsService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IVitalSignsService.java index deb2e066..c7efe3a9 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IVitalSignsService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IVitalSignsService.java @@ -1,10 +1,10 @@ package com.openhis.document.service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.document.domain.VitalSigns; +import java.util.List; + /** * 生命体征管理Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionOrganizationServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionOrganizationServiceImpl.java index 349b1f54..dfc74419 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionOrganizationServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionOrganizationServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.document.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.document.domain.DocDefinitionOrganization; import com.openhis.document.mapper.DocDefinitionOrganizationMapper; import com.openhis.document.service.IDocDefinitionOrganizationService; +import org.springframework.stereotype.Service; @Service public class DocDefinitionOrganizationServiceImpl diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionServiceImpl.java index fc194738..2b349d0b 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.document.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.document.domain.DocDefinition; import com.openhis.document.mapper.DocDefinitionMapper; import com.openhis.document.service.IDocDefinitionService; +import org.springframework.stereotype.Service; @Service public class DocDefinitionServiceImpl extends ServiceImpl diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocInventoryItemStaticServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocInventoryItemStaticServiceImpl.java index b419cb81..711baebf 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocInventoryItemStaticServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocInventoryItemStaticServiceImpl.java @@ -3,16 +3,15 @@ */ package com.openhis.document.service.impl; -import java.util.List; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.core.common.enums.DelFlag; import com.openhis.document.domain.DocInventoryItemStatic; import com.openhis.document.mapper.DocInventoryItemStaticMapper; import com.openhis.document.service.IDocInventoryItemStaticService; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 历史库存静态记录接口实现类 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocRecordServiceImpl.java index e2cbf9b0..b5124f6a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocRecordServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocRecordServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.document.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.document.domain.DocRecord; import com.openhis.document.mapper.DocRecordMapper; import com.openhis.document.service.IDocRecordService; +import org.springframework.stereotype.Service; @Service public class DocRecordServiceImpl extends ServiceImpl implements IDocRecordService {} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionOptionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionOptionServiceImpl.java index 09e26000..16aedd0c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionOptionServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionOptionServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.document.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.document.domain.DocStatisticsDefinitionOption; import com.openhis.document.mapper.DocStatisticsDefinitionOptionMapper; import com.openhis.document.service.IDocStatisticsDefinitionOptionService; +import org.springframework.stereotype.Service; @Service public class DocStatisticsDefinitionOptionServiceImpl diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionServiceImpl.java index 9fbb7d87..cc19ef0d 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.document.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.document.domain.DocStatisticsDefinition; import com.openhis.document.mapper.DocStatisticsDefinitionMapper; import com.openhis.document.service.IDocStatisticsDefinitionService; +import org.springframework.stereotype.Service; @Service public class DocStatisticsDefinitionServiceImpl extends diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsServiceImpl.java index 6243aec8..4e703638 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.document.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.document.domain.DocStatistics; import com.openhis.document.mapper.DocStatisticsMapper; import com.openhis.document.service.IDocStatisticsService; +import org.springframework.stereotype.Service; @Service public class DocStatisticsServiceImpl extends ServiceImpl diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocTemplateServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocTemplateServiceImpl.java index ec6ea20f..eb086d73 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocTemplateServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocTemplateServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.document.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.document.domain.DocTemplate; import com.openhis.document.mapper.DocTemplateMapper; import com.openhis.document.service.IDocTemplateService; +import org.springframework.stereotype.Service; @Service public class DocTemplateServiceImpl extends ServiceImpl diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDetailServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDetailServiceImpl.java index 06232d29..01c92b1d 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDetailServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDetailServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.document.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.document.domain.EmrDetail; import com.openhis.document.mapper.EmrDetailMapper; import com.openhis.document.service.IEmrDetailService; +import org.springframework.stereotype.Service; /** * 电子病历详情Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDictServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDictServiceImpl.java index c7026e2a..4f4793f9 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDictServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDictServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.document.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.document.domain.EmrDict; import com.openhis.document.mapper.EmrDictMapper; import com.openhis.document.service.IEmrDictService; +import org.springframework.stereotype.Service; /** * 电子病历字典Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrServiceImpl.java index d919d34f..0a69fbdc 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.document.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.document.domain.Emr; import com.openhis.document.mapper.EmrMapper; import com.openhis.document.service.IEmrService; +import org.springframework.stereotype.Service; /** * 病历信息Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrTemplateServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrTemplateServiceImpl.java index e2ca43c5..af0a4105 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrTemplateServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrTemplateServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.document.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.document.domain.EmrTemplate; import com.openhis.document.mapper.EmrTemplateMapper; import com.openhis.document.service.IEmrTemplateService; +import org.springframework.stereotype.Service; /** * 病历模板Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/OrderProcessServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/OrderProcessServiceImpl.java index 544b788f..c3aeda25 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/OrderProcessServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/OrderProcessServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.document.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.document.domain.OrderProcess; import com.openhis.document.mapper.OrderProcessMapper; import com.openhis.document.service.IOrderProcessService; +import org.springframework.stereotype.Service; /** * 医嘱过程Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/RequestFormServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/RequestFormServiceImpl.java index 2abcdcca..15d38533 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/RequestFormServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/RequestFormServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.document.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.document.domain.RequestForm; import com.openhis.document.mapper.RequestFormMapper; import com.openhis.document.service.IRequestFormService; +import org.springframework.stereotype.Service; /** * 申请单管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/VitalSignsServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/VitalSignsServiceImpl.java index f1a93ab2..8d44a608 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/VitalSignsServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/VitalSignsServiceImpl.java @@ -1,14 +1,13 @@ package com.openhis.document.service.impl; -import java.util.List; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.document.domain.VitalSigns; import com.openhis.document.mapper.VitalSignsMapper; import com.openhis.document.service.IVitalSignsService; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 就诊位置管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java index 71a101cf..2f118f3e 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java @@ -1,18 +1,16 @@ package com.openhis.financial.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import com.openhis.common.enums.ClaimUse; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; + /** * 索赔管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/ClaimResponse.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/ClaimResponse.java index 2ef17034..aeeb1a08 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/ClaimResponse.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/ClaimResponse.java @@ -1,17 +1,15 @@ package com.openhis.financial.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 索赔响应管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/Contract.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/Contract.java index 831be86c..17bc5be7 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/Contract.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/Contract.java @@ -1,12 +1,8 @@ package com.openhis.financial.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java index 948dfc06..024f7242 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java @@ -1,17 +1,15 @@ package com.openhis.financial.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 合同管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecDetail.java index 50f018c3..fecbc8b6 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecDetail.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecDetail.java @@ -1,17 +1,16 @@ package com.openhis.financial.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 付款管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecStatic.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecStatic.java index a15ba32e..f3b46e57 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecStatic.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecStatic.java @@ -3,17 +3,16 @@ */ package com.openhis.financial.domain; -import java.math.BigDecimal; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 付款记录的快照（用于统计报表等使用） * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java index 3e3a6f27..141bd040 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java @@ -1,18 +1,16 @@ package com.openhis.financial.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 付款管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimMapper.java index 3bce1d82..bea049c0 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimMapper.java @@ -1,9 +1,8 @@ package com.openhis.financial.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.financial.domain.Claim; +import org.springframework.stereotype.Repository; /** * 索赔管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimResponseMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimResponseMapper.java index cdbb1027..713b56c4 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimResponseMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimResponseMapper.java @@ -1,9 +1,8 @@ package com.openhis.financial.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.financial.domain.ClaimResponse; +import org.springframework.stereotype.Repository; /** * 索赔响应管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ContractMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ContractMapper.java index de823752..2042c0ab 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ContractMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ContractMapper.java @@ -1,9 +1,8 @@ package com.openhis.financial.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.financial.domain.Contract; +import org.springframework.stereotype.Repository; /** * 合同管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentNoticeMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentNoticeMapper.java index 4eed11c9..a5353487 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentNoticeMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentNoticeMapper.java @@ -1,9 +1,8 @@ package com.openhis.financial.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.financial.domain.PaymentNotice; +import org.springframework.stereotype.Repository; /** * 合同管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecDetailMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecDetailMapper.java index e049d411..bf7f057f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecDetailMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecDetailMapper.java @@ -1,13 +1,12 @@ package com.openhis.financial.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.financial.domain.PaymentRecDetail; import com.openhis.financial.model.PaymentRecDetailAccountResult; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 付款管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecStaticMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecStaticMapper.java index c8b8cd42..9fa0b881 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecStaticMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecStaticMapper.java @@ -3,10 +3,9 @@ */ package com.openhis.financial.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.financial.domain.PaymentRecStatic; +import org.springframework.stereotype.Repository; /** * 付款管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentReconciliationMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentReconciliationMapper.java index ad66bf03..bec35132 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentReconciliationMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentReconciliationMapper.java @@ -1,13 +1,12 @@ package com.openhis.financial.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.financial.domain.PaymentReconciliation; import com.openhis.financial.model.PaymentReconciliationAccountDel; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 付款管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ThreePartPayCallBackMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ThreePartPayCallBackMapper.java index 288c692e..c3d1f6fc 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ThreePartPayCallBackMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ThreePartPayCallBackMapper.java @@ -1,7 +1,6 @@ package com.openhis.financial.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.openhis.financial.domain.ClaimResponse; import com.openhis.financial.domain.ThreePartPayCallBack; import org.springframework.stereotype.Repository; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentRecDetailAccountResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentRecDetailAccountResult.java index b554842f..37bca314 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentRecDetailAccountResult.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentRecDetailAccountResult.java @@ -3,15 +3,14 @@ */ package com.openhis.financial.model; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 付款详情与账户信息实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentRecDetailDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentRecDetailDto.java index 5c940c8a..68d1c73d 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentRecDetailDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentRecDetailDto.java @@ -1,8 +1,5 @@ package com.openhis.financial.model; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import liquibase.pro.packaged.D; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentReconciliationAccountDel.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentReconciliationAccountDel.java index 2dc984b7..e441519e 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentReconciliationAccountDel.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentReconciliationAccountDel.java @@ -1,14 +1,13 @@ package com.openhis.financial.model; -import java.math.BigDecimal; -import java.util.Date; - import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 付款管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentedItemModel.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentedItemModel.java index 99f420c2..ed7444a3 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentedItemModel.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentedItemModel.java @@ -1,10 +1,10 @@ package com.openhis.financial.model; +import lombok.Data; + import java.math.BigDecimal; import java.util.Date; -import lombok.Data; - @Data public class PaymentedItemModel { /** 就诊id */ diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResult.java index d0cbe50f..c04004b5 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResult.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResult.java @@ -1,13 +1,12 @@ package com.openhis.financial.model; -import java.math.BigDecimal; -import java.util.List; - import com.alibaba.fastjson2.annotation.JSONField; import com.openhis.yb.dto.Clinic2206FundPaymentResult; - import lombok.Data; +import java.math.BigDecimal; +import java.util.List; + @Data public class PrePaymentResult { diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResultModel.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResultModel.java index 7e3c2329..f57c8397 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResultModel.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResultModel.java @@ -1,14 +1,9 @@ package com.openhis.financial.model; -import com.openhis.financial.domain.PaymentRecDetail; import com.openhis.financial.domain.PaymentReconciliation; -import com.openhis.financial.mapper.PaymentReconciliationMapper; -import com.openhis.yb.dto.Clinic2206FundPaymentResult; import lombok.Data; import lombok.experimental.Accessors; -import java.math.BigDecimal; -import java.util.Date; import java.util.List; @Data diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/StudentPaymentItemModel.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/StudentPaymentItemModel.java index 5eb03d1b..e5a4145d 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/StudentPaymentItemModel.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/StudentPaymentItemModel.java @@ -1,9 +1,9 @@ package com.openhis.financial.model; -import java.math.BigDecimal; - import lombok.Data; +import java.math.BigDecimal; + @Data public class StudentPaymentItemModel extends PaymentedItemModel { diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IContractService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IContractService.java index 77c54008..454b6ab6 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IContractService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IContractService.java @@ -1,11 +1,11 @@ package com.openhis.financial.service; -import java.util.List; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.financial.domain.Contract; +import java.util.List; + /** * 合同管理Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecDetailService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecDetailService.java index 0e87842e..78144fd1 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecDetailService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecDetailService.java @@ -1,12 +1,12 @@ package com.openhis.financial.service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.common.enums.PaymentResult; import com.openhis.financial.domain.PaymentRecDetail; import com.openhis.financial.model.PaymentRecDetailAccountResult; +import java.util.List; + /** * 付款管理Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecStaticService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecStaticService.java index 64307610..b61301f5 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecStaticService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecStaticService.java @@ -3,14 +3,14 @@ */ package com.openhis.financial.service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.administration.dto.ChargeItemDefInfo; import com.openhis.common.enums.PaymentStatisticalMethod; import com.openhis.common.enums.PaymentType; import com.openhis.financial.domain.PaymentRecStatic; +import java.util.List; + /** * 付款管理Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentReconciliationService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentReconciliationService.java index c13e9b63..4ca41c3f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentReconciliationService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentReconciliationService.java @@ -1,7 +1,5 @@ package com.openhis.financial.service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.common.enums.PaymentKind; import com.openhis.common.enums.PaymentStatus; @@ -14,6 +12,8 @@ import com.openhis.financial.model.PaymentedItemModel; import com.openhis.financial.model.PrePaymentResult; import com.openhis.yb.dto.PaymentInpatientDto; +import java.util.List; + /** * 付款管理Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ClaimResponseServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ClaimResponseServiceImpl.java index 115e57f6..72241bc9 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ClaimResponseServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ClaimResponseServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.financial.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.financial.domain.ClaimResponse; import com.openhis.financial.mapper.ClaimResponseMapper; import com.openhis.financial.service.IClaimResponseService; +import org.springframework.stereotype.Service; /** * 索赔响应管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ClaimServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ClaimServiceImpl.java index f3ca190c..cbe08ec1 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ClaimServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ClaimServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.financial.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.financial.domain.Claim; import com.openhis.financial.mapper.ClaimMapper; import com.openhis.financial.service.IClaimService; +import org.springframework.stereotype.Service; /** * 索赔管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ContractServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ContractServiceImpl.java index 4ba2a89f..f7391b12 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ContractServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ContractServiceImpl.java @@ -1,13 +1,5 @@ package com.openhis.financial.service.impl; -import java.util.Comparator; -import java.util.List; -import java.util.Optional; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -21,6 +13,13 @@ import com.openhis.common.enums.Whether; import com.openhis.financial.domain.Contract; import com.openhis.financial.mapper.ContractMapper; import com.openhis.financial.service.IContractService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Service; + +import java.util.Comparator; +import java.util.List; +import java.util.Optional; /** * 合同管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentNoticeServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentNoticeServiceImpl.java index 85e09d66..14c4dd90 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentNoticeServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentNoticeServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.financial.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.financial.domain.PaymentNotice; import com.openhis.financial.mapper.PaymentNoticeMapper; import com.openhis.financial.service.IPaymentNoticeService; +import org.springframework.stereotype.Service; /** * 合同管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecDetailServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecDetailServiceImpl.java index c7af6273..08ace586 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecDetailServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecDetailServiceImpl.java @@ -1,9 +1,5 @@ package com.openhis.financial.service.impl; -import java.util.List; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.common.enums.PaymentResult; @@ -11,6 +7,9 @@ import com.openhis.financial.domain.PaymentRecDetail; import com.openhis.financial.mapper.PaymentRecDetailMapper; import com.openhis.financial.model.PaymentRecDetailAccountResult; import com.openhis.financial.service.IPaymentRecDetailService; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 付款管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecStaticServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecStaticServiceImpl.java index 362128bc..e630d46f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecStaticServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecStaticServiceImpl.java @@ -3,14 +3,6 @@ */ package com.openhis.financial.service.impl; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import org.springframework.stereotype.Service; - import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.administration.dto.ChargeItemDefInfo; @@ -19,6 +11,13 @@ import com.openhis.common.enums.PaymentType; import com.openhis.financial.domain.PaymentRecStatic; import com.openhis.financial.mapper.PaymentRecStaticMapper; import com.openhis.financial.service.IPaymentRecStaticService; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 付款管理Service业务层处理 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 90abc3e0..67a4407b 100644 --- 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 @@ -1,22 +1,9 @@ package com.openhis.financial.service.impl; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.core.common.enums.DelFlag; import com.core.common.exception.ServiceException; import com.core.common.utils.AssignSeqUtil; import com.core.common.utils.SecurityUtils; @@ -32,7 +19,6 @@ import com.openhis.administration.service.impl.PatientServiceImpl; import com.openhis.administration.service.impl.PatientStudentServiceImpl; import com.openhis.common.constant.CommonConstants; import com.openhis.common.constant.YbCommonConstants; -import com.core.common.enums.DelFlag; import com.openhis.common.enums.ItemType; import com.openhis.common.enums.PaymentKind; import com.openhis.common.enums.PaymentStatus; @@ -58,6 +44,18 @@ import com.openhis.yb.dto.PaymentInpatientDto; import com.openhis.yb.dto.Yb2304OutputSetlInfo; import com.openhis.yb.model.Clinic2207OrderModel; import com.openhis.yb.service.YbManager; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 付款管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ThreePartPayCallBackServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ThreePartPayCallBackServiceImpl.java index d1484a79..fca846fa 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ThreePartPayCallBackServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ThreePartPayCallBackServiceImpl.java @@ -1,7 +1,5 @@ package com.openhis.financial.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.core.common.enums.DelFlag; @@ -9,6 +7,7 @@ import com.openhis.common.constant.YbCommonConstants; import com.openhis.financial.domain.ThreePartPayCallBack; import com.openhis.financial.mapper.ThreePartPayCallBackMapper; import com.openhis.financial.service.ThreePartPayCallBackService; +import org.springframework.stereotype.Service; @Service public class ThreePartPayCallBackServiceImpl extends ServiceImpl diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/jlau/domain/ReviewPrescriptionRecords.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/jlau/domain/ReviewPrescriptionRecords.java index 4f49bf24..dc7f74ed 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/jlau/domain/ReviewPrescriptionRecords.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/jlau/domain/ReviewPrescriptionRecords.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/jlau/mapper/ReviewPrescriptionRecordsMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/jlau/mapper/ReviewPrescriptionRecordsMapper.java index 4c06e5da..d1edd871 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/jlau/mapper/ReviewPrescriptionRecordsMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/jlau/mapper/ReviewPrescriptionRecordsMapper.java @@ -1,9 +1,8 @@ package com.openhis.jlau.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.jlau.domain.ReviewPrescriptionRecords; +import org.springframework.stereotype.Repository; /** * 农大审方记录Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/jlau/service/impl/ReviewPrescriptionRecordsServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/jlau/service/impl/ReviewPrescriptionRecordsServiceImpl.java index 12ba0486..0c4cd552 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/jlau/service/impl/ReviewPrescriptionRecordsServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/jlau/service/impl/ReviewPrescriptionRecordsServiceImpl.java @@ -1,13 +1,11 @@ package com.openhis.jlau.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.jlau.domain.ReviewPrescriptionRecords; import com.openhis.jlau.mapper.ReviewPrescriptionRecordsMapper; import com.openhis.jlau.service.IReviewPrescriptionRecordsService; - import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; /** * 农大审方记录Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/ActivityDefDeviceDef.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/ActivityDefDeviceDef.java index 1923feab..b9176fa4 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/ActivityDefDeviceDef.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/ActivityDefDeviceDef.java @@ -1,12 +1,8 @@ package com.openhis.lab.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/ActivityDefObservationDef.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/ActivityDefObservationDef.java index da73e551..44fc2090 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/ActivityDefObservationDef.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/ActivityDefObservationDef.java @@ -1,12 +1,8 @@ package com.openhis.lab.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/ActivityDefSpecimenDef.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/ActivityDefSpecimenDef.java index 87a91efa..e4a17255 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/ActivityDefSpecimenDef.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/ActivityDefSpecimenDef.java @@ -1,12 +1,8 @@ package com.openhis.lab.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionPackage.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionPackage.java index 1608bfaa..3b9f2ebf 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionPackage.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionPackage.java @@ -1,10 +1,6 @@ package com.openhis.lab.domain; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionPackageDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionPackageDetail.java index a5fc2e76..68aa30b2 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionPackageDetail.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionPackageDetail.java @@ -1,10 +1,6 @@ package com.openhis.lab.domain; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionType.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionType.java index 1b36f527..11f82b36 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionType.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionType.java @@ -1,10 +1,6 @@ package com.openhis.lab.domain; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/Observation.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/Observation.java index 1615ca4f..1add37bb 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/Observation.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/Observation.java @@ -1,12 +1,8 @@ package com.openhis.lab.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -14,6 +10,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; + /** * 【请填写功能名称】Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/Specimen.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/Specimen.java index 67140179..349bddea 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/Specimen.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/Specimen.java @@ -1,19 +1,15 @@ package com.openhis.lab.domain; -import java.math.BigDecimal; -import java.util.Date; - - import com.baomidou.mybatisplus.annotation.*; import com.core.common.core.domain.HisBaseEntity; - - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; + /** * 【请填写功能名称】Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ActivityDefDeviceDefMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ActivityDefDeviceDefMapper.java index e9139bbe..c75ecbe3 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ActivityDefDeviceDefMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ActivityDefDeviceDefMapper.java @@ -1,9 +1,8 @@ package com.openhis.lab.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.lab.domain.ActivityDefDeviceDef; +import org.springframework.stereotype.Repository; /** * 耗材和设备定义Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ActivityDefObservationDefMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ActivityDefObservationDefMapper.java index 01317de9..6aa626c5 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ActivityDefObservationDefMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ActivityDefObservationDefMapper.java @@ -1,9 +1,8 @@ package com.openhis.lab.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.lab.domain.ActivityDefObservationDef; +import org.springframework.stereotype.Repository; /** * 观测指标定义Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ActivityDefSpecimenDefMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ActivityDefSpecimenDefMapper.java index 382603ac..4598932e 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ActivityDefSpecimenDefMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ActivityDefSpecimenDefMapper.java @@ -1,9 +1,8 @@ package com.openhis.lab.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.lab.domain.ActivityDefSpecimenDef; +import org.springframework.stereotype.Repository; /** * 样本定义Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ObservationMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ObservationMapper.java index 42537c24..5c387bef 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ObservationMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ObservationMapper.java @@ -1,9 +1,8 @@ package com.openhis.lab.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.lab.domain.Observation; +import org.springframework.stereotype.Repository; /** * 【请填写功能名称】Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/SpecimenMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/SpecimenMapper.java index 5d37bd94..bb198782 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/SpecimenMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/SpecimenMapper.java @@ -1,10 +1,8 @@ package com.openhis.lab.mapper; -import org.apache.ibatis.annotations.Mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.lab.domain.Specimen; +import org.apache.ibatis.annotations.Mapper; /** * 【请填写功能名称】Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ActivityDefDeviceDefServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ActivityDefDeviceDefServiceImpl.java index 2f952ca0..2e96447f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ActivityDefDeviceDefServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ActivityDefDeviceDefServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.lab.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.lab.domain.ActivityDefDeviceDef; import com.openhis.lab.mapper.ActivityDefDeviceDefMapper; import com.openhis.lab.service.IActivityDefDeviceDefService; +import org.springframework.stereotype.Service; /** * 耗材和设备定义Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ActivityDefObservationDefServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ActivityDefObservationDefServiceImpl.java index 12082ea9..7ba7b33c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ActivityDefObservationDefServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ActivityDefObservationDefServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.lab.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.lab.domain.ActivityDefObservationDef; import com.openhis.lab.mapper.ActivityDefObservationDefMapper; import com.openhis.lab.service.IActivityDefObservationDefService; +import org.springframework.stereotype.Service; /** * 观测指标定义Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ActivityDefSpecimenDefServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ActivityDefSpecimenDefServiceImpl.java index 800babf9..33e094f1 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ActivityDefSpecimenDefServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ActivityDefSpecimenDefServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.lab.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.lab.domain.ActivityDefSpecimenDef; import com.openhis.lab.mapper.ActivityDefSpecimenDefMapper; import com.openhis.lab.service.IActivityDefSpecimenDefService; +import org.springframework.stereotype.Service; /** * 样本定义Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ObservationServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ObservationServiceImpl.java index 02ae1898..c2627825 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ObservationServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ObservationServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.lab.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.lab.domain.Observation; import com.openhis.lab.mapper.ObservationMapper; import com.openhis.lab.service.IObservationService; +import org.springframework.stereotype.Service; /** * 【请填写功能名称】Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/SpecimenServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/SpecimenServiceImpl.java index 2133b755..aab8aca0 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/SpecimenServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/SpecimenServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.lab.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.lab.domain.Specimen; import com.openhis.lab.mapper.SpecimenMapper; import com.openhis.lab.service.ISpecimenService; +import org.springframework.stereotype.Service; /** * 【请填写功能名称】Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java index ed398442..86fd61ad 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java @@ -1,18 +1,16 @@ package com.openhis.medication.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; -import com.openhis.common.enums.PublicationStatus; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 药品基本信息管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java index aba565ae..8bcf4cdb 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java @@ -1,17 +1,16 @@ package com.openhis.medication.domain; -import java.math.BigDecimal; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 药品定义管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java index b5844eb2..9e468e8f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java @@ -3,17 +3,16 @@ */ package com.openhis.medication.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 药品信息详情 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDispense.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDispense.java index 1bedafaf..165d0a9f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDispense.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDispense.java @@ -1,17 +1,16 @@ package com.openhis.medication.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 药品发放管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java index 9a490316..a2b1984e 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java @@ -1,17 +1,16 @@ package com.openhis.medication.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 药品请求管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationDefinitionMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationDefinitionMapper.java index e272cfa5..5d0f4891 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationDefinitionMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationDefinitionMapper.java @@ -1,9 +1,8 @@ package com.openhis.medication.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.medication.domain.MedicationDefinition; +import org.springframework.stereotype.Repository; /** * 药品定义管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationDispenseMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationDispenseMapper.java index 5a7f84ad..a0003507 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationDispenseMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationDispenseMapper.java @@ -1,9 +1,8 @@ package com.openhis.medication.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.medication.domain.MedicationDispense; +import org.springframework.stereotype.Repository; /** * 药品发放管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationRequestMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationRequestMapper.java index d935ca49..a449a57b 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationRequestMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationRequestMapper.java @@ -1,9 +1,8 @@ package com.openhis.medication.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.medication.domain.MedicationRequest; +import org.springframework.stereotype.Repository; /** * 药品请求管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDispenseService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDispenseService.java index b578626e..e448c627 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDispenseService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDispenseService.java @@ -1,12 +1,12 @@ package com.openhis.medication.service; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.medication.domain.MedicationDispense; import com.openhis.medication.domain.MedicationRequest; +import java.util.Date; +import java.util.List; + /** * 药品发放管理Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationRequestService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationRequestService.java index ccee7f7a..a57aa0a5 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationRequestService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationRequestService.java @@ -1,11 +1,11 @@ package com.openhis.medication.service; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.medication.domain.MedicationRequest; +import java.util.Date; +import java.util.List; + /** * 药品请求管理Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java index b5d2e934..843195eb 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java @@ -1,12 +1,11 @@ package com.openhis.medication.service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.medication.domain.Medication; import com.openhis.medication.domain.MedicationDetail; import com.openhis.medication.dto.AdjustPriceMedListDto; -import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 药品基本信息管理Service接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDefinitionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDefinitionServiceImpl.java index dbf89935..a6127286 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDefinitionServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDefinitionServiceImpl.java @@ -1,10 +1,5 @@ package com.openhis.medication.service.impl; -import java.util.List; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.core.common.utils.bean.BeanUtils; @@ -12,9 +7,12 @@ import com.openhis.medication.domain.MedicationDefinition; import com.openhis.medication.domain.MedicationDetail; import com.openhis.medication.mapper.MedicationDefinitionMapper; import com.openhis.medication.service.IMedicationDefinitionService; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; /** * 药品定义管理Service业务层处理 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 db5d786e..9fda4e41 100644 --- 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 @@ -1,15 +1,5 @@ package com.openhis.medication.service.impl; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.util.Date; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -17,12 +7,19 @@ import com.core.common.enums.DelFlag; import com.core.common.utils.AssignSeqUtil; import com.core.common.utils.DateUtils; import com.openhis.common.enums.AssignSeqEnum; -import com.openhis.common.enums.DbOpType; import com.openhis.common.enums.DispenseStatus; import com.openhis.medication.domain.MedicationDispense; import com.openhis.medication.domain.MedicationRequest; import com.openhis.medication.mapper.MedicationDispenseMapper; import com.openhis.medication.service.IMedicationDispenseService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.Date; +import java.util.List; /** * 药品发放管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java index 354158d2..71f35fb7 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java @@ -1,10 +1,5 @@ package com.openhis.medication.service.impl; -import java.util.Date; -import java.util.List; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -13,6 +8,10 @@ import com.openhis.common.enums.RequestStatus; import com.openhis.medication.domain.MedicationRequest; import com.openhis.medication.mapper.MedicationRequestMapper; import com.openhis.medication.service.IMedicationRequestService; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; /** * 药品请求管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java index e6ab27c1..f7697466 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java @@ -1,22 +1,20 @@ package com.openhis.medication.service.impl; -import java.util.List; - +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.core.common.enums.DelFlag; +import com.core.common.utils.bean.BeanUtils; +import com.openhis.medication.domain.Medication; +import com.openhis.medication.domain.MedicationDetail; import com.openhis.medication.dto.AdjustPriceMedListDto; +import com.openhis.medication.mapper.MedicationMapper; +import com.openhis.medication.service.IMedicationService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.core.common.utils.bean.BeanUtils; -import com.core.common.enums.DelFlag; -import com.openhis.medication.domain.Medication; -import com.openhis.medication.domain.MedicationDetail; -import com.openhis.medication.mapper.MedicationMapper; -import com.openhis.medication.service.IMedicationService; - -import lombok.extern.slf4j.Slf4j; +import java.util.List; /** * 药品基本信息管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/GfRatio.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/GfRatio.java index f6f33ab7..2acba41e 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/GfRatio.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/GfRatio.java @@ -1,17 +1,16 @@ package com.openhis.nenu.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 公费医疗自付比例管理表Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/GfRatioApplication.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/GfRatioApplication.java index 7784f2c0..30e2cf89 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/GfRatioApplication.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/GfRatioApplication.java @@ -1,17 +1,16 @@ package com.openhis.nenu.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 公费医疗自付比例调整申请表Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/TransactionResponse.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/TransactionResponse.java index 878a746b..903ffcac 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/TransactionResponse.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/TransactionResponse.java @@ -3,19 +3,17 @@ */ package com.openhis.nenu.domain; -import java.math.BigDecimal; - -import org.hibernate.validator.constraints.Length; - import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.hibernate.validator.constraints.Length; + +import java.math.BigDecimal; /** * BPC返回对象 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/dto/GfTypeRatioDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/dto/GfTypeRatioDto.java index ec38a76a..1b13d130 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/dto/GfTypeRatioDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/dto/GfTypeRatioDto.java @@ -1,11 +1,11 @@ package com.openhis.nenu.dto; -import java.math.BigDecimal; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 公费医疗-大项比例Dto * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/GfRatioApplicationMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/GfRatioApplicationMapper.java index d0006d71..6113c624 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/GfRatioApplicationMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/GfRatioApplicationMapper.java @@ -1,9 +1,8 @@ package com.openhis.nenu.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.nenu.domain.GfRatioApplication; +import org.springframework.stereotype.Repository; /** * 公费医疗自付比例调整申请表Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/GfRatioMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/GfRatioMapper.java index 7f41ad8f..49f6df24 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/GfRatioMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/GfRatioMapper.java @@ -1,9 +1,8 @@ package com.openhis.nenu.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.nenu.domain.GfRatio; +import org.springframework.stereotype.Repository; /** * 公费医疗自付比例管理表Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/TransactionResponseMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/TransactionResponseMapper.java index 2ac30faa..bde712d3 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/TransactionResponseMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/TransactionResponseMapper.java @@ -3,10 +3,9 @@ */ package com.openhis.nenu.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.nenu.domain.TransactionResponse; +import org.springframework.stereotype.Repository; /** * 中银交易记录Mapper diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/IGfRatioService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/IGfRatioService.java index 27eeec2c..84518ce5 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/IGfRatioService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/IGfRatioService.java @@ -1,11 +1,11 @@ package com.openhis.nenu.service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.nenu.domain.GfRatio; import com.openhis.nenu.dto.GfTypeRatioDto; +import java.util.List; + /** * 公费医疗自付比例管理表Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/GfRatioApplicationServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/GfRatioApplicationServiceImpl.java index 182877af..c9a1fb57 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/GfRatioApplicationServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/GfRatioApplicationServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.nenu.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.nenu.domain.GfRatioApplication; import com.openhis.nenu.mapper.GfRatioApplicationMapper; import com.openhis.nenu.service.IGfRatioApplicationService; +import org.springframework.stereotype.Service; /** * 公费医疗自付比例调整申请表Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/GfRatioServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/GfRatioServiceImpl.java index 78c19f7a..06e4db52 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/GfRatioServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/GfRatioServiceImpl.java @@ -1,15 +1,5 @@ package com.openhis.nenu.service.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; - -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.core.common.enums.DelFlag; @@ -23,6 +13,15 @@ import com.openhis.nenu.domain.GfRatio; import com.openhis.nenu.dto.GfTypeRatioDto; import com.openhis.nenu.mapper.GfRatioMapper; import com.openhis.nenu.service.IGfRatioService; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; /** * 公费医疗自付比例管理表Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/TransactionResponseServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/TransactionResponseServiceImpl.java index f0bb93de..d204c513 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/TransactionResponseServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/TransactionResponseServiceImpl.java @@ -3,12 +3,11 @@ */ package com.openhis.nenu.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.nenu.domain.TransactionResponse; import com.openhis.nenu.mapper.TransactionResponseMapper; import com.openhis.nenu.service.ITransactionResponseService; +import org.springframework.stereotype.Service; /** * 中银交易记录Service diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/domain/OperationRecord.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/domain/OperationRecord.java index 7cd90e0d..fae852c5 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/domain/OperationRecord.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/domain/OperationRecord.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/domain/Option.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/domain/Option.java index 3405dc56..f942c5b8 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/domain/Option.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/domain/Option.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/mapper/OperationRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/mapper/OperationRecordMapper.java index 287030af..04fbb91d 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/mapper/OperationRecordMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/mapper/OperationRecordMapper.java @@ -1,9 +1,8 @@ package com.openhis.sys.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.sys.domain.OperationRecord; +import org.springframework.stereotype.Repository; /** * 系统操作记录Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/mapper/OptionMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/mapper/OptionMapper.java index fd1b6eb7..c15e1f2f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/mapper/OptionMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/mapper/OptionMapper.java @@ -1,9 +1,8 @@ package com.openhis.sys.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.sys.domain.Option; +import org.springframework.stereotype.Repository; /** * 系统选项配置Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/IOperationRecordService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/IOperationRecordService.java index 9473d000..16bf9ca1 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/IOperationRecordService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/IOperationRecordService.java @@ -1,10 +1,10 @@ package com.openhis.sys.service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.sys.domain.OperationRecord; +import java.util.List; + /** * 系统操作记录Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/impl/OperationRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/impl/OperationRecordServiceImpl.java index 1f414d0b..d2ac14cd 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/impl/OperationRecordServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/impl/OperationRecordServiceImpl.java @@ -1,20 +1,18 @@ package com.openhis.sys.service.impl; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.openhis.sys.domain.OperationRecord; import com.openhis.sys.mapper.OperationRecordMapper; import com.openhis.sys.service.IOperationRecordService; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 系统操作记录Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/impl/OptionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/impl/OptionServiceImpl.java index eb40e468..8ee99612 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/impl/OptionServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/sys/service/impl/OptionServiceImpl.java @@ -1,14 +1,12 @@ package com.openhis.sys.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.sys.domain.Option; import com.openhis.sys.mapper.OptionMapper; import com.openhis.sys.service.IOptionService; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; /** * 系统选项配置Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/ActivityDevice.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/ActivityDevice.java index b09337d9..ba9a726e 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/ActivityDevice.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/ActivityDevice.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.openhis.common.enums.PublicationStatus; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/EncounterAutoRoll.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/EncounterAutoRoll.java index 41124047..de37e153 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/EncounterAutoRoll.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/EncounterAutoRoll.java @@ -1,16 +1,15 @@ package com.openhis.template.domain; -import java.math.BigDecimal; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 住院就诊滚方绑定 */ diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrderGroup.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrderGroup.java index a1844cc8..73e9e2f4 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrderGroup.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrderGroup.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrdersGroupPackage.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrdersGroupPackage.java index 30e5a1aa..b6033ac4 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrdersGroupPackage.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrdersGroupPackage.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrdersGroupPackageDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrdersGroupPackageDetail.java index dd08ce91..0aa06415 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrdersGroupPackageDetail.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrdersGroupPackageDetail.java @@ -1,16 +1,15 @@ package com.openhis.template.domain; -import java.math.BigDecimal; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; + @Data @TableName("tmp_orders_group_package_detail") @Accessors(chain = true) diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/ActivityDeviceMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/ActivityDeviceMapper.java index 7ab0f4e2..ed128e43 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/ActivityDeviceMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/ActivityDeviceMapper.java @@ -3,10 +3,9 @@ */ package com.openhis.template.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.template.domain.ActivityDevice; +import org.springframework.stereotype.Repository; /** * TODO:概括描述当前类的主要用途和注意事项 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/EncounterAutoRollMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/EncounterAutoRollMapper.java index ab6533db..644bba41 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/EncounterAutoRollMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/EncounterAutoRollMapper.java @@ -3,10 +3,9 @@ */ package com.openhis.template.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.template.domain.EncounterAutoRoll; +import org.springframework.stereotype.Repository; /** * 住院就诊滚方绑定 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/OrderGroupMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/OrderGroupMapper.java index 5e1b4912..546a5fe7 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/OrderGroupMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/OrderGroupMapper.java @@ -3,11 +3,10 @@ */ package com.openhis.template.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.template.domain.OrderGroup; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - /** * 组套Mapper接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/OrdersGroupPackageDetailMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/OrdersGroupPackageDetailMapper.java index b7f29412..1e331413 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/OrdersGroupPackageDetailMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/OrdersGroupPackageDetailMapper.java @@ -3,10 +3,9 @@ */ package com.openhis.template.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.template.domain.OrdersGroupPackageDetail; +import org.springframework.stereotype.Repository; /** * @author zwh diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/OrdersGroupPackageMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/OrdersGroupPackageMapper.java index cc739c46..93804579 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/OrdersGroupPackageMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/OrdersGroupPackageMapper.java @@ -3,10 +3,9 @@ */ package com.openhis.template.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.template.domain.OrdersGroupPackage; +import org.springframework.stereotype.Repository; /** * @author zwh diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/ActivityDeviceServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/ActivityDeviceServiceImpl.java index a668e8a2..fe7e41f3 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/ActivityDeviceServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/ActivityDeviceServiceImpl.java @@ -3,12 +3,11 @@ */ package com.openhis.template.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.template.domain.ActivityDevice; import com.openhis.template.mapper.ActivityDeviceMapper; import com.openhis.template.service.IActivityDeviceService; +import org.springframework.stereotype.Service; /** * TODO:概括描述当前类的主要用途和注意事项 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/EncounterAutoRollServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/EncounterAutoRollServiceImpl.java index d98a5cb2..05611a52 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/EncounterAutoRollServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/EncounterAutoRollServiceImpl.java @@ -3,12 +3,11 @@ */ package com.openhis.template.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.template.domain.EncounterAutoRoll; import com.openhis.template.mapper.EncounterAutoRollMapper; import com.openhis.template.service.IEncounterAutoRollService; +import org.springframework.stereotype.Service; /** * 住院就诊滚方绑定 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/OrderGroupServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/OrderGroupServiceImpl.java index cdeecb6b..ac365bb5 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/OrderGroupServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/OrderGroupServiceImpl.java @@ -3,12 +3,11 @@ */ package com.openhis.template.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.template.domain.OrderGroup; import com.openhis.template.mapper.OrderGroupMapper; import com.openhis.template.service.OrderGroupService; +import org.springframework.stereotype.Service; /** * 组套Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/OrdersGroupPackageDetailServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/OrdersGroupPackageDetailServiceImpl.java index 52a805cf..5ba989e3 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/OrdersGroupPackageDetailServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/OrdersGroupPackageDetailServiceImpl.java @@ -3,12 +3,11 @@ */ package com.openhis.template.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.template.domain.OrdersGroupPackageDetail; import com.openhis.template.mapper.OrdersGroupPackageDetailMapper; import com.openhis.template.service.IOrdersGroupPackageDetailService; +import org.springframework.stereotype.Service; /** * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/OrdersGroupPackageServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/OrdersGroupPackageServiceImpl.java index 9e26cbab..dfa4a611 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/OrdersGroupPackageServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/OrdersGroupPackageServiceImpl.java @@ -3,12 +3,11 @@ */ package com.openhis.template.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.template.domain.OrdersGroupPackage; import com.openhis.template.mapper.OrdersGroupPackageMapper; import com.openhis.template.service.IOrdersGroupPackageService; +import org.springframework.stereotype.Service; /** * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java index b87c8093..3d10e6c8 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java index 301e2322..d6559cd7 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java @@ -1,17 +1,16 @@ package com.openhis.workflow.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 器材发放管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java index fa935a0c..21ad8ffa 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java @@ -1,17 +1,16 @@ package com.openhis.workflow.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 器材请求管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ElepMedicationRequest.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ElepMedicationRequest.java index c897f118..24e562e3 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ElepMedicationRequest.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ElepMedicationRequest.java @@ -1,17 +1,16 @@ package com.openhis.workflow.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 【请填写功能名称】Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/InventoryItem.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/InventoryItem.java index c3f158e9..0a177c82 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/InventoryItem.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/InventoryItem.java @@ -1,18 +1,17 @@ package com.openhis.workflow.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.openhis.common.enums.PublicationStatus; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 库存项目管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java index 25ee169f..5a86a226 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java @@ -1,17 +1,16 @@ package com.openhis.workflow.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 服务申请管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequestDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequestDetail.java index d5360b56..3fcc145a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequestDetail.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequestDetail.java @@ -1,12 +1,8 @@ package com.openhis.workflow.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyDelivery.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyDelivery.java index 507ae926..f034101b 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyDelivery.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyDelivery.java @@ -1,19 +1,18 @@ package com.openhis.workflow.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.openhis.common.enums.DispenseStatus; import com.openhis.common.enums.SupplyType; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 供应发放管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java index 91058e07..7835cf66 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java @@ -1,8 +1,5 @@ package com.openhis.workflow.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -10,11 +7,13 @@ import com.core.common.core.domain.HisBaseEntity; import com.openhis.common.enums.ActPriority; import com.openhis.common.enums.SupplyCategory; import com.openhis.common.enums.SupplyStatus; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 供应申请管理Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequestAuto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequestAuto.java index a584c37b..907b7676 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequestAuto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequestAuto.java @@ -1,8 +1,5 @@ package com.openhis.workflow.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -10,11 +7,13 @@ import com.core.common.core.domain.HisBaseEntity; import com.openhis.common.enums.ActPriority; import com.openhis.common.enums.SupplyCategory; import com.openhis.common.enums.SupplyStatus; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 供应申请管理Entity实体（保存定时盘点信息） * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/dto/AdjustPriceDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/dto/AdjustPriceDto.java index 20ab0b3b..f3c66d8c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/dto/AdjustPriceDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/dto/AdjustPriceDto.java @@ -1,10 +1,10 @@ package com.openhis.workflow.dto; -import java.math.BigDecimal; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * @ClassName AdjustPriceDto * @Description TODO diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ActivityDefinitionMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ActivityDefinitionMapper.java index 95a69686..42149850 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ActivityDefinitionMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ActivityDefinitionMapper.java @@ -1,14 +1,13 @@ package com.openhis.workflow.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.medication.dto.AdjustPriceMedListDto; import com.openhis.workflow.domain.ActivityDefinition; import com.openhis.workflow.dto.ActivityDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 诊疗定义管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/DeviceDispenseMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/DeviceDispenseMapper.java index ce07cb90..3fcbc71e 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/DeviceDispenseMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/DeviceDispenseMapper.java @@ -1,9 +1,8 @@ package com.openhis.workflow.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.workflow.domain.DeviceDispense; +import org.springframework.stereotype.Repository; /** * 器材发放管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/DeviceRequestMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/DeviceRequestMapper.java index 93ac8a41..408d517d 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/DeviceRequestMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/DeviceRequestMapper.java @@ -1,9 +1,8 @@ package com.openhis.workflow.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.workflow.domain.DeviceRequest; +import org.springframework.stereotype.Repository; /** * 器材请求管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ElepMedicationRequestMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ElepMedicationRequestMapper.java index 5551ad6a..01ca68fd 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ElepMedicationRequestMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ElepMedicationRequestMapper.java @@ -1,9 +1,8 @@ package com.openhis.workflow.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.workflow.domain.ElepMedicationRequest; +import org.springframework.stereotype.Repository; /** * 【请填写功能名称】Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/InventoryItemMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/InventoryItemMapper.java index 1a9c629d..33f4dcaa 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/InventoryItemMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/InventoryItemMapper.java @@ -1,13 +1,12 @@ package com.openhis.workflow.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.workflow.domain.InventoryItem; import com.openhis.workflow.dto.AdjustPriceDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 库存项目管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ServiceRequestDetailMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ServiceRequestDetailMapper.java index acdf9674..c2e4b16a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ServiceRequestDetailMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ServiceRequestDetailMapper.java @@ -1,9 +1,8 @@ package com.openhis.workflow.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.workflow.domain.ServiceRequestDetail; +import org.springframework.stereotype.Repository; /** * 服务申请详情管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ServiceRequestMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ServiceRequestMapper.java index 396d7715..58b96dc6 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ServiceRequestMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ServiceRequestMapper.java @@ -1,9 +1,8 @@ package com.openhis.workflow.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.workflow.domain.ServiceRequest; +import org.springframework.stereotype.Repository; /** * 服务申请管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyDeliveryMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyDeliveryMapper.java index 24f19878..3fc8b883 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyDeliveryMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyDeliveryMapper.java @@ -1,9 +1,8 @@ package com.openhis.workflow.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.workflow.domain.SupplyDelivery; +import org.springframework.stereotype.Repository; /** * 供应发放管理Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyRequestAutoMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyRequestAutoMapper.java index d73c0438..85e2b423 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyRequestAutoMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyRequestAutoMapper.java @@ -1,11 +1,9 @@ package com.openhis.workflow.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.workflow.domain.SupplyRequestAuto; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.openhis.workflow.domain.SupplyRequest; - /** * 供应申请管理Mapper接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyRequestMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyRequestMapper.java index 6572449e..9a44093f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyRequestMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/SupplyRequestMapper.java @@ -1,13 +1,12 @@ package com.openhis.workflow.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.medication.dto.AdjustPriceMedListDto; +import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.dto.ChangePriceDto; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.openhis.workflow.domain.SupplyRequest; - import java.util.Date; import java.util.List; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IActivityDefinitionService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IActivityDefinitionService.java index eca78914..f9574489 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IActivityDefinitionService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IActivityDefinitionService.java @@ -1,13 +1,12 @@ package com.openhis.workflow.service; -import java.util.List; - -import org.apache.ibatis.annotations.Param; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.medication.dto.AdjustPriceMedListDto; import com.openhis.workflow.domain.ActivityDefinition; import com.openhis.workflow.dto.ActivityDto; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 诊疗定义管理Service接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceDispenseService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceDispenseService.java index f45b3c9c..ebe0be46 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceDispenseService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceDispenseService.java @@ -1,14 +1,14 @@ package com.openhis.workflow.service; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.administration.domain.Practitioner; import com.openhis.workflow.domain.DeviceDispense; import com.openhis.workflow.domain.DeviceRequest; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + /** * 器材发放管理Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceRequestService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceRequestService.java index 065a2d18..b3edd4bb 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceRequestService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceRequestService.java @@ -1,11 +1,11 @@ package com.openhis.workflow.service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.administration.domain.Practitioner; import com.openhis.workflow.domain.DeviceRequest; +import java.util.List; + /** * 器材请求管理Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IInventoryItemService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IInventoryItemService.java index cc364140..2b642bf9 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IInventoryItemService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IInventoryItemService.java @@ -1,14 +1,13 @@ package com.openhis.workflow.service; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; -import java.util.Set; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.workflow.domain.InventoryItem; import com.openhis.workflow.dto.AdjustPriceDto; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + /** * 库存项目管理Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestService.java index 3c1dc10e..847e7d03 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestService.java @@ -1,12 +1,12 @@ package com.openhis.workflow.service; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.administration.domain.Practitioner; import com.openhis.workflow.domain.ServiceRequest; +import java.util.Date; +import java.util.List; + /** * 服务申请管理Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyDeliveryService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyDeliveryService.java index 9ab6ea1c..7ce1621c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyDeliveryService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyDeliveryService.java @@ -1,13 +1,13 @@ package com.openhis.workflow.service; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.workflow.domain.SupplyDelivery; import com.openhis.workflow.domain.SupplyRequest; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + /** * 供应发放管理Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestAutoService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestAutoService.java index 92309981..769a097e 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestAutoService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestAutoService.java @@ -1,10 +1,6 @@ package com.openhis.workflow.service; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; -import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.domain.SupplyRequestAuto; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestService.java index acc17337..70ee8a61 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestService.java @@ -1,14 +1,14 @@ package com.openhis.workflow.service; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.medication.dto.AdjustPriceMedListDto; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.dto.ChangePriceDto; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + /** * 供应申请管理Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ActivityDefinitionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ActivityDefinitionServiceImpl.java index a69031a4..d75034cb 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ActivityDefinitionServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ActivityDefinitionServiceImpl.java @@ -1,22 +1,20 @@ package com.openhis.workflow.service.impl; -import java.util.List; - -import com.core.common.enums.DelFlag; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.core.common.enums.DelFlag; import com.openhis.common.enums.PublicationStatus; import com.openhis.medication.dto.AdjustPriceMedListDto; import com.openhis.workflow.domain.ActivityDefinition; import com.openhis.workflow.dto.ActivityDto; import com.openhis.workflow.mapper.ActivityDefinitionMapper; import com.openhis.workflow.service.IActivityDefinitionService; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; /** * 诊疗定义管理Service业务层处理 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 a75aefdc..499e0929 100644 --- 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 @@ -1,17 +1,5 @@ package com.openhis.workflow.service.impl; -import static com.core.common.utils.SecurityUtils.getLoginUser; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.util.Date; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -25,6 +13,16 @@ import com.openhis.workflow.domain.DeviceDispense; import com.openhis.workflow.domain.DeviceRequest; import com.openhis.workflow.mapper.DeviceDispenseMapper; import com.openhis.workflow.service.IDeviceDispenseService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.Date; +import java.util.List; + +import static com.core.common.utils.SecurityUtils.getLoginUser; /** * 器材发放管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceRequestServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceRequestServiceImpl.java index 84465841..ad4b0217 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceRequestServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceRequestServiceImpl.java @@ -1,18 +1,17 @@ package com.openhis.workflow.service.impl; -import java.util.List; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.openhis.administration.domain.Practitioner; import com.core.common.enums.DelFlag; +import com.openhis.administration.domain.Practitioner; import com.openhis.common.enums.RequestStatus; import com.openhis.workflow.domain.DeviceRequest; import com.openhis.workflow.mapper.DeviceRequestMapper; import com.openhis.workflow.service.IDeviceRequestService; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 器材请求管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ElepMedicationRequestServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ElepMedicationRequestServiceImpl.java index 544c2b13..50134b5c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ElepMedicationRequestServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ElepMedicationRequestServiceImpl.java @@ -1,14 +1,13 @@ package com.openhis.workflow.service.impl; -import java.util.List; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.workflow.domain.ElepMedicationRequest; import com.openhis.workflow.mapper.ElepMedicationRequestMapper; import com.openhis.workflow.service.IElepMedicationRequestService; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 【请填写功能名称】Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/InventoryItemServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/InventoryItemServiceImpl.java index dd26cce1..fc0ef76f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/InventoryItemServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/InventoryItemServiceImpl.java @@ -1,14 +1,5 @@ package com.openhis.workflow.service.impl; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; -import java.util.Set; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.openhis.workflow.dto.AdjustPriceDto; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -18,6 +9,11 @@ import com.openhis.workflow.domain.InventoryItem; import com.openhis.workflow.dto.AdjustPriceDto; import com.openhis.workflow.mapper.InventoryItemMapper; import com.openhis.workflow.service.IInventoryItemService; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; /** * 库存项目管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestDetailServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestDetailServiceImpl.java index 9ebc10a3..31781243 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestDetailServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestDetailServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.workflow.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.workflow.domain.ServiceRequestDetail; import com.openhis.workflow.mapper.ServiceRequestDetailMapper; import com.openhis.workflow.service.IServiceRequestDetailService; +import org.springframework.stereotype.Service; /** * 服务申请详情管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java index a169c8c1..adaf87eb 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java @@ -1,23 +1,22 @@ package com.openhis.workflow.service.impl; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.core.common.enums.DelFlag; import com.core.common.utils.DateUtils; import com.core.common.utils.SecurityUtils; import com.openhis.administration.domain.Practitioner; import com.openhis.common.constant.CommonConstants; -import com.core.common.enums.DelFlag; import com.openhis.common.enums.RequestStatus; import com.openhis.workflow.domain.ServiceRequest; import com.openhis.workflow.mapper.ServiceRequestMapper; import com.openhis.workflow.service.IServiceRequestService; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; /** * 服务申请管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyDeliveryServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyDeliveryServiceImpl.java index b75b322d..2030a218 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyDeliveryServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyDeliveryServiceImpl.java @@ -1,25 +1,24 @@ package com.openhis.workflow.service.impl; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.core.common.enums.DelFlag; import com.core.common.utils.DateUtils; import com.core.common.utils.SecurityUtils; import com.openhis.common.constant.CommonConstants; -import com.core.common.enums.DelFlag; import com.openhis.common.enums.DispenseStatus; import com.openhis.common.enums.SupplyType; import com.openhis.workflow.domain.SupplyDelivery; import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.mapper.SupplyDeliveryMapper; import com.openhis.workflow.service.ISupplyDeliveryService; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; /** * 供应发放管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestAutoServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestAutoServiceImpl.java index 440c0a6b..976d2105 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestAutoServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestAutoServiceImpl.java @@ -1,14 +1,12 @@ package com.openhis.workflow.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.workflow.domain.SupplyRequestAuto; import com.openhis.workflow.mapper.SupplyRequestAutoMapper; import com.openhis.workflow.service.ISupplyRequestAutoService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; /** * 供应申请管理Service业务层处理 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 58b77c75..39b4ef42 100644 --- 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 @@ -1,14 +1,5 @@ package com.openhis.workflow.service.impl; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -24,9 +15,15 @@ import com.openhis.workflow.domain.SupplyRequest; import com.openhis.workflow.dto.ChangePriceDto; import com.openhis.workflow.mapper.SupplyRequestMapper; import com.openhis.workflow.service.ISupplyRequestService; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; /** * 供应申请管理Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/DirectoryCheckRecord.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/DirectoryCheckRecord.java index dca97849..3c6843dc 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/DirectoryCheckRecord.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/DirectoryCheckRecord.java @@ -1,12 +1,8 @@ package com.openhis.yb.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialApplyRecord.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialApplyRecord.java index ddec6451..5320af9c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialApplyRecord.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialApplyRecord.java @@ -3,14 +3,12 @@ */ package com.openhis.yb.domain; -import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import org.springframework.data.redis.core.index.PathBasedRedisIndexDefinition; import java.math.BigDecimal; import java.util.Date; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialReconcileRecord.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialReconcileRecord.java index 3b2eb85b..465d3772 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialReconcileRecord.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/FinancialReconcileRecord.java @@ -3,13 +3,10 @@ */ package com.openhis.yb.domain; -import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.annotation.Excel; import com.core.common.core.domain.HisBaseEntity; -import com.openhis.common.annotation.Dict; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InfoPerson.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InfoPerson.java index 610a3470..c0c8d76e 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InfoPerson.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InfoPerson.java @@ -1,21 +1,20 @@ package com.openhis.yb.domain; -import java.io.Serializable; -import java.util.Date; -import java.util.List; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import com.openhis.yb.dto.Info5301SpecialConditionResult; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; +import java.util.List; + /** *【1101】获取身份信息 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientDischarge.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientDischarge.java index eef815b6..14ee3322 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientDischarge.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientDischarge.java @@ -3,19 +3,18 @@ */ package com.openhis.yb.domain; -import java.io.Serializable; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; + /** * 【2402】出院办理 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientFeeDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientFeeDetail.java index 89e272b3..9d74fdf3 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientFeeDetail.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientFeeDetail.java @@ -1,20 +1,19 @@ package com.openhis.yb.domain; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.annotation.JsonProperty; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + /** * 【2301】费用明细上传 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientPreSettle.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientPreSettle.java index 0426d6bb..23f2f52a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientPreSettle.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientPreSettle.java @@ -3,21 +3,20 @@ */ package com.openhis.yb.domain; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.annotation.JsonProperty; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + /** * 【2303】住院预结算 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientReg.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientReg.java index 078e06b3..7c444852 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientReg.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientReg.java @@ -3,19 +3,18 @@ */ package com.openhis.yb.domain; -import java.io.Serializable; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; + /** * 【2401】入院办理 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientRegInfoUpdateRecorde.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientRegInfoUpdateRecorde.java index 6de3b953..38674f68 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientRegInfoUpdateRecorde.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientRegInfoUpdateRecorde.java @@ -3,19 +3,18 @@ */ package com.openhis.yb.domain; -import java.io.Serializable; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; + /** * 【2403】住院信息变更 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientSettle.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientSettle.java index 4333dad1..da34ae5c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientSettle.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientSettle.java @@ -1,19 +1,18 @@ package com.openhis.yb.domain; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.annotation.JsonProperty; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + /** * 【2304】住院结算 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnDischarge.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnDischarge.java index 6ac8a764..ff641ffb 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnDischarge.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnDischarge.java @@ -3,18 +3,17 @@ */ package com.openhis.yb.domain; -import java.io.Serializable; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * 【2405】撤销出院记录 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnReg.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnReg.java index af48ca81..7ea72954 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnReg.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnReg.java @@ -3,18 +3,17 @@ */ package com.openhis.yb.domain; -import java.io.Serializable; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * 【2404】【】 入院撤销 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnSettle.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnSettle.java index bf03617c..de9f4693 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnSettle.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientUnSettle.java @@ -3,20 +3,19 @@ */ package com.openhis.yb.domain; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.annotation.JsonProperty; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + /** * 【2305】住院结算策撤销 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientcancelFeeDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientcancelFeeDetail.java index d78ff89f..c3932654 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientcancelFeeDetail.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientcancelFeeDetail.java @@ -3,19 +3,18 @@ */ package com.openhis.yb.domain; -import java.io.Serializable; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.annotation.JsonProperty; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * TODO:请概括描述当前类的主要用途和注意事项 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryChangeRecord.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryChangeRecord.java index f18bddca..137fd93a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryChangeRecord.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryChangeRecord.java @@ -3,22 +3,18 @@ */ package com.openhis.yb.domain; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.openhis.yb.dto.MedicalTraceNoDto; - -import liquibase.pro.packaged.S; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 【3502】库存信息变更 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryCheckRecord.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryCheckRecord.java index c834506c..ce8ba857 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryCheckRecord.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventoryCheckRecord.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import liquibase.pro.packaged.D; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventorySaleRecord.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventorySaleRecord.java index ca8db93a..e77514d9 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventorySaleRecord.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventorySaleRecord.java @@ -3,22 +3,18 @@ */ package com.openhis.yb.domain; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.openhis.yb.dto.MedicalTraceNoDto; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 【3505】 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventorySaleReturnRecord.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventorySaleReturnRecord.java index 25eaaf86..3ae7388f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventorySaleReturnRecord.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InventorySaleReturnRecord.java @@ -3,21 +3,18 @@ */ package com.openhis.yb.domain; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.openhis.yb.dto.MedicalTraceNoDto; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 【3506】 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/BaseInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/BaseInfo.java index 3be9fb3a..968c0936 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/BaseInfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/BaseInfo.java @@ -3,8 +3,6 @@ */ package com.openhis.yb.dto; -import com.alibaba.fastjson2.annotation.JSONField; -import com.sun.jna.platform.win32.Winspool; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/BaseParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/BaseParam.java index 4e4121cf..511bf40c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/BaseParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/BaseParam.java @@ -1,6 +1,5 @@ package com.openhis.yb.dto; -import com.core.common.core.domain.model.LoginUser; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Catalogue1312QueryParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Catalogue1312QueryParam.java index f9ce40b3..b4ffe982 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Catalogue1312QueryParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Catalogue1312QueryParam.java @@ -1,15 +1,13 @@ package com.openhis.yb.dto; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * 【1312】医保目录信息查询 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AResult.java index 261498ad..862f06e2 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AResult.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clearing3205AResult.java @@ -3,14 +3,14 @@ */ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 【3205A】清算申请状态查询（吉林省） * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203DiseInfoParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203DiseInfoParam.java index 0546e6d4..e22b8b1d 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203DiseInfoParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203DiseInfoParam.java @@ -1,20 +1,17 @@ package com.openhis.yb.dto; -import java.io.Serializable; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.annotation.Excel; import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; /** *【2203】门诊就诊信息上传 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203Medical.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203Medical.java index 7794d814..dbb7bdce 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203Medical.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203Medical.java @@ -1,20 +1,17 @@ package com.openhis.yb.dto; -import java.io.Serializable; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; /** *【2203】门诊就诊信息上传 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203MedicalParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203MedicalParam.java index feccd6d7..f05e5c22 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203MedicalParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2203MedicalParam.java @@ -1,17 +1,15 @@ package com.openhis.yb.dto; -import java.util.Date; -import java.util.List; - import com.alibaba.fastjson2.annotation.JSONField; -import org.springframework.format.annotation.DateTimeFormat; - import com.fasterxml.jackson.annotation.JsonFormat; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +import java.util.List; /** * 【2203】门诊就诊信息上传 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204FeeDetailParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204FeeDetailParam.java index 6fe32f31..8a57e127 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204FeeDetailParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204FeeDetailParam.java @@ -1,22 +1,19 @@ package com.openhis.yb.dto; -import java.io.Serializable; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.annotation.Excel; import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; /** *【2204】门诊费用明细信息上传 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204FeeDetailResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204FeeDetailResult.java index 8986a4f0..800e772e 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204FeeDetailResult.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204FeeDetailResult.java @@ -3,12 +3,11 @@ */ package com.openhis.yb.dto; -import java.math.BigDecimal; - -import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 【2204】接口返回参数 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204OrderParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204OrderParam.java index 6ae4a654..01e02086 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204OrderParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2204OrderParam.java @@ -1,19 +1,12 @@ package com.openhis.yb.dto; -import java.util.Date; -import java.util.List; - import com.alibaba.fastjson2.annotation.JSONField; -import org.springframework.format.annotation.DateTimeFormat; - -import com.core.common.annotation.Excel; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.List; + /** * 【2204】门诊费用明细信息上传 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206FundPaymentResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206FundPaymentResult.java index 86155328..61689f52 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206FundPaymentResult.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206FundPaymentResult.java @@ -3,8 +3,6 @@ */ package com.openhis.yb.dto; -import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderOutput.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderOutput.java index dc820975..bc6d37be 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderOutput.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderOutput.java @@ -3,13 +3,13 @@ */ package com.openhis.yb.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import java.math.BigDecimal; import java.util.Date; import java.util.List; -import lombok.Data; -import lombok.experimental.Accessors; - /** * 【2206】医保预结算的输出参数 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderParam.java index 36631e7b..a91bf63c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206OrderParam.java @@ -1,21 +1,18 @@ package com.openhis.yb.dto; -import java.io.Serializable; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; /** *【2206】门诊预结算 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206SetldetaiResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206SetldetaiResult.java index 6a98f44b..8b2ddc61 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206SetldetaiResult.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2206SetldetaiResult.java @@ -1,18 +1,16 @@ package com.openhis.yb.dto; -import java.io.Serializable; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.annotation.Excel; import com.core.common.core.domain.HisBaseEntity; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; + /** *【2206】门诊预结算-输出参数 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoParam.java index 403951dc..5534473e 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Clinic2208UnSetlInfoParam.java @@ -1,21 +1,12 @@ package com.openhis.yb.dto; -import java.io.Serializable; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; + /** *【2208】门诊结算撤销 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ClinicReg.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ClinicReg.java index 1bd684e9..14a739b1 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ClinicReg.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ClinicReg.java @@ -1,22 +1,19 @@ package com.openhis.yb.dto; -import java.io.Serializable; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; /** *【2201】【2202】挂号 退号 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FileDownload.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FileDownload.java index 2424f8c8..5ac1ad95 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FileDownload.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FileDownload.java @@ -4,7 +4,6 @@ package com.openhis.yb.dto; import com.alibaba.fastjson2.annotation.JSONField; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FileResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FileResult.java index e6a8d4d1..6a3de719 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FileResult.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FileResult.java @@ -3,13 +3,13 @@ */ package com.openhis.yb.dto; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; + /** * 【9101】【9102】公用 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3201Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3201Param.java index 01c12bb9..f4e7eaad 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3201Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3201Param.java @@ -1,19 +1,15 @@ package com.openhis.yb.dto; -import java.io.Serializable; - import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.annotation.Excel; import com.core.common.core.domain.HisBaseEntity; import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; + /** *【3201】月结对账 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202FileParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202FileParam.java index b604eead..0b68569f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202FileParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202FileParam.java @@ -4,7 +4,6 @@ package com.openhis.yb.dto; import com.alibaba.fastjson2.annotation.JSONField; -import lombok.Data; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202OtherParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202OtherParam.java index a6cd3a32..541cf276 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202OtherParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3202OtherParam.java @@ -1,10 +1,6 @@ package com.openhis.yb.dto; -import com.alibaba.fastjson2.annotation.JSONField; -import liquibase.pro.packaged.D; import lombok.Data; -import lombok.Getter; -import lombok.Setter; import lombok.experimental.Accessors; import java.math.BigDecimal; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203AParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203AParam.java index fa8b60a9..363cd3a4 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203AParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Financial3203AParam.java @@ -1,24 +1,16 @@ package com.openhis.yb.dto; +import com.alibaba.fastjson2.annotation.JSONField; +import com.core.common.core.domain.HisBaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -import com.alibaba.fastjson2.annotation.JSONField; -import org.springframework.format.annotation.DateTimeFormat; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.core.common.annotation.Excel; -import com.core.common.core.domain.HisBaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - /** *【3203A】清算 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialClearing3203AWebParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialClearing3203AWebParam.java index a2cc8b73..05b42bcc 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialClearing3203AWebParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialClearing3203AWebParam.java @@ -2,8 +2,6 @@ package com.openhis.yb.dto; import lombok.Data; -import java.util.Date; - @Data public class FinancialClearing3203AWebParam { diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3202Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3202Param.java index f8a15810..f6a9d0eb 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3202Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3202Param.java @@ -3,17 +3,15 @@ */ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.TableName; - import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 【3202】医药机构费用结算对明细账 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3202Result.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3202Result.java index 4ba19c16..715010e3 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3202Result.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FinancialSettlement3202Result.java @@ -3,15 +3,14 @@ */ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; + /** * 【3202】医药机构费用结算对明细账-文件输出实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiConsultation3101Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiConsultation3101Param.java index db81d384..3f5e74f3 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiConsultation3101Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiConsultation3101Param.java @@ -3,15 +3,14 @@ */ package com.openhis.yb.dto; -import java.util.List; -import java.util.Set; - import com.alibaba.fastjson2.annotation.JSONField; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.List; +import java.util.Set; + /** * 【3101】明细审核事前分析服务（输入-规则分析信息） * 【3102】明细审核事中分析服务（输入-规则分析信息） diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiDiagnose3101Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiDiagnose3101Param.java index d2272093..38b98e47 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiDiagnose3101Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiDiagnose3101Param.java @@ -3,16 +3,15 @@ */ package com.openhis.yb.dto; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; + /** * 【3101】明细审核事前分析服务（输入-诊断信息） * 【3102】明细审核事中分析服务（输入-诊断信息） diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiEncounter3101Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiEncounter3101Param.java index de6ddaee..3707305f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiEncounter3101Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiEncounter3101Param.java @@ -3,17 +3,17 @@ */ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + /** * 【3101】明细审核事前分析服务（输入-就诊信息） * 【3102】明细审核事中分析服务（输入-就诊信息） diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiFeedback3103DataParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiFeedback3103DataParam.java index 06a5db46..bcf99e1f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiFeedback3103DataParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiFeedback3103DataParam.java @@ -1,12 +1,12 @@ package com.openhis.yb.dto; -import java.util.List; import com.alibaba.fastjson2.annotation.JSONField; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.List; + /** * 【3103】事前事中服务反馈服务（输入） * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiFeedback3103WarnsParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiFeedback3103WarnsParam.java index f23de393..78a3cf8a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiFeedback3103WarnsParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiFeedback3103WarnsParam.java @@ -1,8 +1,6 @@ package com.openhis.yb.dto; -import java.util.List; import com.alibaba.fastjson2.annotation.JSONField; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiOperation3101Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiOperation3101Param.java index dd7b8bae..cc1b4fdb 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiOperation3101Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiOperation3101Param.java @@ -3,7 +3,6 @@ */ package com.openhis.yb.dto; -import java.util.Date; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -11,6 +10,8 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; + /** * 【3101】明细审核事前分析服务（输入-手术操作信息） * 【3102】明细审核事中分析服务（输入-手术操作信息） diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiOrder3101Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiOrder3101Param.java index a3c945f3..238bbd97 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiOrder3101Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiOrder3101Param.java @@ -3,17 +3,16 @@ */ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; +import java.math.BigDecimal; +import java.util.Date; + /** * 【3101】明细审核事前分析服务（输入-处方（医嘱）信息） * 【3102】明细审核事中分析服务（输入-处方（医嘱）信息） diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiPatient3101Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiPatient3101Param.java index ca338601..a009f0ba 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiPatient3101Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiPatient3101Param.java @@ -3,16 +3,16 @@ */ package com.openhis.yb.dto; -import java.util.Date; -import java.util.List; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; +import java.util.List; + /** * 【3101】明细审核事前分析服务（输入-参保人信息） * 【3102】明细审核事中分析服务（输入-参保人信息） diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiViolation3101Result.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiViolation3101Result.java index 6ea0cccf..fa5fb9dd 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiViolation3101Result.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiViolation3101Result.java @@ -1,12 +1,13 @@ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.List; import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.List; + /** * 【3101】明细审核事前分析服务（输出-违规信息） * 【3102】明细审核事中分析服务（输出-违规信息） diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiViolationDetail3101Result.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiViolationDetail3101Result.java index 4ac35dda..048c73af 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiViolationDetail3101Result.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FsiViolationDetail3101Result.java @@ -1,11 +1,12 @@ package com.openhis.yb.dto; -import java.math.BigDecimal; import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 【3101】明细审核事前分析服务（输出-违规明细信息） * 【3102】明细审核事中分析服务（输出-违规明细信息） diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2401DiseInfoParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2401DiseInfoParam.java index f0d13869..a03d3a8d 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2401DiseInfoParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2401DiseInfoParam.java @@ -1,16 +1,14 @@ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; /** * 【2401】入院办理（输入-入院诊断信息） diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2401MdtInfoParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2401MdtInfoParam.java index 7de95660..93c7c127 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2401MdtInfoParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2401MdtInfoParam.java @@ -1,18 +1,16 @@ package com.openhis.yb.dto; +import com.alibaba.fastjson2.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + import java.math.BigDecimal; import java.util.Date; import java.util.List; -import org.springframework.format.annotation.DateTimeFormat; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - /** * 【2401】入院办理 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2402DiseInfoParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2402DiseInfoParam.java index 2cdc0d4e..187e902a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2402DiseInfoParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2402DiseInfoParam.java @@ -1,16 +1,14 @@ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; /** * 【2402】出院办理（输入-出院诊断信息） diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2402DscgInfoParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2402DscgInfoParam.java index b11ba22c..5a08e4ba 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2402DscgInfoParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2402DscgInfoParam.java @@ -1,18 +1,16 @@ package com.openhis.yb.dto; +import com.alibaba.fastjson2.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + import java.math.BigDecimal; import java.util.Date; import java.util.List; -import org.springframework.format.annotation.DateTimeFormat; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - /** * 【2402】出院办理 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2403AdmInfoParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2403AdmInfoParam.java index 6673bd8a..757e9c5d 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2403AdmInfoParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2403AdmInfoParam.java @@ -1,16 +1,14 @@ package com.openhis.yb.dto; -import java.util.Date; -import java.util.List; - -import org.springframework.format.annotation.DateTimeFormat; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +import java.util.List; /** * 【2403】住院信息变更 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2403DiseInfoParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2403DiseInfoParam.java index 32dbec40..287c7f0e 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2403DiseInfoParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2403DiseInfoParam.java @@ -1,16 +1,14 @@ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; /** * 【2403】住院信息变更（输入-入院诊断信息） diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2407SmAttrSelectParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2407SmAttrSelectParam.java index a9857539..9ea3d777 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2407SmAttrSelectParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospAdm2407SmAttrSelectParam.java @@ -1,13 +1,12 @@ package com.openhis.yb.dto; -import java.math.BigDecimal; - import com.alibaba.fastjson2.annotation.JSONField; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 【2407】就医特殊属性查询（输入） * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3401AParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3401AParam.java index 8f90de10..98ac8882 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3401AParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospDept3401AParam.java @@ -3,9 +3,6 @@ */ package com.openhis.yb.dto; -import com.alibaba.fastjson2.annotation.JSONField; - -import java.util.Date; import java.util.List; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrf2501ARefmedinParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrf2501ARefmedinParam.java index be46c2bd..5027e216 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrf2501ARefmedinParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrf2501ARefmedinParam.java @@ -1,15 +1,13 @@ package com.openhis.yb.dto; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * 【2501A】转院备案（输入） diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrf2501RefmedinParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrf2501RefmedinParam.java index 15498c57..608a2c2c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrf2501RefmedinParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrf2501RefmedinParam.java @@ -1,7 +1,6 @@ package com.openhis.yb.dto; import com.alibaba.fastjson2.annotation.JSONField; - import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrfCxl2502Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrfCxl2502Param.java index bc847a6f..b913b1fd 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrfCxl2502Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/HospTrfCxl2502Param.java @@ -1,7 +1,6 @@ package com.openhis.yb.dto; import com.alibaba.fastjson2.annotation.JSONField; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101PerinfoResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101PerinfoResult.java index 822a19dc..6ea0e4a8 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101PerinfoResult.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101PerinfoResult.java @@ -1,16 +1,14 @@ package com.openhis.yb.dto; -import java.io.Serializable; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; + /** *【1101】获取身份信息 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101ReadcardParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101ReadcardParam.java index be52d7b9..b5df282f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101ReadcardParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info1101ReadcardParam.java @@ -1,15 +1,13 @@ package com.openhis.yb.dto; -import java.io.Serializable; - import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; + /** *【1101】获取身份信息 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info5301SpecialConditionResult.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info5301SpecialConditionResult.java index 000c0bc6..9701b635 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info5301SpecialConditionResult.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Info5301SpecialConditionResult.java @@ -1,6 +1,5 @@ package com.openhis.yb.dto; -import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowReg25007Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowReg25007Param.java index 9ee3efb1..f1100c12 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowReg25007Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowReg25007Param.java @@ -1,16 +1,14 @@ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; /** * 【25007】生育津贴登记（输入） diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowReg25007Result.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowReg25007Result.java index ae620f04..7f0f7575 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowReg25007Result.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowReg25007Result.java @@ -1,16 +1,14 @@ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; /** * 【25007】生育津贴登记（输出） diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowRegSel25008Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowRegSel25008Param.java index 52120d4a..4da4b908 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowRegSel25008Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MatAllowRegSel25008Param.java @@ -1,16 +1,14 @@ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; /** * 【25008】生育津贴登记信息查询（输出） diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3503Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3503Param.java index e49ba619..495ec6c8 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3503Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3503Param.java @@ -3,15 +3,15 @@ */ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** *【3503】商品采购 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3505Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3505Param.java index 91a7d592..728971ee 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3505Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3505Param.java @@ -3,18 +3,16 @@ */ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 【3505】商品销售 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3506Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3506Param.java index afcee8bb..3139861f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3506Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3506Param.java @@ -3,18 +3,16 @@ */ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 【3506】商品销售退货 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3508Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3508Param.java index ac10bc8f..25f31319 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3508Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3508Param.java @@ -3,15 +3,12 @@ */ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; + /** *【3508】定点医药机构商品库存信息查询 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3508Result.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3508Result.java index d543c985..98c16c67 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3508Result.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Medical3508Result.java @@ -3,13 +3,13 @@ */ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** *【3508】定点医药机构商品库存信息查询 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3501Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3501Param.java index f6727fc4..7d7e2cf2 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3501Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3501Param.java @@ -3,15 +3,15 @@ */ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** *【3501】商品盘存上传 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3502Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3502Param.java index 72858b78..c594bfe9 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3502Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3502Param.java @@ -3,18 +3,16 @@ */ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 【3502】商品库存变更 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3511Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3511Param.java index e98a6916..cc3dafea 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3511Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3511Param.java @@ -3,15 +3,14 @@ */ package com.openhis.yb.dto; -import java.util.Date; - import com.alibaba.fastjson.annotation.JSONField; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; + /** * 【3511】 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3512Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3512Param.java index 34bb5ac5..f8aea755 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3512Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3512Param.java @@ -1,8 +1,6 @@ package com.openhis.yb.dto; import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3513Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3513Param.java index a83de2e1..d22edc15 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3513Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3513Param.java @@ -1,7 +1,6 @@ package com.openhis.yb.dto; import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalPurchase3504Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalPurchase3504Param.java index 5350b037..9143ad87 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalPurchase3504Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalPurchase3504Param.java @@ -3,15 +3,15 @@ */ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** *【3504】商品采购退货 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalTraceNoDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalTraceNoDto.java index 2d6c3bb0..dc638e90 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalTraceNoDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalTraceNoDto.java @@ -4,13 +4,10 @@ package com.openhis.yb.dto; import com.alibaba.fastjson2.annotation.JSONField; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import java.util.List; - /** * 药品追溯码dto * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDecDetailUniAccountDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDecDetailUniAccountDto.java index b3a9c46d..538916f5 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDecDetailUniAccountDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDecDetailUniAccountDto.java @@ -1,7 +1,6 @@ package com.openhis.yb.dto; import com.openhis.financial.domain.PaymentRecDetail; - import lombok.Data; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDetailDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDetailDto.java index f6507fbc..4857a1ca 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDetailDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PaymentDetailDto.java @@ -3,13 +3,12 @@ */ package com.openhis.yb.dto; -import java.math.BigDecimal; - import com.openhis.common.annotation.Dict; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 支付详情 * 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 af0f22d7..f5ec8893 100644 --- 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 @@ -3,16 +3,14 @@ */ package com.openhis.yb.dto; -import java.util.List; - -import javax.validation.constraints.NotEmpty; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import javax.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 dcc0bfed..7077adbb 100644 --- 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 @@ -3,16 +3,14 @@ */ package com.openhis.yb.dto; -import java.util.List; - -import javax.validation.constraints.NotEmpty; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; import lombok.experimental.Accessors; +import javax.validation.constraints.NotEmpty; +import java.util.List; + /** * 付款入参 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthApprovalSel25005Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthApprovalSel25005Param.java index 9da7a5a3..e5711cfb 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthApprovalSel25005Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthApprovalSel25005Param.java @@ -1,15 +1,13 @@ package com.openhis.yb.dto; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * 【25005】人员生育审批查询 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthRecord25003Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthRecord25003Param.java index c8d96bd8..1ad86e6f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthRecord25003Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersBirthRecord25003Param.java @@ -1,16 +1,14 @@ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; /** * 【25003】人员生育备案 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersChrDis2503Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersChrDis2503Param.java index 0fa509f4..645eaa6a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersChrDis2503Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersChrDis2503Param.java @@ -1,14 +1,14 @@ package com.openhis.yb.dto; -import java.util.Date; import com.alibaba.fastjson2.annotation.JSONField; - import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; + /** * 【2503】人员慢特病备案（输入） * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersChrDisCxl2504Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersChrDisCxl2504Param.java index ee75f633..fb9c685a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersChrDisCxl2504Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersChrDisCxl2504Param.java @@ -1,7 +1,6 @@ package com.openhis.yb.dto; import com.alibaba.fastjson2.annotation.JSONField; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersDesigPt2505Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersDesigPt2505Param.java index c5d2184e..9cfcf687 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersDesigPt2505Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersDesigPt2505Param.java @@ -1,17 +1,15 @@ package com.openhis.yb.dto; -import java.util.Date; - import com.alibaba.fastjson2.JSONObject; - import com.alibaba.fastjson2.annotation.JSONField; - import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; + /** * 【2505】人员定点备案（输入） * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersDesigPtCxl2506Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersDesigPtCxl2506Param.java index 2dfb8244..ab2ae99f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersDesigPtCxl2506Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersDesigPtCxl2506Param.java @@ -1,7 +1,6 @@ package com.openhis.yb.dto; import com.alibaba.fastjson2.annotation.JSONField; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedApprovalCnl25006Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedApprovalCnl25006Param.java index 737d58aa..d5992156 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedApprovalCnl25006Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedApprovalCnl25006Param.java @@ -1,7 +1,6 @@ package com.openhis.yb.dto; import com.alibaba.fastjson2.annotation.JSONField; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedRecord25001Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedRecord25001Param.java index ea145a91..0311c316 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedRecord25001Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedRecord25001Param.java @@ -1,16 +1,14 @@ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; /** * 【25001】人员特药备案 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedSelect25002Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedSelect25002Param.java index 0b92c546..47650ee0 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedSelect25002Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedSelect25002Param.java @@ -1,15 +1,13 @@ package com.openhis.yb.dto; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * 【25002】人员特药备案查询（输入） diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedSelect25002Result.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedSelect25002Result.java index 0fda0c07..7c3fc6ee 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedSelect25002Result.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersMedSelect25002Result.java @@ -1,15 +1,13 @@ package com.openhis.yb.dto; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * 【25002】人员特药备案查询（输出） diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersUnintInj2507Param.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersUnintInj2507Param.java index 8d2790ce..e100d409 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersUnintInj2507Param.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PersUnintInj2507Param.java @@ -1,7 +1,6 @@ package com.openhis.yb.dto; import com.alibaba.fastjson2.annotation.JSONField; - import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; 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 91c6c1e2..0f95b214 100644 --- 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 @@ -3,13 +3,12 @@ */ package com.openhis.yb.dto; -import java.util.List; +import lombok.Data; +import lombok.experimental.Accessors; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; - -import lombok.Data; -import lombok.experimental.Accessors; +import java.util.List; /** * 预结算入参 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 2f70156c..98093f4f 100644 --- 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 @@ -6,7 +6,6 @@ package com.openhis.yb.dto; import lombok.Data; import javax.validation.constraints.NotNull; -import java.util.Date; /** * 【3201】前台入参 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3202WebParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3202WebParam.java index 9d129ac3..f49876c1 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3202WebParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Settlement3202WebParam.java @@ -3,12 +3,7 @@ */ package com.openhis.yb.dto; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import javax.validation.constraints.NotNull; -import java.util.Date; /** * 【3202】前台入参 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Sign.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Sign.java index 57000ece..88384dc4 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Sign.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Sign.java @@ -1,20 +1,16 @@ package com.openhis.yb.dto; -import java.io.Serializable; - -import org.springframework.format.annotation.DateTimeFormat; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; /** *【9001】【9002】签到 签退 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2301InputFeeDetailModel.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2301InputFeeDetailModel.java index e1a6f370..5682b86a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2301InputFeeDetailModel.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2301InputFeeDetailModel.java @@ -3,11 +3,11 @@ */ package com.openhis.yb.dto; -import java.util.List; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.List; + /** * 【2301】参数 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2303OutputSetInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2303OutputSetInfo.java index 961811c7..cbc72d85 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2303OutputSetInfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2303OutputSetInfo.java @@ -1,15 +1,14 @@ package com.openhis.yb.dto; +import com.alibaba.fastjson2.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.experimental.Accessors; + import java.math.BigDecimal; import java.util.Date; import java.util.List; -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonProperty; - -import lombok.Data; -import lombok.experimental.Accessors; - @Data @Accessors(chain = true) public class Yb2303OutputSetInfo { diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2305InputInpatient.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2305InputInpatient.java index add6df8f..cecb2120 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2305InputInpatient.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2305InputInpatient.java @@ -4,8 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.experimental.Accessors; -import java.math.BigDecimal; - @Data @Accessors(chain = true) public class Yb2305InputInpatient { diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2305OutputSetlInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2305OutputSetlInfo.java index 9d3f9c59..dcd58b4a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2305OutputSetlInfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2305OutputSetlInfo.java @@ -1,13 +1,12 @@ package com.openhis.yb.dto; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.experimental.Accessors; + import java.math.BigDecimal; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonProperty; - -import lombok.Data; -import lombok.experimental.Accessors; - @Data @Accessors(chain = true) public class Yb2305OutputSetlInfo { diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientMdtrtInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientMdtrtInfo.java index 3278be17..631a9e34 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientMdtrtInfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientMdtrtInfo.java @@ -4,7 +4,6 @@ package com.openhis.yb.dto; import com.alibaba.fastjson2.annotation.JSONField; -import liquibase.pro.packaged.A; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientTrumContent.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientTrumContent.java index 1d6ea7db..95b107c0 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientTrumContent.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientTrumContent.java @@ -4,7 +4,6 @@ package com.openhis.yb.dto; import com.alibaba.fastjson2.annotation.JSONField; -import com.core.common.annotation.DataSource; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputInpatientDiseInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputInpatientDiseInfo.java index 9777f029..c04cdf87 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputInpatientDiseInfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputInpatientDiseInfo.java @@ -4,7 +4,6 @@ package com.openhis.yb.dto; import com.alibaba.fastjson2.annotation.JSONField; -import com.core.common.annotation.DataSource; import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputParam.java index 91d970e6..bbf854d6 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2403InputParam.java @@ -3,10 +3,10 @@ */ package com.openhis.yb.dto; -import java.util.List; - import lombok.Data; +import java.util.List; + /** * TODO:请概括描述当前类的主要用途和注意事项 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2405InputInpatient.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2405InputInpatient.java index fa78ab38..0a9b116c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2405InputInpatient.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2405InputInpatient.java @@ -4,7 +4,6 @@ package com.openhis.yb.dto; import com.alibaba.fastjson2.annotation.JSONField; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterEncounterDiagnoseInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterEncounterDiagnoseInfo.java index 3b50dab4..f2d6ee04 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterEncounterDiagnoseInfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterEncounterDiagnoseInfo.java @@ -1,10 +1,10 @@ package com.openhis.yb.dto; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 【3101】就诊诊断信息 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterEncounterPatientInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterEncounterPatientInfo.java index 10d6d29b..43704d91 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterEncounterPatientInfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterEncounterPatientInfo.java @@ -1,11 +1,11 @@ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 【3101】就诊患者信息 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterOrderInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterOrderInfo.java index 12db9ce8..e8a4361b 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterOrderInfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb3101AdapterOrderInfo.java @@ -1,11 +1,11 @@ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 【3101】处方（医嘱）信息 * 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 311af482..9321ca93 100644 --- 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 @@ -1,16 +1,13 @@ package com.openhis.yb.dto; -import java.util.List; +import com.alibaba.fastjson2.annotation.JSONField; +import lombok.Data; +import lombok.experimental.Accessors; +import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; - -import org.hibernate.validator.constraints.Length; - -import com.alibaba.fastjson2.annotation.JSONField; - -import lombok.Data; -import lombok.experimental.Accessors; +import java.util.List; /** * 【3101】输入-规则分析信息（节点标识：data） 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 7a3f85b9..bd66aa33 100644 --- 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 @@ -1,17 +1,14 @@ package com.openhis.yb.dto; -import java.util.Date; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -import org.hibernate.validator.constraints.Length; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.experimental.Accessors; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Date; /** * 【3101】输入-诊断信息（节点标识：fsi_diagnose_dtos） 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 96b67135..c2bf5724 100644 --- 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 @@ -1,20 +1,17 @@ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; +import com.alibaba.fastjson2.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; +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 org.hibernate.validator.constraints.Length; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; - -import lombok.Data; -import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; /** * 【3101】输入-就诊信息（节点标识：fsi_encounter_dtos） 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 703e8e71..4da9f348 100644 --- 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 @@ -1,15 +1,12 @@ package com.openhis.yb.dto; -import java.util.Date; - -import javax.validation.constraints.NotBlank; - -import org.hibernate.validator.constraints.Length; - import com.alibaba.fastjson2.annotation.JSONField; - import lombok.Data; import lombok.experimental.Accessors; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; +import java.util.Date; /** * 【3101】输入-手术操作信息（节点标识：fsi_operation_dtos） 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 0fee9204..0e839c4b 100644 --- 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 @@ -1,18 +1,15 @@ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -import org.hibernate.validator.constraints.Length; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.experimental.Accessors; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.util.Date; /** * 【3101】输入-处方（医嘱）信息（节点标识：fsi_order_dtos） 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 1592dc6c..44a46e6d 100644 --- 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 @@ -1,19 +1,16 @@ package com.openhis.yb.dto; -import java.util.Date; -import java.util.List; +import com.alibaba.fastjson2.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; +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 org.hibernate.validator.constraints.Length; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; - -import lombok.Data; -import lombok.experimental.Accessors; +import java.util.Date; +import java.util.List; /** * 【3101】输入-参保人信息（节点标识：patient_dtos） 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 a8d77c11..c8507c1b 100644 --- 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 @@ -1,16 +1,13 @@ package com.openhis.yb.dto; -import java.math.BigDecimal; +import com.alibaba.fastjson2.annotation.JSONField; +import lombok.Data; +import lombok.experimental.Accessors; +import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; - -import org.hibernate.validator.constraints.Length; - -import com.alibaba.fastjson2.annotation.JSONField; - -import lombok.Data; -import lombok.experimental.Accessors; +import java.math.BigDecimal; /** * 【3101】输出-违规明细信息（节点标识：judge_result_detail_dtos） 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 d9f9230e..200b3139 100644 --- 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 @@ -1,18 +1,15 @@ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.List; +import com.alibaba.fastjson2.annotation.JSONField; +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 org.hibernate.validator.constraints.Length; - -import com.alibaba.fastjson2.annotation.JSONField; - -import lombok.Data; -import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.List; /** * 【3101】输出-违规信息（节点标识：result） 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 e5dd87f9..ca2836b6 100644 --- 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 @@ -1,16 +1,13 @@ package com.openhis.yb.dto; -import java.util.List; +import com.alibaba.fastjson2.annotation.JSONField; +import lombok.Data; +import lombok.experimental.Accessors; +import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; - -import org.hibernate.validator.constraints.Length; - -import com.alibaba.fastjson2.annotation.JSONField; - -import lombok.Data; -import lombok.experimental.Accessors; +import java.util.List; /** * 【3103】输入（节点标识：data） 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 5ca6b426..733828cb 100644 --- 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 @@ -1,13 +1,11 @@ package com.openhis.yb.dto; -import javax.validation.constraints.NotBlank; - -import org.hibernate.validator.constraints.Length; - import com.alibaba.fastjson2.annotation.JSONField; - import lombok.Data; import lombok.experimental.Accessors; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; /** * 【3103】输入（节点标识：warns） diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AAdapterSettleInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AAdapterSettleInfo.java index 03375951..11a6e5ab 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AAdapterSettleInfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AAdapterSettleInfo.java @@ -1,10 +1,10 @@ package com.openhis.yb.dto; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 【4101A】结算清单信息 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputBldinfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputBldinfo.java index af81d951..125f53b9 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputBldinfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputBldinfo.java @@ -1,11 +1,9 @@ package com.openhis.yb.dto; -import org.hibernate.validator.constraints.Length; - import com.alibaba.fastjson2.annotation.JSONField; - import lombok.Data; import lombok.experimental.Accessors; +import org.hibernate.validator.constraints.Length; /** * 【4101A】输血信息（节点标识：bldinfo） 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 30f8cfe0..8308edb1 100644 --- 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 @@ -1,13 +1,11 @@ package com.openhis.yb.dto; -import javax.validation.constraints.NotBlank; - -import org.hibernate.validator.constraints.Length; - import com.alibaba.fastjson2.annotation.JSONField; - import lombok.Data; import lombok.experimental.Accessors; +import org.hibernate.validator.constraints.Length; + +import javax.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 92dce9c9..865356eb 100644 --- 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 @@ -1,16 +1,13 @@ package com.openhis.yb.dto; -import java.util.Date; - -import javax.validation.constraints.NotBlank; - -import org.hibernate.validator.constraints.Length; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.experimental.Accessors; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; +import java.util.Date; /** * 【4101A】重症监护信息（节点标识：icuinfo） 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 ca55bb30..80d4a6f0 100644 --- 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 @@ -1,7 +1,6 @@ package com.openhis.yb.dto; import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; 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 c988e688..c6a618a2 100644 --- 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 @@ -1,16 +1,13 @@ package com.openhis.yb.dto; -import java.util.Date; - -import javax.validation.constraints.NotBlank; - -import org.hibernate.validator.constraints.Length; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.experimental.Accessors; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; +import java.util.Date; /** * 【4101A】手术操作信息（节点标识：oprninfo） 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 5ed1801a..d2db2075 100644 --- 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 @@ -1,13 +1,11 @@ package com.openhis.yb.dto; -import javax.validation.constraints.NotBlank; - -import org.hibernate.validator.constraints.Length; - import com.alibaba.fastjson2.annotation.JSONField; - import lombok.Data; import lombok.experimental.Accessors; +import org.hibernate.validator.constraints.Length; + +import javax.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 5ed7806b..95a6e477 100644 --- 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 @@ -1,18 +1,15 @@ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -import org.hibernate.validator.constraints.Length; - import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.experimental.Accessors; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.util.Date; /** * 【4101A】结算清单信息（节点标识setlinfo） 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 63a5ac9f..77affd2d 100644 --- 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 @@ -1,13 +1,11 @@ package com.openhis.yb.dto; -import javax.validation.constraints.NotBlank; - -import org.hibernate.validator.constraints.Length; - import com.alibaba.fastjson2.annotation.JSONField; - import lombok.Data; import lombok.experimental.Accessors; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; /** * 【4101A】输出（节点标识：data） diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputBaseInfoDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputBaseInfoDto.java index b5f9c797..42cf0c60 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputBaseInfoDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputBaseInfoDto.java @@ -3,12 +3,12 @@ */ package com.openhis.yb.dto; -import java.math.BigDecimal; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; +import java.util.Date; + /** * 【4401】基本信息 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputDto.java index 0c5d5b1f..9f367ab9 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputDto.java @@ -3,10 +3,10 @@ */ package com.openhis.yb.dto; -import java.util.List; - import lombok.Data; +import java.util.List; + /** * 【4401】 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputIcuInfoDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputIcuInfoDto.java index e9bdb002..9249478f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputIcuInfoDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputIcuInfoDto.java @@ -3,11 +3,11 @@ */ package com.openhis.yb.dto; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 【4401】重症监护信息 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputOprnInfoDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputOprnInfoDto.java index 4ed4097e..50c54898 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputOprnInfoDto.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4401InputOprnInfoDto.java @@ -3,11 +3,11 @@ */ package com.openhis.yb.dto; -import java.util.Date; - import lombok.Data; import lombok.experimental.Accessors; +import java.util.Date; + /** * 【4401】手术信息 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb5205InputSpecialDisease.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb5205InputSpecialDisease.java index 4eb90135..a34a809d 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb5205InputSpecialDisease.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb5205InputSpecialDisease.java @@ -3,14 +3,12 @@ */ package com.openhis.yb.dto; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * 医保5205接口请求参数 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb5205OutputSpecialDisease.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb5205OutputSpecialDisease.java index c84e462c..8c95aa72 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb5205OutputSpecialDisease.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb5205OutputSpecialDisease.java @@ -3,13 +3,12 @@ */ package com.openhis.yb.dto; +import com.alibaba.fastjson.annotation.JSONField; +import lombok.Data; + import java.math.BigDecimal; import java.util.Date; -import com.alibaba.fastjson.annotation.JSONField; - -import lombok.Data; - /** * 【5205】接口返回结果 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/extData.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/extData.java index 4696931b..776a9504 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/extData.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/extData.java @@ -1,13 +1,6 @@ package com.openhis.yb.dto; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - -import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicUnRegMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicUnRegMapper.java index 459df21f..ce771801 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicUnRegMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicUnRegMapper.java @@ -1,10 +1,9 @@ package com.openhis.yb.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.yb.domain.ClinicUnReg; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - /** * 撤销挂号记录Mapper接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicUnSettleMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicUnSettleMapper.java index a048eb2c..8c0d9c46 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicUnSettleMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/ClinicUnSettleMapper.java @@ -1,10 +1,9 @@ package com.openhis.yb.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.yb.domain.ClinicUnSettle; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - /** * 【请填写功能名称】Mapper接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/DirectoryCheckRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/DirectoryCheckRecordMapper.java index 94ca1db2..8cede499 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/DirectoryCheckRecordMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/DirectoryCheckRecordMapper.java @@ -1,9 +1,8 @@ package com.openhis.yb.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.yb.domain.DirectoryCheckRecord; +import org.springframework.stereotype.Repository; /** * 医保Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/FinancialApplyRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/FinancialApplyRecordMapper.java index 25705c0f..7416822e 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/FinancialApplyRecordMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/FinancialApplyRecordMapper.java @@ -1,9 +1,8 @@ package com.openhis.yb.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.yb.domain.FinancialApplyRecord; +import org.springframework.stereotype.Repository; /** * 医保财务申请记录Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/FinancialReconcileRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/FinancialReconcileRecordMapper.java index 4049f19d..e6875447 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/FinancialReconcileRecordMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/FinancialReconcileRecordMapper.java @@ -1,9 +1,8 @@ package com.openhis.yb.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.yb.domain.FinancialReconcileRecord; +import org.springframework.stereotype.Repository; /** * ybMapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientDischargeMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientDischargeMapper.java index c7d0d10d..f6e57bc9 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientDischargeMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientDischargeMapper.java @@ -5,7 +5,6 @@ package com.openhis.yb.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.yb.domain.InpatientDischarge; -import com.openhis.yb.domain.InpatientReg; import org.springframework.stereotype.Repository; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientFeeDetailMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientFeeDetailMapper.java index c2cf1b4d..b9b0b4e9 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientFeeDetailMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientFeeDetailMapper.java @@ -2,7 +2,6 @@ package com.openhis.yb.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.yb.domain.InpatientFeeDetail; -import com.openhis.yb.domain.InventoryChangeRecord; import org.springframework.stereotype.Repository; @Repository diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientPreSettleMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientPreSettleMapper.java index cd36d3b3..329cfdf3 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientPreSettleMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientPreSettleMapper.java @@ -2,7 +2,6 @@ package com.openhis.yb.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.yb.domain.InpatientPreSettle; -import com.openhis.yb.domain.InpatientSettle; import org.springframework.stereotype.Repository; @Repository diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientRegInfoUpdateRecordeMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientRegInfoUpdateRecordeMapper.java index 67ba8ffe..91c5b55f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientRegInfoUpdateRecordeMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientRegInfoUpdateRecordeMapper.java @@ -4,7 +4,6 @@ package com.openhis.yb.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.openhis.yb.domain.InpatientDischarge; import com.openhis.yb.domain.InpatientRegInfoUpdateRecorde; import org.springframework.stereotype.Repository; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientRegMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientRegMapper.java index 43676fb4..3b4e18d4 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientRegMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientRegMapper.java @@ -4,7 +4,6 @@ package com.openhis.yb.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.openhis.yb.domain.FinancialReconcileRecord; import com.openhis.yb.domain.InpatientReg; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientSettleMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientSettleMapper.java index 78ca6ac3..39ecc681 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientSettleMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientSettleMapper.java @@ -1,7 +1,6 @@ package com.openhis.yb.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.openhis.yb.domain.InpatientFeeDetail; import com.openhis.yb.domain.InpatientSettle; import org.springframework.stereotype.Repository; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryChangeRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryChangeRecordMapper.java index d0cd518c..c6892ecf 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryChangeRecordMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryChangeRecordMapper.java @@ -1,9 +1,8 @@ package com.openhis.yb.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.yb.domain.InventoryChangeRecord; +import org.springframework.stereotype.Repository; /** * 库存信息变更记录Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryCheckRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryCheckRecordMapper.java index 66881597..b7607d38 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryCheckRecordMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryCheckRecordMapper.java @@ -1,9 +1,8 @@ package com.openhis.yb.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.yb.domain.InventoryCheckRecord; +import org.springframework.stereotype.Repository; /** * 库存盘点记录Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryDelRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryDelRecordMapper.java index b257b3aa..9aff4f0a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryDelRecordMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryDelRecordMapper.java @@ -1,9 +1,8 @@ package com.openhis.yb.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.yb.domain.InventoryDelRecord; +import org.springframework.stereotype.Repository; /** * 库存删除记录Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryPurchaseRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryPurchaseRecordMapper.java index c6f5e789..542a3532 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryPurchaseRecordMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryPurchaseRecordMapper.java @@ -1,9 +1,8 @@ package com.openhis.yb.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.yb.domain.InventoryPurchaseRecord; +import org.springframework.stereotype.Repository; /** * 库存采购/退货记录Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryPurchaseReturnRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryPurchaseReturnRecordMapper.java index b3f73983..ddfef957 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryPurchaseReturnRecordMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventoryPurchaseReturnRecordMapper.java @@ -1,9 +1,8 @@ package com.openhis.yb.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.yb.domain.InventoryPurchaseReturnRecord; +import org.springframework.stereotype.Repository; /** * 采购/退货记录Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventorySaleRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventorySaleRecordMapper.java index 73c11710..4dd6983b 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventorySaleRecordMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventorySaleRecordMapper.java @@ -1,9 +1,8 @@ package com.openhis.yb.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.yb.domain.InventorySaleRecord; +import org.springframework.stereotype.Repository; /** * 销售/退货记录Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventorySaleReturnRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventorySaleReturnRecordMapper.java index 75065c5a..6d111fad 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventorySaleReturnRecordMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InventorySaleReturnRecordMapper.java @@ -1,9 +1,8 @@ package com.openhis.yb.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.yb.domain.InventorySaleReturnRecord; +import org.springframework.stereotype.Repository; /** * 销售/退货记录Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/Clinic2207OrderParam.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/Clinic2207OrderParam.java index 93ee8869..51f7075b 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/Clinic2207OrderParam.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/Clinic2207OrderParam.java @@ -5,7 +5,6 @@ package com.openhis.yb.model; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; - import lombok.Data; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/OutpatientRegistrationModel.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/OutpatientRegistrationModel.java index b9167ee0..4745a424 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/OutpatientRegistrationModel.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/model/OutpatientRegistrationModel.java @@ -1,9 +1,9 @@ package com.openhis.yb.model; -import java.math.BigDecimal; - import lombok.Data; +import java.math.BigDecimal; + @Data public class OutpatientRegistrationModel { // 就诊凭证类型 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicSettleService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicSettleService.java index 3ec9af30..bcd1c417 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicSettleService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicSettleService.java @@ -1,7 +1,6 @@ package com.openhis.yb.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.openhis.yb.domain.ClinicReg; import com.openhis.yb.domain.ClinicSettle; import java.util.List; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicUnSettleService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicUnSettleService.java index 1894ac18..daa98f1f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicUnSettleService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IClinicUnSettleService.java @@ -1,10 +1,10 @@ package com.openhis.yb.service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.yb.domain.ClinicUnSettle; +import java.util.List; + /** * 【请填写功能名称】Service接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientDischargeService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientDischargeService.java index 886ae0a5..768dfc63 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientDischargeService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientDischargeService.java @@ -5,7 +5,6 @@ package com.openhis.yb.service; import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.yb.domain.InpatientDischarge; -import com.openhis.yb.domain.InpatientReg; /** * 出院办理服务接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientFeeDetailService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientFeeDetailService.java index 0c7c21b2..e06aee56 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientFeeDetailService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientFeeDetailService.java @@ -1,7 +1,6 @@ package com.openhis.yb.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.openhis.yb.domain.InfoPerson; import com.openhis.yb.domain.InpatientFeeDetail; import java.util.List; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientPreSettleService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientPreSettleService.java index 63b241b0..c0cd9203 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientPreSettleService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientPreSettleService.java @@ -2,9 +2,6 @@ package com.openhis.yb.service; import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.yb.domain.InpatientPreSettle; -import com.openhis.yb.domain.InpatientSettle; - -import java.util.List; public interface IInpatientPreSettleService extends IService { diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientRegInfoUpdateRecordeService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientRegInfoUpdateRecordeService.java index c4e5aa74..6ae4482b 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientRegInfoUpdateRecordeService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientRegInfoUpdateRecordeService.java @@ -4,7 +4,6 @@ package com.openhis.yb.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.openhis.yb.domain.InpatientReg; import com.openhis.yb.domain.InpatientRegInfoUpdateRecorde; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientRegService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientRegService.java index 7045465d..0c6322e3 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientRegService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientRegService.java @@ -5,7 +5,6 @@ package com.openhis.yb.service; import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.yb.domain.InpatientReg; -import com.openhis.yb.domain.InventorySaleReturnRecord; /** * TODO:请概括描述当前接口的主要用途和注意事项 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientSettleService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientSettleService.java index 621686d2..e65a719d 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientSettleService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientSettleService.java @@ -1,10 +1,10 @@ package com.openhis.yb.service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.yb.domain.InpatientSettle; +import java.util.List; + public interface IInpatientSettleService extends IService { /** * 根据医保结算id找到住院结算id diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IRegService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IRegService.java index 0204a5ba..7438c3c6 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IRegService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IRegService.java @@ -1,11 +1,8 @@ package com.openhis.yb.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.openhis.workflow.domain.SupplyRequest; import com.openhis.yb.domain.ClinicReg; -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 a8a0480a..4f57106a 100644 --- 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 @@ -3,29 +3,12 @@ */ package com.openhis.yb.service; -import java.math.BigDecimal; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.ZoneId; -import java.time.format.DateTimeFormatter; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.constraints.NotNull; - -import com.core.common.enums.DelFlag; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.core.common.enums.DelFlag; import com.core.common.exception.ServiceException; import com.core.common.utils.AssignSeqUtil; import com.core.common.utils.DateUtils; @@ -64,6 +47,21 @@ import com.openhis.yb.model.Clinic2207OrderModel; import com.openhis.yb.model.Clinic2207OrderParam; import com.openhis.yb.service.impl.DirectoryCheckRecordServiceImpl; import com.openhis.yb.util.YbParamBuilderUtil; +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 java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; /** * 医保表的增删改查接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbHttpUtils.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbHttpUtils.java index 68051883..3c5d8020 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbHttpUtils.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbHttpUtils.java @@ -3,14 +3,26 @@ */ package com.openhis.yb.service; -import static com.alibaba.fastjson2.JSON.parseObject; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.List; - +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; +import com.core.common.exception.ServiceException; +import com.core.common.utils.SecurityUtils; +import com.core.common.utils.StringUtils; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; +import com.openhis.financial.domain.Contract; +import com.openhis.financial.service.IContractService; +import com.openhis.financial.service.impl.ContractServiceImpl; +import com.openhis.yb.domain.ClinicReg; +import com.openhis.yb.domain.InpatientReg; +import com.openhis.yb.dto.*; +import com.openhis.yb.model.Clinic2207OrderModel; +import com.openhis.yb.model.Clinic2207OrderParam; +import com.openhis.yb.util.YbParamBuilderUtil; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; @@ -33,26 +45,13 @@ import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; import org.springframework.web.multipart.MultipartFile; -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONArray; -import com.alibaba.fastjson2.JSONObject; -import com.core.common.exception.ServiceException; -import com.core.common.utils.SecurityUtils; -import com.core.common.utils.StringUtils; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategies; -import com.openhis.financial.domain.Contract; -import com.openhis.financial.service.IContractService; -import com.openhis.financial.service.impl.ContractServiceImpl; -import com.openhis.yb.domain.ClinicReg; -import com.openhis.yb.domain.InpatientReg; -import com.openhis.yb.dto.*; -import com.openhis.yb.model.Clinic2207OrderModel; -import com.openhis.yb.model.Clinic2207OrderParam; -import com.openhis.yb.util.YbParamBuilderUtil; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; + +import static com.alibaba.fastjson2.JSON.parseObject; /** * http请求接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbManager.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbManager.java index be1df772..c482dba6 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbManager.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/YbManager.java @@ -3,20 +3,6 @@ */ package com.openhis.yb.service; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -63,6 +49,19 @@ import com.openhis.yb.model.OutpatientRegistrationModel; import com.openhis.yb.service.impl.DirectoryCheckRecordServiceImpl; import com.openhis.yb.util.CommonConstant; import com.openhis.yb.util.YbParamBuilderUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; /** * 医保服务（与ybController方法一致，原定是ui触发医保controller，2025/05/05由于缺少ui资源，欲使用对应的业务controller直接触发医保服务，故将其下沉到Service层） diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicPreSettleServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicPreSettleServiceImpl.java index 3ac30b1f..c10aed8c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicPreSettleServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicPreSettleServiceImpl.java @@ -1,12 +1,11 @@ package com.openhis.yb.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.yb.domain.ClinicPreSettle; import com.openhis.yb.mapper.ClinicPreSettleMapper; import com.openhis.yb.service.IClinicPreSettleService; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - /** * 【请填写功能名称】Service业务层处理 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicSettleServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicSettleServiceImpl.java index 72adc29c..e87beeae 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicSettleServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicSettleServiceImpl.java @@ -1,14 +1,12 @@ package com.openhis.yb.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.openhis.yb.domain.ClinicReg; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.yb.domain.ClinicSettle; import com.openhis.yb.mapper.ClinicSettleMapper; import com.openhis.yb.service.IClinicSettleService; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - import java.util.List; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnRegServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnRegServiceImpl.java index a2192ad5..298339d6 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnRegServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnRegServiceImpl.java @@ -1,12 +1,11 @@ package com.openhis.yb.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.yb.domain.ClinicUnReg; +import com.openhis.yb.mapper.ClinicUnRegMapper; import com.openhis.yb.service.IClinicUnRegService; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.openhis.yb.mapper.ClinicUnRegMapper; - /** * 撤销挂号记录Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnSettleServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnSettleServiceImpl.java index 2bf0b58d..bec79cea 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnSettleServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/ClinicUnSettleServiceImpl.java @@ -1,15 +1,14 @@ package com.openhis.yb.service.impl; -import java.util.List; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.core.common.enums.DelFlag; import com.openhis.yb.domain.ClinicUnSettle; import com.openhis.yb.mapper.ClinicUnSettleMapper; import com.openhis.yb.service.IClinicUnSettleService; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 【请填写功能名称】Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/DirectoryCheckRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/DirectoryCheckRecordServiceImpl.java index 44016e87..489921e3 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/DirectoryCheckRecordServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/DirectoryCheckRecordServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.yb.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.yb.domain.DirectoryCheckRecord; import com.openhis.yb.mapper.DirectoryCheckRecordMapper; import com.openhis.yb.service.IDirectoryCheckRecordService; +import org.springframework.stereotype.Service; /** * 医保Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialApplyRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialApplyRecordServiceImpl.java index 8dd2dc88..51564a9c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialApplyRecordServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialApplyRecordServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.yb.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.yb.domain.FinancialApplyRecord; import com.openhis.yb.mapper.FinancialApplyRecordMapper; import com.openhis.yb.service.IFinancialApplyRecordService; +import org.springframework.stereotype.Service; /** * 医保财务申请记录Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialReconcileRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialReconcileRecordServiceImpl.java index b9bd9dc3..ce84284a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialReconcileRecordServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/FinancialReconcileRecordServiceImpl.java @@ -1,12 +1,11 @@ package com.openhis.yb.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.yb.domain.FinancialReconcileRecord; import com.openhis.yb.mapper.FinancialReconcileRecordMapper; import com.openhis.yb.service.IFinancialReconcileRecordService; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - /** * ybService业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientPreSettleServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientPreSettleServiceImpl.java index f6971c7e..70c4008c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientPreSettleServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientPreSettleServiceImpl.java @@ -1,19 +1,11 @@ package com.openhis.yb.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.core.common.enums.DelFlag; -import com.openhis.common.constant.YbCommonConstants; import com.openhis.yb.domain.InpatientPreSettle; -import com.openhis.yb.domain.InpatientSettle; import com.openhis.yb.mapper.InpatientPreSettleMapper; -import com.openhis.yb.mapper.InpatientSettleMapper; import com.openhis.yb.service.IInpatientPreSettleService; -import com.openhis.yb.service.IInpatientSettleService; import org.springframework.stereotype.Service; -import java.util.List; - @Service public class InpatientPreSettleServiceImpl extends ServiceImpl implements IInpatientPreSettleService { diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientRegInfoUpdateRecordeServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientRegInfoUpdateRecordeServiceImpl.java index 910cf4be..b7433cd6 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientRegInfoUpdateRecordeServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientRegInfoUpdateRecordeServiceImpl.java @@ -4,11 +4,8 @@ package com.openhis.yb.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.openhis.yb.domain.InpatientDischarge; import com.openhis.yb.domain.InpatientRegInfoUpdateRecorde; -import com.openhis.yb.mapper.InpatientDischargeMapper; import com.openhis.yb.mapper.InpatientRegInfoUpdateRecordeMapper; -import com.openhis.yb.service.IInpatientDischargeService; import com.openhis.yb.service.IInpatientRegInfoUpdateRecordeService; import org.springframework.stereotype.Service; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientSettleServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientSettleServiceImpl.java index 2b613af5..cf89279e 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientSettleServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientSettleServiceImpl.java @@ -1,16 +1,15 @@ package com.openhis.yb.service.impl; -import java.util.List; - -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.openhis.common.constant.YbCommonConstants; import com.core.common.enums.DelFlag; +import com.openhis.common.constant.YbCommonConstants; import com.openhis.yb.domain.InpatientSettle; import com.openhis.yb.mapper.InpatientSettleMapper; import com.openhis.yb.service.IInpatientSettleService; +import org.springframework.stereotype.Service; + +import java.util.List; @Service public class InpatientSettleServiceImpl extends ServiceImpl diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryChangeRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryChangeRecordServiceImpl.java index 18bc971f..e4a0a1d5 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryChangeRecordServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryChangeRecordServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.yb.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.yb.domain.InventoryChangeRecord; import com.openhis.yb.mapper.InventoryChangeRecordMapper; import com.openhis.yb.service.IInventoryChangeRecordService; +import org.springframework.stereotype.Service; /** * 库存信息变更记录Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryCheckRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryCheckRecordServiceImpl.java index aaa60e85..7675e9fc 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryCheckRecordServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryCheckRecordServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.yb.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.yb.domain.InventoryCheckRecord; import com.openhis.yb.mapper.InventoryCheckRecordMapper; import com.openhis.yb.service.IInventoryCheckRecordService; +import org.springframework.stereotype.Service; /** * 库存盘点记录Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryDelRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryDelRecordServiceImpl.java index 551e4324..dd073671 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryDelRecordServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryDelRecordServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.yb.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.yb.domain.InventoryDelRecord; import com.openhis.yb.mapper.InventoryDelRecordMapper; import com.openhis.yb.service.IInventoryDelRecordService; +import org.springframework.stereotype.Service; /** * 库存删除记录Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseRecordServiceImpl.java index e2e1d060..01a0857a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseRecordServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseRecordServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.yb.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.yb.domain.InventoryPurchaseRecord; import com.openhis.yb.mapper.InventoryPurchaseRecordMapper; import com.openhis.yb.service.IInventoryPurchaseRecordService; +import org.springframework.stereotype.Service; /** * 库存采购/退货记录Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseReturnRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseReturnRecordServiceImpl.java index b305809b..0d7e4e2f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseReturnRecordServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventoryPurchaseReturnRecordServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.yb.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.yb.domain.InventoryPurchaseReturnRecord; import com.openhis.yb.mapper.InventoryPurchaseReturnRecordMapper; import com.openhis.yb.service.IInventoryPurchaseReturnRecordService; +import org.springframework.stereotype.Service; /** * 采购/退货记录Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleRecordServiceImpl.java index f5f572b7..4543a96a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleRecordServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleRecordServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.yb.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.yb.domain.InventorySaleRecord; import com.openhis.yb.mapper.InventorySaleRecordMapper; import com.openhis.yb.service.IInventorySaleRecordService; +import org.springframework.stereotype.Service; /** * 销售/退货记录Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleReturnRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleReturnRecordServiceImpl.java index 27d0e30a..07f9e021 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleReturnRecordServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InventorySaleReturnRecordServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.yb.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.yb.domain.InventorySaleReturnRecord; import com.openhis.yb.mapper.InventorySaleReturnRecordMapper; import com.openhis.yb.service.IInventorySaleReturnRecordService; +import org.springframework.stereotype.Service; /** * 销售/退货记录Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/PerinfoServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/PerinfoServiceImpl.java index 29412e3e..0ee9dbdd 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/PerinfoServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/PerinfoServiceImpl.java @@ -5,11 +5,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.core.common.exception.ServiceException; import com.core.common.utils.StringUtils; import com.openhis.common.constant.YbCommonConstants; -import com.openhis.financial.domain.Contract; import com.openhis.yb.domain.InfoPerson; -import com.openhis.yb.service.IPerinfoService; import com.openhis.yb.mapper.PerinfoMapper; - +import com.openhis.yb.service.IPerinfoService; import org.springframework.stereotype.Service; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/RegServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/RegServiceImpl.java index 3efec7bf..0fad1808 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/RegServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/RegServiceImpl.java @@ -2,15 +2,11 @@ package com.openhis.yb.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.openhis.workflow.domain.SupplyRequest; -import com.openhis.yb.service.IRegService; import com.openhis.yb.domain.ClinicReg; import com.openhis.yb.mapper.RegMapper; - +import com.openhis.yb.service.IRegService; import org.springframework.stereotype.Service; -import java.util.List; - /** * 挂号管理-服务 */ diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/SignServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/SignServiceImpl.java index fffa2503..b0de1aa5 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/SignServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/SignServiceImpl.java @@ -1,10 +1,9 @@ package com.openhis.yb.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.openhis.yb.service.ISignService; import com.openhis.yb.domain.Sign; import com.openhis.yb.mapper.SignMapper; - +import com.openhis.yb.service.ISignService; import org.springframework.stereotype.Service; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/util/YbParamBuilderUtil.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/util/YbParamBuilderUtil.java index 539ca6a7..28e08b37 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/util/YbParamBuilderUtil.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/util/YbParamBuilderUtil.java @@ -3,15 +3,6 @@ */ package com.openhis.yb.util; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.*; -import java.util.stream.Collectors; - -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.core.common.core.domain.model.LoginUser; @@ -63,6 +54,14 @@ import com.openhis.ybcatalog.domain.CatalogDrugInfo; import com.openhis.ybcatalog.domain.CatalogMedicalHerbInfo; import com.openhis.ybcatalog.service.ICatalogDrugInfoService; import com.openhis.ybcatalog.service.ICatalogMedicalHerbInfoService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.*; +import java.util.stream.Collectors; /** * 医保接口调用工具 todo:sjq 若部署云服务，该工具类内所有的查询原则上增加租户的查询条件 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogDrugInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogDrugInfo.java index 480c97f8..faf5d67e 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogDrugInfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogDrugInfo.java @@ -1,13 +1,8 @@ package com.openhis.ybcatalog.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - -import com.core.common.core.domain.HisBaseEntity; import com.opencsv.bean.CsvBindByPosition; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogDrugInfoUsual.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogDrugInfoUsual.java index bdad01c8..a230bc5d 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogDrugInfoUsual.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogDrugInfoUsual.java @@ -1,13 +1,8 @@ package com.openhis.ybcatalog.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - -import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalConsumables.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalConsumables.java index 432de918..b8771c8b 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalConsumables.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalConsumables.java @@ -1,13 +1,8 @@ package com.openhis.ybcatalog.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - -import com.core.common.core.domain.HisBaseEntity; import com.opencsv.bean.CsvBindByPosition; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalHerbInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalHerbInfo.java index 89fb69ac..114d5332 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalHerbInfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalHerbInfo.java @@ -1,13 +1,8 @@ package com.openhis.ybcatalog.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - -import com.core.common.core.domain.HisBaseEntity; import com.opencsv.bean.CsvBindByPosition; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalService.java index 179ba391..a69ae1cc 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogMedicalService.java @@ -1,13 +1,8 @@ package com.openhis.ybcatalog.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - -import com.core.common.core.domain.HisBaseEntity; import com.opencsv.bean.CsvBindByPosition; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSpecialDisease.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSpecialDisease.java index 2a75cda8..d1e3bef9 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSpecialDisease.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSpecialDisease.java @@ -3,7 +3,6 @@ package com.openhis.ybcatalog.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSurgeryStandardDirectory.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSurgeryStandardDirectory.java index 4ce61ceb..c84a1c35 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSurgeryStandardDirectory.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogSurgeryStandardDirectory.java @@ -1,13 +1,8 @@ package com.openhis.ybcatalog.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - -import com.core.common.core.domain.HisBaseEntity; import com.opencsv.bean.CsvBindByPosition; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogWesternDisease.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogWesternDisease.java index 28acdd24..599a9bcb 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogWesternDisease.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogWesternDisease.java @@ -1,13 +1,8 @@ package com.openhis.ybcatalog.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - -import com.core.common.core.domain.HisBaseEntity; import com.opencsv.bean.CsvBindByPosition; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZyDiseaseDiagnosis.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZyDiseaseDiagnosis.java index ed255e8e..ad2b5007 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZyDiseaseDiagnosis.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZyDiseaseDiagnosis.java @@ -1,13 +1,8 @@ package com.openhis.ybcatalog.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - -import com.core.common.core.domain.HisBaseEntity; import com.opencsv.bean.CsvBindByPosition; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZySyndrome.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZySyndrome.java index 25fa4bce..8e003f87 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZySyndrome.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/domain/CatalogZySyndrome.java @@ -1,13 +1,8 @@ package com.openhis.ybcatalog.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - -import com.core.common.core.domain.HisBaseEntity; import com.opencsv.bean.CsvBindByPosition; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogDrugInfoMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogDrugInfoMapper.java index 27c7b4ad..d336c9c3 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogDrugInfoMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogDrugInfoMapper.java @@ -1,10 +1,9 @@ package com.openhis.ybcatalog.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybcatalog.domain.CatalogDrugInfo; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - /** * 西药中成药目录Mapper接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogDrugInfoUsualMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogDrugInfoUsualMapper.java index da48c179..1c940d7e 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogDrugInfoUsualMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogDrugInfoUsualMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybcatalog.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybcatalog.domain.CatalogDrugInfoUsual; +import org.springframework.stereotype.Repository; /** * 西药中成药目录Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalConsumablesMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalConsumablesMapper.java index ea63f13b..37fe3084 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalConsumablesMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalConsumablesMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybcatalog.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybcatalog.domain.CatalogMedicalConsumables; +import org.springframework.stereotype.Repository; /** * 医疗耗材信息Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalHerbInfoMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalHerbInfoMapper.java index 42f7ff9e..ed77d1ab 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalHerbInfoMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalHerbInfoMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybcatalog.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybcatalog.domain.CatalogMedicalHerbInfo; +import org.springframework.stereotype.Repository; /** * 中药材信息Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalServiceMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalServiceMapper.java index aa72230a..e3b017da 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalServiceMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogMedicalServiceMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybcatalog.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybcatalog.domain.CatalogMedicalService; +import org.springframework.stereotype.Repository; /** * 医疗服务项目Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSpecialDiseaseMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSpecialDiseaseMapper.java index 0b4c6645..81b31440 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSpecialDiseaseMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSpecialDiseaseMapper.java @@ -1,11 +1,9 @@ package com.openhis.ybcatalog.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybcatalog.domain.CatalogSpecialDisease; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.openhis.ybcatalog.domain.CatalogSpecialInsuranceDisease; - /** * 特慢病目录 Mapper接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSurgeryStandardDirectoryMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSurgeryStandardDirectoryMapper.java index bb7f413c..2cf4044f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSurgeryStandardDirectoryMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogSurgeryStandardDirectoryMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybcatalog.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybcatalog.domain.CatalogSurgeryStandardDirectory; +import org.springframework.stereotype.Repository; /** * 手术标准目录Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogWesternDiseaseMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogWesternDiseaseMapper.java index 9d0a2251..31470ace 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogWesternDiseaseMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogWesternDiseaseMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybcatalog.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybcatalog.domain.CatalogWesternDisease; +import org.springframework.stereotype.Repository; /** * 西医疾病诊断信息Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogZyDiseaseDiagnosisMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogZyDiseaseDiagnosisMapper.java index f501c91b..20f460f6 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogZyDiseaseDiagnosisMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogZyDiseaseDiagnosisMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybcatalog.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybcatalog.domain.CatalogZyDiseaseDiagnosis; +import org.springframework.stereotype.Repository; /** * 中医疾病诊断Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogZySyndromeMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogZySyndromeMapper.java index 58c72619..5744a149 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogZySyndromeMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/mapper/CatalogZySyndromeMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybcatalog.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybcatalog.domain.CatalogZySyndrome; +import org.springframework.stereotype.Repository; /** * 【请填写功能名称】Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogDrugInfoService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogDrugInfoService.java index 565e982c..667e31b3 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogDrugInfoService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogDrugInfoService.java @@ -1,13 +1,7 @@ package com.openhis.ybcatalog.service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.openhis.workflow.domain.ElepMedicationRequest; import com.openhis.ybcatalog.domain.CatalogDrugInfo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; /** * 西药中成药目录Service接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogDrugInfoUsualService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogDrugInfoUsualService.java index 88b1ae67..576b659f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogDrugInfoUsualService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogDrugInfoUsualService.java @@ -1,6 +1,5 @@ package com.openhis.ybcatalog.service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.ybcatalog.domain.CatalogDrugInfoUsual; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalConsumablesService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalConsumablesService.java index 261410c1..179230b7 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalConsumablesService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalConsumablesService.java @@ -1,7 +1,6 @@ package com.openhis.ybcatalog.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.openhis.ybcatalog.domain.CatalogDrugInfo; import com.openhis.ybcatalog.domain.CatalogMedicalConsumables; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalHerbInfoService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalHerbInfoService.java index 0f5a9851..c81f7e25 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalHerbInfoService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalHerbInfoService.java @@ -1,7 +1,6 @@ package com.openhis.ybcatalog.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.openhis.ybcatalog.domain.CatalogDrugInfo; import com.openhis.ybcatalog.domain.CatalogMedicalHerbInfo; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalServiceService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalServiceService.java index a8c8926d..37fade8e 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalServiceService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogMedicalServiceService.java @@ -1,7 +1,6 @@ package com.openhis.ybcatalog.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.openhis.ybcatalog.domain.CatalogDrugInfo; import com.openhis.ybcatalog.domain.CatalogMedicalService; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSpecialDiseaseService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSpecialDiseaseService.java index eaa6ffa1..0e391575 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSpecialDiseaseService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSpecialDiseaseService.java @@ -1,9 +1,7 @@ package com.openhis.ybcatalog.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.openhis.ybcatalog.domain.CatalogDrugInfo; import com.openhis.ybcatalog.domain.CatalogSpecialDisease; -import com.openhis.ybcatalog.domain.CatalogSpecialInsuranceDisease; /** * 特慢病目录 Service接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSpecialInsuranceDiseaseService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSpecialInsuranceDiseaseService.java index 5d3a7e5c..ea0a1eb9 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSpecialInsuranceDiseaseService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSpecialInsuranceDiseaseService.java @@ -1,7 +1,6 @@ package com.openhis.ybcatalog.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.openhis.ybcatalog.domain.CatalogDrugInfo; import com.openhis.ybcatalog.domain.CatalogSpecialInsuranceDisease; public interface ICatalogSpecialInsuranceDiseaseService extends IService { diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSurgeryStandardDirectoryService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSurgeryStandardDirectoryService.java index 6eec882d..67f412f1 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSurgeryStandardDirectoryService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogSurgeryStandardDirectoryService.java @@ -1,7 +1,6 @@ package com.openhis.ybcatalog.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.openhis.ybcatalog.domain.CatalogDrugInfo; import com.openhis.ybcatalog.domain.CatalogSurgeryStandardDirectory; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogWesternDiseaseService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogWesternDiseaseService.java index 679a7bc4..9cb959b2 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogWesternDiseaseService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogWesternDiseaseService.java @@ -1,7 +1,6 @@ package com.openhis.ybcatalog.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.openhis.ybcatalog.domain.CatalogDrugInfo; import com.openhis.ybcatalog.domain.CatalogWesternDisease; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogZyDiseaseDiagnosisService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogZyDiseaseDiagnosisService.java index f591b7fc..08071848 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogZyDiseaseDiagnosisService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogZyDiseaseDiagnosisService.java @@ -1,7 +1,6 @@ package com.openhis.ybcatalog.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.openhis.ybcatalog.domain.CatalogDrugInfo; import com.openhis.ybcatalog.domain.CatalogZyDiseaseDiagnosis; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogZySyndromeService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogZySyndromeService.java index 389a766d..98386895 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogZySyndromeService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/ICatalogZySyndromeService.java @@ -1,7 +1,6 @@ package com.openhis.ybcatalog.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.openhis.ybcatalog.domain.CatalogDrugInfo; import com.openhis.ybcatalog.domain.CatalogZySyndrome; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogDrugInfoServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogDrugInfoServiceImpl.java index 50902adb..a95d793d 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogDrugInfoServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogDrugInfoServiceImpl.java @@ -1,16 +1,13 @@ package com.openhis.ybcatalog.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.common.constant.YbCommonConstants; import com.openhis.ybcatalog.domain.CatalogDrugInfo; import com.openhis.ybcatalog.mapper.CatalogDrugInfoMapper; import com.openhis.ybcatalog.service.ICatalogDrugInfoService; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - /** * 西药中成药目录Service业务层处理 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogDrugInfoUsualServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogDrugInfoUsualServiceImpl.java index 0c19a2f6..37e8d770 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogDrugInfoUsualServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogDrugInfoUsualServiceImpl.java @@ -1,13 +1,12 @@ package com.openhis.ybcatalog.service.impl; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.ybcatalog.domain.CatalogDrugInfoUsual; import com.openhis.ybcatalog.mapper.CatalogDrugInfoUsualMapper; import com.openhis.ybcatalog.service.ICatalogDrugInfoUsualService; +import org.springframework.stereotype.Service; /** * 西药中成药目录Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalConsumablesServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalConsumablesServiceImpl.java index fdf27541..8ad9cbfd 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalConsumablesServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalConsumablesServiceImpl.java @@ -1,14 +1,12 @@ package com.openhis.ybcatalog.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.openhis.common.constant.YbCommonConstants; -import com.openhis.ybcatalog.domain.CatalogDrugInfo; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.openhis.common.constant.YbCommonConstants; import com.openhis.ybcatalog.domain.CatalogMedicalConsumables; import com.openhis.ybcatalog.mapper.CatalogMedicalConsumablesMapper; import com.openhis.ybcatalog.service.ICatalogMedicalConsumablesService; +import org.springframework.stereotype.Service; /** * 医疗耗材信息Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalHerbInfoServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalHerbInfoServiceImpl.java index cc6796d0..1053b244 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalHerbInfoServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalHerbInfoServiceImpl.java @@ -1,14 +1,12 @@ package com.openhis.ybcatalog.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.openhis.common.constant.YbCommonConstants; -import com.openhis.ybcatalog.domain.CatalogDrugInfo; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.openhis.common.constant.YbCommonConstants; import com.openhis.ybcatalog.domain.CatalogMedicalHerbInfo; import com.openhis.ybcatalog.mapper.CatalogMedicalHerbInfoMapper; import com.openhis.ybcatalog.service.ICatalogMedicalHerbInfoService; +import org.springframework.stereotype.Service; /** * 中药材信息Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalServiceServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalServiceServiceImpl.java index dae9b8a1..a806b0a6 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalServiceServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogMedicalServiceServiceImpl.java @@ -1,14 +1,12 @@ package com.openhis.ybcatalog.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.openhis.common.constant.YbCommonConstants; -import com.openhis.ybcatalog.domain.CatalogDrugInfo; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.openhis.common.constant.YbCommonConstants; import com.openhis.ybcatalog.domain.CatalogMedicalService; import com.openhis.ybcatalog.mapper.CatalogMedicalServiceMapper; import com.openhis.ybcatalog.service.ICatalogMedicalServiceService; +import org.springframework.stereotype.Service; /** * 医疗服务项目Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSpecialDiseaseServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSpecialDiseaseServiceImpl.java index aa553165..7e669902 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSpecialDiseaseServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSpecialDiseaseServiceImpl.java @@ -1,15 +1,12 @@ package com.openhis.ybcatalog.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.openhis.common.constant.YbCommonConstants; -import com.openhis.ybcatalog.domain.CatalogDrugInfo; -import com.openhis.ybcatalog.domain.CatalogSpecialDisease; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.openhis.ybcatalog.domain.CatalogSpecialInsuranceDisease; +import com.openhis.common.constant.YbCommonConstants; +import com.openhis.ybcatalog.domain.CatalogSpecialDisease; import com.openhis.ybcatalog.mapper.CatalogSpecialDiseaseMapper; import com.openhis.ybcatalog.service.ICatalogSpecialDiseaseService; +import org.springframework.stereotype.Service; /** * 特慢病目录 Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSpecialInsuranceDiseaseServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSpecialInsuranceDiseaseServiceImpl.java index 310164cf..17d8818c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSpecialInsuranceDiseaseServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSpecialInsuranceDiseaseServiceImpl.java @@ -3,7 +3,6 @@ package com.openhis.ybcatalog.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.common.constant.YbCommonConstants; -import com.openhis.ybcatalog.domain.CatalogDrugInfo; import com.openhis.ybcatalog.domain.CatalogSpecialInsuranceDisease; import com.openhis.ybcatalog.mapper.CatalogSpecialInsuranceDiseaseMapper; import com.openhis.ybcatalog.service.ICatalogSpecialInsuranceDiseaseService; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSurgeryStandardDirectoryServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSurgeryStandardDirectoryServiceImpl.java index 10610ad5..1ea5ac68 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSurgeryStandardDirectoryServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogSurgeryStandardDirectoryServiceImpl.java @@ -1,14 +1,12 @@ package com.openhis.ybcatalog.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.openhis.common.constant.YbCommonConstants; -import com.openhis.ybcatalog.domain.CatalogDrugInfo; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.openhis.common.constant.YbCommonConstants; import com.openhis.ybcatalog.domain.CatalogSurgeryStandardDirectory; import com.openhis.ybcatalog.mapper.CatalogSurgeryStandardDirectoryMapper; import com.openhis.ybcatalog.service.ICatalogSurgeryStandardDirectoryService; +import org.springframework.stereotype.Service; /** * 手术标准目录Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogWesternDiseaseServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogWesternDiseaseServiceImpl.java index 0d5482a8..eddc97d1 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogWesternDiseaseServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogWesternDiseaseServiceImpl.java @@ -1,14 +1,12 @@ package com.openhis.ybcatalog.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.openhis.common.constant.YbCommonConstants; -import com.openhis.ybcatalog.domain.CatalogDrugInfo; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.openhis.common.constant.YbCommonConstants; import com.openhis.ybcatalog.domain.CatalogWesternDisease; import com.openhis.ybcatalog.mapper.CatalogWesternDiseaseMapper; import com.openhis.ybcatalog.service.ICatalogWesternDiseaseService; +import org.springframework.stereotype.Service; /** * 西医疾病诊断信息Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogZyDiseaseDiagnosisServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogZyDiseaseDiagnosisServiceImpl.java index b4627b02..ba8e94a8 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogZyDiseaseDiagnosisServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogZyDiseaseDiagnosisServiceImpl.java @@ -1,14 +1,12 @@ package com.openhis.ybcatalog.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.openhis.common.constant.YbCommonConstants; -import com.openhis.ybcatalog.domain.CatalogDrugInfo; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.openhis.common.constant.YbCommonConstants; import com.openhis.ybcatalog.domain.CatalogZyDiseaseDiagnosis; import com.openhis.ybcatalog.mapper.CatalogZyDiseaseDiagnosisMapper; import com.openhis.ybcatalog.service.ICatalogZyDiseaseDiagnosisService; +import org.springframework.stereotype.Service; /** * 中医疾病诊断Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogZySyndromeServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogZySyndromeServiceImpl.java index 75f2c920..54e5b457 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogZySyndromeServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybcatalog/service/impl/CatalogZySyndromeServiceImpl.java @@ -1,14 +1,12 @@ package com.openhis.ybcatalog.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.openhis.common.constant.YbCommonConstants; -import com.openhis.ybcatalog.domain.CatalogDrugInfo; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.openhis.common.constant.YbCommonConstants; import com.openhis.ybcatalog.domain.CatalogZySyndrome; import com.openhis.ybcatalog.mapper.CatalogZySyndromeMapper; import com.openhis.ybcatalog.service.ICatalogZySyndromeService; +import org.springframework.stereotype.Service; /** * 【请填写功能名称】Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultDetail.java index adc73783..4bf4d63e 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultDetail.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultDetail.java @@ -1,17 +1,15 @@ package com.openhis.ybelep.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 【电子处方取药结果查询-输出（节点标识：seltdelts）】Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultInfo.java index 565ec192..90f098b3 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultInfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultInfo.java @@ -1,12 +1,8 @@ package com.openhis.ybelep.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultInput.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultInput.java index 00b7ac22..b871c5bf 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultInput.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepMedresultInput.java @@ -1,12 +1,8 @@ package com.openhis.ybelep.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerDiagnosisInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerDiagnosisInfo.java index 7d07dcab..dc0e7ac3 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerDiagnosisInfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerDiagnosisInfo.java @@ -1,12 +1,8 @@ package com.openhis.ybelep.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionDetail.java index 7d8b1050..b6c376c5 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionDetail.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionDetail.java @@ -1,17 +1,15 @@ package com.openhis.ybelep.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 【电子处方信息查询-输出-处方明细信息（节点标识：rxDetlList） 】Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionInfo.java index 1905d5e8..cad588de 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionInfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionInfo.java @@ -1,17 +1,15 @@ package com.openhis.ybelep.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 【电子处方信息查询-输出-处方信息 】Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionInput.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionInput.java index ff9def00..9572d710 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionInput.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerPrescriptionInput.java @@ -1,12 +1,8 @@ package com.openhis.ybelep.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerVisitInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerVisitInfo.java index a507455c..864a4033 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerVisitInfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepQuerVisitInfo.java @@ -1,17 +1,15 @@ package com.openhis.ybelep.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * 【电子处方信息查询-输出-就诊信息（节点标识：rxOtpinfo） 】Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepRevokeInput.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepRevokeInput.java index a851c9d1..c40a5945 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepRevokeInput.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepRevokeInput.java @@ -1,13 +1,9 @@ package com.openhis.ybelep.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -15,6 +11,8 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; + /** * 【电子处方撤销-输入】Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepRevokeOutput.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepRevokeOutput.java index 6c56f408..d08418c7 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepRevokeOutput.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepRevokeOutput.java @@ -1,12 +1,8 @@ package com.openhis.ybelep.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepSignatureInput.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepSignatureInput.java index f33c54fd..0aee5191 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepSignatureInput.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepSignatureInput.java @@ -1,13 +1,9 @@ package com.openhis.ybelep.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepSignatureOutput.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepSignatureOutput.java index a5aa89be..61e73427 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepSignatureOutput.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepSignatureOutput.java @@ -1,13 +1,9 @@ package com.openhis.ybelep.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepUploadInput.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepUploadInput.java index 7d3289ff..f2dd9892 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepUploadInput.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepUploadInput.java @@ -1,19 +1,13 @@ package com.openhis.ybelep.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; /** * 【电子处方上传-输入】Entity实体 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepUploadOutput.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepUploadOutput.java index 8bdb8224..fc7d802c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepUploadOutput.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepUploadOutput.java @@ -1,12 +1,8 @@ package com.openhis.ybelep.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriDiagnosisInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriDiagnosisInfo.java index 71e878fa..3580d214 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriDiagnosisInfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriDiagnosisInfo.java @@ -1,13 +1,9 @@ package com.openhis.ybelep.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -15,6 +11,8 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; + /** * 【电子处方上传预核验-输入-诊断信息（节点表示：diseinfo)】Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionDetail.java index 377c4997..a3c4ac9a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionDetail.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionDetail.java @@ -1,13 +1,9 @@ package com.openhis.ybelep.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -15,6 +11,8 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; + /** * 【电子处方上传预核验-输入-处方明细信息（节点标识 rxdrugdetail） 】Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionInfo.java index d27f326b..69f501cf 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionInfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionInfo.java @@ -1,13 +1,9 @@ package com.openhis.ybelep.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -15,6 +11,8 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; + /** * 【电子处方上传预核验-输入-处方信息】Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionOutput.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionOutput.java index 2ab37b3a..6108377d 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionOutput.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriPrescriptionOutput.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriVisitInfo.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriVisitInfo.java index ae7f14c8..5974381b 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriVisitInfo.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/ElepVeriVisitInfo.java @@ -1,13 +1,9 @@ package com.openhis.ybelep.domain; -import java.math.BigDecimal; -import java.util.Date; - import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -15,6 +11,8 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; + /** * 【电子处方上传预核验-输入-就诊信息（节点标识：mdtrtinfo） 】Entity实体 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/MedicationResultInquiry.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/MedicationResultInquiry.java index a835ce2c..58f497ff 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/MedicationResultInquiry.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/MedicationResultInquiry.java @@ -1,12 +1,9 @@ package com.openhis.ybelep.domain; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import java.util.Date; import java.util.List; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/PreCheckPrescription.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/PreCheckPrescription.java index 48f3f508..ca719ede 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/PreCheckPrescription.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/PreCheckPrescription.java @@ -1,15 +1,12 @@ package com.openhis.ybelep.domain; import com.alibaba.fastjson2.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; -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/ybelep/domain/QueryPrescription.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/QueryPrescription.java index 53589f3c..c905bf3f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/QueryPrescription.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/domain/QueryPrescription.java @@ -1,14 +1,10 @@ package com.openhis.ybelep.domain; -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; 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/ybelep/mapper/ElepMedresultDetailMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultDetailMapper.java index 04583e7b..125d55e4 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultDetailMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultDetailMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybelep.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybelep.domain.ElepMedresultDetail; +import org.springframework.stereotype.Repository; /** * 【电子处方取药结果查询-输出（节点标识：seltdelts）】Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultInfoMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultInfoMapper.java index 65c926c5..20ce4f69 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultInfoMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultInfoMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybelep.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybelep.domain.ElepMedresultInfo; +import org.springframework.stereotype.Repository; /** * 【电子处方取药结果查询-输出】Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultInputMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultInputMapper.java index cef07dfb..480ea55c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultInputMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepMedresultInputMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybelep.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybelep.domain.ElepMedresultInput; +import org.springframework.stereotype.Repository; /** * 【电子处方取药结果查询-输入】Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerDiagnosisInfoMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerDiagnosisInfoMapper.java index f1f10f15..3b449d1d 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerDiagnosisInfoMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerDiagnosisInfoMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybelep.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybelep.domain.ElepQuerDiagnosisInfo; +import org.springframework.stereotype.Repository; /** * 【电子处方信息查询-输出-诊断信息（节点表示： rxDiseList) 】Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionDetailMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionDetailMapper.java index 1165239c..b0cc7aca 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionDetailMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionDetailMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybelep.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybelep.domain.ElepQuerPrescriptionDetail; +import org.springframework.stereotype.Repository; /** * 【电子处方信息查询-输出-处方明细信息（节点标识：rxDetlList） 】Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionInfoMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionInfoMapper.java index 231c401b..a4b43274 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionInfoMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionInfoMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybelep.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybelep.domain.ElepQuerPrescriptionInfo; +import org.springframework.stereotype.Repository; /** * 【电子处方信息查询-输出-处方信息 】Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionInputMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionInputMapper.java index 314dd9a7..d3a1b63c 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionInputMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerPrescriptionInputMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybelep.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybelep.domain.ElepQuerPrescriptionInput; +import org.springframework.stereotype.Repository; /** * 【电子处方信息查询-输入】Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerVisitInfoMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerVisitInfoMapper.java index ed6459d0..ad8dc82f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerVisitInfoMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepQuerVisitInfoMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybelep.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybelep.domain.ElepQuerVisitInfo; +import org.springframework.stereotype.Repository; /** * 【电子处方信息查询-输出-就诊信息（节点标识：rxOtpinfo） 】Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepRevokeInputMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepRevokeInputMapper.java index 64423fac..86458778 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepRevokeInputMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepRevokeInputMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybelep.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybelep.domain.ElepRevokeInput; +import org.springframework.stereotype.Repository; /** * 【电子处方撤销-输入】Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepRevokeOutputMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepRevokeOutputMapper.java index 0b8240b0..2cd3403f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepRevokeOutputMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepRevokeOutputMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybelep.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybelep.domain.ElepRevokeOutput; +import org.springframework.stereotype.Repository; /** * 【电子处方撤销-输出】Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepSignatureInputMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepSignatureInputMapper.java index 2b2913a3..8e6745c7 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepSignatureInputMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepSignatureInputMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybelep.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybelep.domain.ElepSignatureInput; +import org.springframework.stereotype.Repository; /** * 【电子处方医保电子签名 -输入】Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepSignatureOutputMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepSignatureOutputMapper.java index 6696a938..e1794f73 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepSignatureOutputMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepSignatureOutputMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybelep.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybelep.domain.ElepSignatureOutput; +import org.springframework.stereotype.Repository; /** * 【电子处方医保电子签名 -输出】Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepUploadInputMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepUploadInputMapper.java index 435e0496..5ff7cbe1 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepUploadInputMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepUploadInputMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybelep.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybelep.domain.ElepUploadInput; +import org.springframework.stereotype.Repository; /** * 【电子处方上传-输入】Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepUploadOutputMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepUploadOutputMapper.java index edf63ffe..f860e436 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepUploadOutputMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepUploadOutputMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybelep.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybelep.domain.ElepUploadOutput; +import org.springframework.stereotype.Repository; /** * 【电子处方上传-输出】Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriDiagnosisInfoMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriDiagnosisInfoMapper.java index b348be66..840f2bdc 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriDiagnosisInfoMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriDiagnosisInfoMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybelep.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybelep.domain.ElepVeriDiagnosisInfo; +import org.springframework.stereotype.Repository; /** * 【电子处方上传预核验-输入-诊断信息（节点表示：diseinfo)】Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionDetailMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionDetailMapper.java index d735b38b..7a056fa6 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionDetailMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionDetailMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybelep.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybelep.domain.ElepVeriPrescriptionDetail; +import org.springframework.stereotype.Repository; /** * 【电子处方上传预核验-输入-处方明细信息（节点标识 rxdrugdetail） 】Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionInfoMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionInfoMapper.java index afd3cfdc..f856bfdd 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionInfoMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionInfoMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybelep.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybelep.domain.ElepVeriPrescriptionInfo; +import org.springframework.stereotype.Repository; /** * 【电子处方上传预核验-输入-处方信息】Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionOutputMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionOutputMapper.java index 0183f2ec..14f15604 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionOutputMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriPrescriptionOutputMapper.java @@ -1,9 +1,8 @@ package com.openhis.ybelep.mapper; -import org.springframework.stereotype.Repository; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybelep.domain.ElepVeriPrescriptionOutput; +import org.springframework.stereotype.Repository; /** * 【电子处方上传预核验-输出】Mapper接口 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriVisitInfoMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriVisitInfoMapper.java index bbde3421..6bc82bed 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriVisitInfoMapper.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/mapper/ElepVeriVisitInfoMapper.java @@ -1,10 +1,9 @@ package com.openhis.ybelep.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.ybelep.domain.ElepVeriVisitInfo; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - /** * 【电子处方上传预核验-输入-就诊信息（节点标识：mdtrtinfo） 】Mapper接口 * diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultDetailServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultDetailServiceImpl.java index 71204bb2..d6896868 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultDetailServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultDetailServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.ybelep.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.ybelep.domain.ElepMedresultDetail; import com.openhis.ybelep.mapper.ElepMedresultDetailMapper; import com.openhis.ybelep.service.IElepMedresultDetailService; +import org.springframework.stereotype.Service; /** * 【电子处方取药结果查询-输出（节点标识：seltdelts）】Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultInfoServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultInfoServiceImpl.java index 1e3b8f50..01d2c784 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultInfoServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultInfoServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.ybelep.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.ybelep.domain.ElepMedresultInfo; import com.openhis.ybelep.mapper.ElepMedresultInfoMapper; import com.openhis.ybelep.service.IElepMedresultInfoService; +import org.springframework.stereotype.Service; /** * 【电子处方取药结果查询-输出】Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultInputServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultInputServiceImpl.java index 43ade099..8373288a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultInputServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepMedresultInputServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.ybelep.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.ybelep.domain.ElepMedresultInput; import com.openhis.ybelep.mapper.ElepMedresultInputMapper; import com.openhis.ybelep.service.IElepMedresultInputService; +import org.springframework.stereotype.Service; /** * 【电子处方取药结果查询-输入】Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerDiagnosisInfoServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerDiagnosisInfoServiceImpl.java index 3db579d3..df5e3d9f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerDiagnosisInfoServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerDiagnosisInfoServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.ybelep.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.ybelep.domain.ElepQuerDiagnosisInfo; import com.openhis.ybelep.mapper.ElepQuerDiagnosisInfoMapper; import com.openhis.ybelep.service.IElepQuerDiagnosisInfoService; +import org.springframework.stereotype.Service; /** * 【电子处方信息查询-输出-诊断信息（节点表示： rxDiseList) 】Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionDetailServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionDetailServiceImpl.java index db388ede..33aa7859 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionDetailServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionDetailServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.ybelep.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.ybelep.domain.ElepQuerPrescriptionDetail; import com.openhis.ybelep.mapper.ElepQuerPrescriptionDetailMapper; import com.openhis.ybelep.service.IElepQuerPrescriptionDetailService; +import org.springframework.stereotype.Service; /** * 【电子处方信息查询-输出-处方明细信息（节点标识：rxDetlList） 】Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionInfoServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionInfoServiceImpl.java index 21665826..4b2ab2b7 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionInfoServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionInfoServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.ybelep.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.ybelep.domain.ElepQuerPrescriptionInfo; import com.openhis.ybelep.mapper.ElepQuerPrescriptionInfoMapper; import com.openhis.ybelep.service.IElepQuerPrescriptionInfoService; +import org.springframework.stereotype.Service; /** * 【电子处方信息查询-输出-处方信息 】Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionInputServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionInputServiceImpl.java index 7e25f9f0..650e69fa 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionInputServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerPrescriptionInputServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.ybelep.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.ybelep.domain.ElepQuerPrescriptionInput; import com.openhis.ybelep.mapper.ElepQuerPrescriptionInputMapper; import com.openhis.ybelep.service.IElepQuerPrescriptionInputService; +import org.springframework.stereotype.Service; /** * 【电子处方信息查询-输入】Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerVisitInfoServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerVisitInfoServiceImpl.java index b2c95cc9..29019451 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerVisitInfoServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepQuerVisitInfoServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.ybelep.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.ybelep.domain.ElepQuerVisitInfo; import com.openhis.ybelep.mapper.ElepQuerVisitInfoMapper; import com.openhis.ybelep.service.IElepQuerVisitInfoService; +import org.springframework.stereotype.Service; /** * 【电子处方信息查询-输出-就诊信息（节点标识：rxOtpinfo） 】Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepRevokeInputServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepRevokeInputServiceImpl.java index 9ef553a9..3614dabc 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepRevokeInputServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepRevokeInputServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.ybelep.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.ybelep.domain.ElepRevokeInput; import com.openhis.ybelep.mapper.ElepRevokeInputMapper; import com.openhis.ybelep.service.IElepRevokeInputService; +import org.springframework.stereotype.Service; /** * 【电子处方撤销-输入】Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepRevokeOutputServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepRevokeOutputServiceImpl.java index 1944c013..6d7b090e 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepRevokeOutputServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepRevokeOutputServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.ybelep.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.ybelep.domain.ElepRevokeOutput; import com.openhis.ybelep.mapper.ElepRevokeOutputMapper; import com.openhis.ybelep.service.IElepRevokeOutputService; +import org.springframework.stereotype.Service; /** * 【电子处方撤销-输出】Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepSignatureInputServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepSignatureInputServiceImpl.java index 98afa448..79eb19b9 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepSignatureInputServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepSignatureInputServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.ybelep.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.ybelep.domain.ElepSignatureInput; import com.openhis.ybelep.mapper.ElepSignatureInputMapper; import com.openhis.ybelep.service.IElepSignatureInputService; +import org.springframework.stereotype.Service; /** * 【电子处方医保电子签名 -输入】Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepSignatureOutputServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepSignatureOutputServiceImpl.java index 6d891be5..c620cdbc 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepSignatureOutputServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepSignatureOutputServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.ybelep.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.ybelep.domain.ElepSignatureOutput; import com.openhis.ybelep.mapper.ElepSignatureOutputMapper; import com.openhis.ybelep.service.IElepSignatureOutputService; +import org.springframework.stereotype.Service; /** * 【电子处方医保电子签名 -输出】Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepUploadInputServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepUploadInputServiceImpl.java index 7b9af381..3347e248 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepUploadInputServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepUploadInputServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.ybelep.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.ybelep.domain.ElepUploadInput; import com.openhis.ybelep.mapper.ElepUploadInputMapper; import com.openhis.ybelep.service.IElepUploadInputService; +import org.springframework.stereotype.Service; /** * 【电子处方上传-输入】Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepUploadOutputServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepUploadOutputServiceImpl.java index d701464b..15a2d6da 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepUploadOutputServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepUploadOutputServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.ybelep.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.ybelep.domain.ElepUploadOutput; import com.openhis.ybelep.mapper.ElepUploadOutputMapper; import com.openhis.ybelep.service.IElepUploadOutputService; +import org.springframework.stereotype.Service; /** * 【电子处方上传-输出】Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriDiagnosisInfoServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriDiagnosisInfoServiceImpl.java index 08e32083..d4715fe0 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriDiagnosisInfoServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriDiagnosisInfoServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.ybelep.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.ybelep.domain.ElepVeriDiagnosisInfo; import com.openhis.ybelep.mapper.ElepVeriDiagnosisInfoMapper; import com.openhis.ybelep.service.IElepVeriDiagnosisInfoService; +import org.springframework.stereotype.Service; /** * 【电子处方上传预核验-输入-诊断信息（节点表示：diseinfo)】Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionDetailServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionDetailServiceImpl.java index 099cae6c..f707e13a 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionDetailServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionDetailServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.ybelep.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.ybelep.domain.ElepVeriPrescriptionDetail; import com.openhis.ybelep.mapper.ElepVeriPrescriptionDetailMapper; import com.openhis.ybelep.service.IElepVeriPrescriptionDetailService; +import org.springframework.stereotype.Service; /** * 【电子处方上传预核验-输入-处方明细信息（节点标识 rxdrugdetail） 】Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionInfoServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionInfoServiceImpl.java index 138bdbf7..33bfe5fc 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionInfoServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionInfoServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.ybelep.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.ybelep.domain.ElepVeriPrescriptionInfo; import com.openhis.ybelep.mapper.ElepVeriPrescriptionInfoMapper; import com.openhis.ybelep.service.IElepVeriPrescriptionInfoService; +import org.springframework.stereotype.Service; /** * 【电子处方上传预核验-输入-处方信息】Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionOutputServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionOutputServiceImpl.java index 33e8afd9..6943a738 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionOutputServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriPrescriptionOutputServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.ybelep.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.ybelep.domain.ElepVeriPrescriptionOutput; import com.openhis.ybelep.mapper.ElepVeriPrescriptionOutputMapper; import com.openhis.ybelep.service.IElepVeriPrescriptionOutputService; +import org.springframework.stereotype.Service; /** * 【电子处方上传预核验-输出】Service业务层处理 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriVisitInfoServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriVisitInfoServiceImpl.java index 8bc26f85..b62bc656 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriVisitInfoServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/ybelep/service/impl/ElepVeriVisitInfoServiceImpl.java @@ -1,11 +1,10 @@ package com.openhis.ybelep.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.ybelep.domain.ElepVeriVisitInfo; import com.openhis.ybelep.mapper.ElepVeriVisitInfoMapper; import com.openhis.ybelep.service.IElepVeriVisitInfoService; +import org.springframework.stereotype.Service; /** * 【电子处方上传预核验-输入-就诊信息（节点标识：mdtrtinfo） 】Service业务层处理 diff --git a/openhis-server-new/sql/add_priority_to_sys_notice.sql b/openhis-server-new/sql/add_priority_to_sys_notice.sql new file mode 100644 index 00000000..b7521913 --- /dev/null +++ b/openhis-server-new/sql/add_priority_to_sys_notice.sql @@ -0,0 +1,10 @@ +-- 为 sys_notice 表添加优先级字段 +-- 执行前请先备份数据库 + +ALTER TABLE sys_notice ADD COLUMN priority VARCHAR(10) DEFAULT '2'; + +-- 添加注释 +COMMENT ON COLUMN sys_notice.priority IS '优先级（1高 2中 3低）'; + +-- 为现有数据设置默认优先级 +UPDATE sys_notice SET priority = '2' WHERE priority IS NULL; diff --git a/openhis-ui-vue3/src/App.vue b/openhis-ui-vue3/src/App.vue index 31839f20..61e22150 100644 --- a/openhis-ui-vue3/src/App.vue +++ b/openhis-ui-vue3/src/App.vue @@ -4,7 +4,7 @@ + diff --git a/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/ViewConfig.js b/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/ViewConfig.js index 9c67a233..17158330 100644 --- a/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/ViewConfig.js +++ b/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/ViewConfig.js @@ -1,4 +1,4 @@ -import { bodyTemperature, TOP_KEYS, HEAD_HEIGHT, LINE_HEIGHT } from './config'; +import {bodyTemperature, HEAD_HEIGHT, LINE_HEIGHT, TOP_KEYS} from './config'; export default class viewConfig { constructor({ diff --git a/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/config.js b/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/config.js index 6b6f65b6..4582e754 100644 --- a/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/config.js +++ b/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/config.js @@ -1,11 +1,5 @@ import dayjs from 'dayjs'; -import { - HospitalName, - temperatureName, - showPainFlag, - getInfoKeys, - getBottomKeys, -} from './template'; +import {getBottomKeys, getInfoKeys, HospitalName, showPainFlag, temperatureName,} from './template'; // 存放体温单的配置信息 export const Header = { diff --git a/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/drawfn.js b/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/drawfn.js index 547bd101..d1ce6ea0 100644 --- a/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/drawfn.js +++ b/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/drawfn.js @@ -1,28 +1,20 @@ // 数据处理 import * as d3 from 'd3'; -import { symbol } from 'd3-shape'; +import {symbol} from 'd3-shape'; import { - getTypeData, - getTypeDatas, - setMergeTag, - postpartumDays, - getTypeAnimalHeat, - getDrawData, - getDrawCoolData, - degreesOnline, - getType, - getHeartRate, - disconnectEvents, - getBrokenLine, + degreesOnline, + disconnectEvents, + getBrokenLine, + getHeartRate, + getType, + getTypeAnimalHeat, + getTypeData, + getTypeDatas, + postpartumDays, + setMergeTag, } from './utils'; -import { - HEAD_HEIGHT, - LINE_HEIGHT, - TOP_KEYS, - BOTTOM_KEYS, - symbolArrowHeight, - textLeftMargin, -} from './config'; +import {BOTTOM_KEYS, HEAD_HEIGHT, LINE_HEIGHT, symbolArrowHeight, textLeftMargin, TOP_KEYS,} from './config'; + export const iconDrawObj = { // 绘制圆形图标 getDrawRoundIcon: ({ content, data, x, y, fill = 'blue', stroke = 'blue', r = 5 }) => { diff --git a/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/index.js b/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/index.js index d1fd627c..e0bb911c 100644 --- a/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/index.js +++ b/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/index.js @@ -7,6 +7,7 @@ * @FilePath: src\action\nurseStation\temperatureSheet\index.js */ import Request from '@/axios/index.js'; + const temperaturePath = 'app/temperature'; const getTemperaturePath = 'app/temperature/by-encounter-id'; const delTemperaturePath = 'app/temperature/retired'; diff --git a/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/line.js b/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/line.js index 9639b840..fff2d13e 100644 --- a/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/line.js +++ b/openhis-ui-vue3/src/action/nurseStation/temperatureSheet/line.js @@ -1,40 +1,40 @@ import * as d3 from 'd3'; import { - iconDrawObj, - getG, - getData, - drawTopMask, - drawBottomMask, - initArrow, - lineArrow, - drawSpecialText, - drawSpecialNoTimeText, - drawSurgery, - // drawTagText, - drawBottomSpecialText, + drawBottomMask, + drawBottomSpecialText, + drawSpecialNoTimeText, + drawSpecialText, + drawSurgery, + drawTopMask, + getData, + getG, + iconDrawObj, + initArrow, + lineArrow, } from './drawfn'; -import { getMaxList } from './dataProcess'; +import {getMaxList} from './dataProcess'; import { - timeNumber, - nightTime, - leftTEXT, - showPain, - painTEXT, - bodyTemperature, - painScore, - starNumEnv, - endNumEnv, - heartRange, - INFO_KEYS, - Header, - TOP_KEYS, - BOTTOM_KEYS, - HEAD_HEIGHT, - LINE_HEIGHT, - textLeftMargin, - TEXT_MARGIN_BOTTOM, + bodyTemperature, + BOTTOM_KEYS, + endNumEnv, + HEAD_HEIGHT, + Header, + heartRange, + INFO_KEYS, + leftTEXT, + LINE_HEIGHT, + nightTime, + painScore, + painTEXT, + showPain, + starNumEnv, + TEXT_MARGIN_BOTTOM, + textLeftMargin, + timeNumber, + TOP_KEYS, } from './config'; import ViewConfig from './ViewConfig'; + export function init(data = []) { const ajaxData = getData(data); const chart = ConnectedScatterplot({ diff --git a/openhis-ui-vue3/src/api/cardRenewal/api.js b/openhis-ui-vue3/src/api/cardRenewal/api.js index 6ccf908d..cbc63f62 100644 --- a/openhis-ui-vue3/src/api/cardRenewal/api.js +++ b/openhis-ui-vue3/src/api/cardRenewal/api.js @@ -1,5 +1,4 @@ import request from '@/utils/request'; -import { parseStrEmpty } from "@/utils/openhis"; /** * 查询患者列表 diff --git a/openhis-ui-vue3/src/api/public.js b/openhis-ui-vue3/src/api/public.js index 3060fc2b..37ec8627 100644 --- a/openhis-ui-vue3/src/api/public.js +++ b/openhis-ui-vue3/src/api/public.js @@ -1,4 +1,5 @@ import request from '@/utils/request'; +import axios from 'axios'; // 获取追溯码 export function searchTraceNo(data) { @@ -68,8 +69,6 @@ export function lotNumberMatch(params) { } -import axios from 'axios'; - const env = import.meta.env.MODE; export function invokeYbPlugin5001(data) { diff --git a/openhis-ui-vue3/src/api/surgerymanage.js b/openhis-ui-vue3/src/api/surgerymanage.js new file mode 100644 index 00000000..9fff188c --- /dev/null +++ b/openhis-ui-vue3/src/api/surgerymanage.js @@ -0,0 +1,80 @@ +import request from '@/utils/request' + +/** + * 分页查询手术列表 + * @param queryParams 查询参数 + * @returns {AxiosPromise} + */ +export function getSurgeryPage(queryParams) { + return request({ + url: '/clinical-manage/surgery/surgery-page', + method: 'get', + params: queryParams + }) +} + +/** + * 根据ID查询手术详情 + * @param id 手术ID + * @returns {AxiosPromise} + */ +export function getSurgeryDetail(id) { + return request({ + url: '/clinical-manage/surgery/surgery-detail', + method: 'get', + params: { id } + }) +} + +/** + * 新增手术信息 + * @param data 手术信息 + * @returns {AxiosPromise} + */ +export function addSurgery(data) { + return request({ + url: '/clinical-manage/surgery/surgery', + method: 'post', + data: data + }) +} + +/** + * 修改手术信息 + * @param data 手术信息 + * @returns {AxiosPromise} + */ +export function updateSurgery(data) { + return request({ + url: '/clinical-manage/surgery/surgery', + method: 'put', + data: data + }) +} + +/** + * 删除手术信息 + * @param id 手术ID + * @returns {AxiosPromise} + */ +export function deleteSurgery(id) { + return request({ + url: '/clinical-manage/surgery/surgery', + method: 'delete', + params: { id } + }) +} + +/** + * 更新手术状态 + * @param id 手术ID + * @param statusEnum 状态 + * @returns {AxiosPromise} + */ +export function updateSurgeryStatus(id, statusEnum) { + return request({ + url: '/clinical-manage/surgery/surgery-status', + method: 'put', + params: { id, statusEnum } + }) +} diff --git a/openhis-ui-vue3/src/api/system/notice.js b/openhis-ui-vue3/src/api/system/notice.js index c274ea5b..4c2273a4 100644 --- a/openhis-ui-vue3/src/api/system/notice.js +++ b/openhis-ui-vue3/src/api/system/notice.js @@ -9,6 +9,23 @@ export function listNotice(query) { }) } +// 获取公开的公告列表（给普通用户使用） +export function getPublicNoticeList(query) { + return request({ + url: '/system/notice/public/list', + method: 'get', + params: query + }) +} + +// 获取当前用户的通知列表 +export function getUserNotices() { + return request({ + url: '/system/notice/public/notice', + method: 'get' + }) +} + // 查询公告详细 export function getNotice(noticeId) { return request({ @@ -41,4 +58,53 @@ export function delNotice(noticeId) { url: '/system/notice/' + noticeId, method: 'delete' }) -} \ No newline at end of file +} + +// 发布公告 +export function publishNotice(noticeId) { + return request({ + url: '/system/notice/publish/' + noticeId, + method: 'put' + }) +} + +// 取消发布公告 +export function unpublishNotice(noticeId) { + return request({ + url: '/system/notice/unpublish/' + noticeId, + method: 'put' + }) +} + +// 获取未读公告/通知数量 +export function getUnreadCount() { + return request({ + url: '/system/notice/public/unread/count', + method: 'get' + }) +} + +// 标记公告/通知为已读 +export function markAsRead(noticeId) { + return request({ + url: '/system/notice/public/read/' + noticeId, + method: 'post' + }) +} + +// 批量标记公告/通知为已读 +export function markAllAsRead(noticeIds) { + return request({ + url: '/system/notice/public/read/all', + method: 'post', + data: noticeIds + }) +} + +// 获取用户已读公告/通知ID列表 +export function getReadNoticeIds() { + return request({ + url: '/system/notice/public/read/ids', + method: 'get' + }) +} diff --git a/openhis-ui-vue3/src/api/system/user copy.js b/openhis-ui-vue3/src/api/system/user copy.js index 49054e3a..fc1eabb3 100644 --- a/openhis-ui-vue3/src/api/system/user copy.js +++ b/openhis-ui-vue3/src/api/system/user copy.js @@ -1,5 +1,5 @@ import request from '@/utils/request' -import { parseStrEmpty } from "@/utils/openhis"; +import {parseStrEmpty} from "@/utils/openhis"; // 查询用户列表 export function listUser(query) { diff --git a/openhis-ui-vue3/src/api/system/user.js b/openhis-ui-vue3/src/api/system/user.js index 318060e1..4885d6a0 100644 --- a/openhis-ui-vue3/src/api/system/user.js +++ b/openhis-ui-vue3/src/api/system/user.js @@ -1,5 +1,5 @@ import request from '@/utils/request' -import { parseStrEmpty } from "@/utils/openhis"; +import {parseStrEmpty} from "@/utils/openhis"; // 查询用户列表 export function listUser(query) { diff --git a/openhis-ui-vue3/src/assets/icons/drug.svg b/openhis-ui-vue3/src/assets/icons/drug.svg new file mode 100644 index 00000000..5653b970 --- /dev/null +++ b/openhis-ui-vue3/src/assets/icons/drug.svg @@ -0,0 +1,4 @@ + + + + diff --git a/openhis-ui-vue3/src/assets/icons/svg/appointment.svg b/openhis-ui-vue3/src/assets/icons/svg/appointment.svg new file mode 100644 index 00000000..caed84fb --- /dev/null +++ b/openhis-ui-vue3/src/assets/icons/svg/appointment.svg @@ -0,0 +1,4 @@ + + + + diff --git a/openhis-ui-vue3/src/assets/icons/svg/billing.svg b/openhis-ui-vue3/src/assets/icons/svg/billing.svg new file mode 100644 index 00000000..5d751de8 --- /dev/null +++ b/openhis-ui-vue3/src/assets/icons/svg/billing.svg @@ -0,0 +1,4 @@ + + + + diff --git a/openhis-ui-vue3/src/assets/icons/svg/build.svg b/openhis-ui-vue3/src/assets/icons/svg/build.svg index 97c46886..74e6e717 100644 --- a/openhis-ui-vue3/src/assets/icons/svg/build.svg +++ b/openhis-ui-vue3/src/assets/icons/svg/build.svg @@ -1 +1,3 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/assets/icons/svg/button.svg b/openhis-ui-vue3/src/assets/icons/svg/button.svg index 904fddc8..3a779410 100644 --- a/openhis-ui-vue3/src/assets/icons/svg/button.svg +++ b/openhis-ui-vue3/src/assets/icons/svg/button.svg @@ -1 +1,3 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/assets/icons/svg/cascader.svg b/openhis-ui-vue3/src/assets/icons/svg/cascader.svg index e256024f..d3b4a5f5 100644 --- a/openhis-ui-vue3/src/assets/icons/svg/cascader.svg +++ b/openhis-ui-vue3/src/assets/icons/svg/cascader.svg @@ -1 +1,3 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/assets/icons/svg/checkbox.svg b/openhis-ui-vue3/src/assets/icons/svg/checkbox.svg index 013fd3a2..bcab03df 100644 --- a/openhis-ui-vue3/src/assets/icons/svg/checkbox.svg +++ b/openhis-ui-vue3/src/assets/icons/svg/checkbox.svg @@ -1 +1,3 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/assets/icons/svg/code.svg b/openhis-ui-vue3/src/assets/icons/svg/code.svg index 5f9c5abd..4fb71b81 100644 --- a/openhis-ui-vue3/src/assets/icons/svg/code.svg +++ b/openhis-ui-vue3/src/assets/icons/svg/code.svg @@ -1 +1,4 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/assets/icons/svg/color.svg b/openhis-ui-vue3/src/assets/icons/svg/color.svg index 44a81aab..19005326 100644 --- a/openhis-ui-vue3/src/assets/icons/svg/color.svg +++ b/openhis-ui-vue3/src/assets/icons/svg/color.svg @@ -1 +1,3 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/assets/icons/svg/component.svg b/openhis-ui-vue3/src/assets/icons/svg/component.svg index 29c34580..ad60dfd0 100644 --- a/openhis-ui-vue3/src/assets/icons/svg/component.svg +++ b/openhis-ui-vue3/src/assets/icons/svg/component.svg @@ -1 +1,3 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/assets/icons/svg/date-range.svg b/openhis-ui-vue3/src/assets/icons/svg/date-range.svg index fda571e7..283c8a3c 100644 --- a/openhis-ui-vue3/src/assets/icons/svg/date-range.svg +++ b/openhis-ui-vue3/src/assets/icons/svg/date-range.svg @@ -1 +1,3 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/assets/icons/svg/date.svg b/openhis-ui-vue3/src/assets/icons/svg/date.svg index 52dc73ee..0959e7f2 100644 --- a/openhis-ui-vue3/src/assets/icons/svg/date.svg +++ b/openhis-ui-vue3/src/assets/icons/svg/date.svg @@ -1 +1,3 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/assets/icons/svg/diagnosis.svg b/openhis-ui-vue3/src/assets/icons/svg/diagnosis.svg new file mode 100644 index 00000000..537892d9 --- /dev/null +++ b/openhis-ui-vue3/src/assets/icons/svg/diagnosis.svg @@ -0,0 +1,4 @@ + + + + diff --git a/openhis-ui-vue3/src/assets/icons/svg/dict.svg b/openhis-ui-vue3/src/assets/icons/svg/dict.svg index 48493773..e43820cf 100644 --- a/openhis-ui-vue3/src/assets/icons/svg/dict.svg +++ b/openhis-ui-vue3/src/assets/icons/svg/dict.svg @@ -1 +1,3 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/assets/icons/svg/doctor.svg b/openhis-ui-vue3/src/assets/icons/svg/doctor.svg new file mode 100644 index 00000000..7b83da6a --- /dev/null +++ b/openhis-ui-vue3/src/assets/icons/svg/doctor.svg @@ -0,0 +1,4 @@ + + + + diff --git a/openhis-ui-vue3/src/assets/icons/svg/download.svg b/openhis-ui-vue3/src/assets/icons/svg/download.svg index c8969513..d164cbc6 100644 --- a/openhis-ui-vue3/src/assets/icons/svg/download.svg +++ b/openhis-ui-vue3/src/assets/icons/svg/download.svg @@ -1 +1,3 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/assets/icons/svg/druid.svg b/openhis-ui-vue3/src/assets/icons/svg/druid.svg index a2b4b4ed..e8ba6e25 100644 --- a/openhis-ui-vue3/src/assets/icons/svg/druid.svg +++ b/openhis-ui-vue3/src/assets/icons/svg/druid.svg @@ -1 +1,3 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/assets/icons/svg/emergency.svg b/openhis-ui-vue3/src/assets/icons/svg/emergency.svg new file mode 100644 index 00000000..bc060d6a --- /dev/null +++ b/openhis-ui-vue3/src/assets/icons/svg/emergency.svg @@ -0,0 +1,4 @@ + + + + diff --git a/openhis-ui-vue3/src/assets/icons/svg/foldup.svg b/openhis-ui-vue3/src/assets/icons/svg/foldup.svg index 20f32813..b412e2b6 100644 --- a/openhis-ui-vue3/src/assets/icons/svg/foldup.svg +++ b/openhis-ui-vue3/src/assets/icons/svg/foldup.svg @@ -1 +1,3 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/assets/icons/svg/github.svg b/openhis-ui-vue3/src/assets/icons/svg/github.svg index db0a0d43..d474ef7c 100644 --- a/openhis-ui-vue3/src/assets/icons/svg/github.svg +++ b/openhis-ui-vue3/src/assets/icons/svg/github.svg @@ -1 +1,3 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/assets/icons/svg/input.svg b/openhis-ui-vue3/src/assets/icons/svg/input.svg index ab91381e..cf1d784e 100644 --- a/openhis-ui-vue3/src/assets/icons/svg/input.svg +++ b/openhis-ui-vue3/src/assets/icons/svg/input.svg @@ -1 +1,3 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/assets/icons/svg/insurance.svg b/openhis-ui-vue3/src/assets/icons/svg/insurance.svg new file mode 100644 index 00000000..13c14661 --- /dev/null +++ b/openhis-ui-vue3/src/assets/icons/svg/insurance.svg @@ -0,0 +1,4 @@ + + + + diff --git a/openhis-ui-vue3/src/assets/icons/svg/inventory.svg b/openhis-ui-vue3/src/assets/icons/svg/inventory.svg new file mode 100644 index 00000000..245f7b18 --- /dev/null +++ b/openhis-ui-vue3/src/assets/icons/svg/inventory.svg @@ -0,0 +1,4 @@ + + + + diff --git a/openhis-ui-vue3/src/assets/icons/svg/job.svg b/openhis-ui-vue3/src/assets/icons/svg/job.svg index 2a93a251..5415d421 100644 --- a/openhis-ui-vue3/src/assets/icons/svg/job.svg +++ b/openhis-ui-vue3/src/assets/icons/svg/job.svg @@ -1 +1,3 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/assets/icons/svg/laboratory.svg b/openhis-ui-vue3/src/assets/icons/svg/laboratory.svg new file mode 100644 index 00000000..d62f03e4 --- /dev/null +++ b/openhis-ui-vue3/src/assets/icons/svg/laboratory.svg @@ -0,0 +1,4 @@ + + + + diff --git a/openhis-ui-vue3/src/assets/icons/svg/log.svg b/openhis-ui-vue3/src/assets/icons/svg/log.svg index d879d33b..fdf39ce8 100644 --- a/openhis-ui-vue3/src/assets/icons/svg/log.svg +++ b/openhis-ui-vue3/src/assets/icons/svg/log.svg @@ -1 +1,3 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/assets/icons/svg/logininfor.svg b/openhis-ui-vue3/src/assets/icons/svg/logininfor.svg index 267f8447..b9570d5f 100644 --- a/openhis-ui-vue3/src/assets/icons/svg/logininfor.svg +++ b/openhis-ui-vue3/src/assets/icons/svg/logininfor.svg @@ -1 +1,3 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/assets/icons/svg/medical.svg b/openhis-ui-vue3/src/assets/icons/svg/medical.svg new file mode 100644 index 00000000..109f0a71 --- /dev/null +++ b/openhis-ui-vue3/src/assets/icons/svg/medical.svg @@ -0,0 +1,4 @@ + + + + diff --git a/openhis-ui-vue3/src/assets/icons/svg/monitor.svg b/openhis-ui-vue3/src/assets/icons/svg/monitor.svg index bc308cb0..c5880f51 100644 --- a/openhis-ui-vue3/src/assets/icons/svg/monitor.svg +++ b/openhis-ui-vue3/src/assets/icons/svg/monitor.svg @@ -1,2 +1,5 @@ -

+
+
+ + {{ item.noticeTitle }} +
+
+ + + {{ getNoticeTypeText(item.noticeType) }} + + + + + {{ getPriorityText(item.priority) }} + + + {{ parseTime(item.createTime, '{y}-{m}-{d}') }} +
+
+
+ + + +
+
+
+ + {{ getNoticeTypeText(currentNotice.noticeType) }} + + + {{ getPriorityText(currentNotice.priority) }} + +
+ {{ parseTime(currentNotice.createTime, '{y}-{m}-{d} {h}:{i}') }} +
+
+
+ + + + + + + + diff --git a/openhis-ui-vue3/src/components/NoticePanel/index.vue b/openhis-ui-vue3/src/components/NoticePanel/index.vue new file mode 100644 index 00000000..46abd0b8 --- /dev/null +++ b/openhis-ui-vue3/src/components/NoticePanel/index.vue @@ -0,0 +1,543 @@ + + + + + diff --git a/openhis-ui-vue3/src/components/NoticePopup/index.vue b/openhis-ui-vue3/src/components/NoticePopup/index.vue new file mode 100644 index 00000000..4d0807d8 --- /dev/null +++ b/openhis-ui-vue3/src/components/NoticePopup/index.vue @@ -0,0 +1,582 @@ + + + + + diff --git a/openhis-ui-vue3/src/components/OpenHis/TraceNoDialog/index.vue b/openhis-ui-vue3/src/components/OpenHis/TraceNoDialog/index.vue index e5defc33..ddfae300 100644 --- a/openhis-ui-vue3/src/components/OpenHis/TraceNoDialog/index.vue +++ b/openhis-ui-vue3/src/components/OpenHis/TraceNoDialog/index.vue @@ -107,9 +107,9 @@ diff --git a/openhis-ui-vue3/src/components/TableLayout/EditTable.vue b/openhis-ui-vue3/src/components/TableLayout/EditTable.vue index 2f43a6d4..b3283cbc 100644 --- a/openhis-ui-vue3/src/components/TableLayout/EditTable.vue +++ b/openhis-ui-vue3/src/components/TableLayout/EditTable.vue @@ -9,7 +9,7 @@ diff --git a/openhis-ui-vue3/src/main.js b/openhis-ui-vue3/src/main.js index ac7b302b..bf9466cd 100644 --- a/openhis-ui-vue3/src/main.js +++ b/openhis-ui-vue3/src/main.js @@ -1,26 +1,21 @@ -import { createApp } from 'vue'; +import {createApp} from 'vue'; import Cookies from 'js-cookie'; // 导入 hiprint 并挂载到全局 window 对象 -import { hiprint } from 'vue-plugin-hiprint'; -window.hiprint = hiprint; - -import ElementPlus from 'element-plus'; +import {hiprint} from 'vue-plugin-hiprint'; +import ElementPlus, {ElDialog, ElMessage} from 'element-plus'; import zhCn from 'element-plus/es/locale/lang/zh-cn'; import 'element-plus/dist/index.css'; -import locale from 'element-plus/es/locale/lang/zh-cn'; import '@/assets/styles/index.scss'; // global css - import App from './App'; import store from './store'; import router from './router'; import directive from './directive'; // directive - // 注册指令 import plugins from './plugins'; // plugins -import { download, downloadGet } from '@/utils/request'; +import {download, downloadGet} from '@/utils/request'; // svg图标 import 'virtual:svg-icons-register'; @@ -28,18 +23,10 @@ import SvgIcon from '@/components/SvgIcon'; import elementIcons from '@/components/SvgIcon/svgicon'; import './permission'; // permission control +import {useDict} from '@/utils/dict'; +import {addDateRange, handleTree, parseTime, resetForm, selectDictLabel, selectDictLabels,} from '@/utils/openhis'; -import { useDict } from '@/utils/dict'; -import { - parseTime, - resetForm, - addDateRange, - handleTree, - selectDictLabel, - selectDictLabels, -} from '@/utils/openhis'; - -import { formatDateStr } from '@/utils/index'; +import {formatDateStr} from '@/utils/index'; // 分页组件 import Pagination from '@/components/Pagination'; @@ -59,11 +46,11 @@ import TreeSelect from '@/components/TreeSelect'; import DictTag from '@/components/DictTag'; // 导入请求工具 -import request from './utils/request' -import { ElDialog, ElMessage } from 'element-plus'; +import {registerComponents} from './template'; + +window.hiprint = hiprint; -import { registerComponents } from './template'; const app = createApp(App); if (chrome.webview !== undefined) { @@ -109,4 +96,13 @@ app.use(ElementPlus, { size: Cookies.get('size') || 'default', }); +// 导入公告帮助工具 +import { initNoticePopupAfterLogin } from '@/utils/noticeHelper' + app.mount('#app'); + +// 应用启动后初始化公告弹窗功能 +import { nextTick } from 'vue' +nextTick(() => { + initNoticePopupAfterLogin() +}) diff --git a/openhis-ui-vue3/src/permission.js b/openhis-ui-vue3/src/permission.js index 7a28bd02..d4b6b93a 100644 --- a/openhis-ui-vue3/src/permission.js +++ b/openhis-ui-vue3/src/permission.js @@ -1,14 +1,17 @@ import router from './router' -import { ElMessage } from 'element-plus' +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 {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']; @@ -65,4 +68,36 @@ router.beforeEach((to, from, next) => { router.afterEach(() => { NProgress.done() -}) \ No newline at end of file + + // 登录成功后显示公告弹窗（仅限非登录页面且未显示过） + 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/src/plugins/download.js b/openhis-ui-vue3/src/plugins/download.js index 5dbcd5cb..d9a214e6 100644 --- a/openhis-ui-vue3/src/plugins/download.js +++ b/openhis-ui-vue3/src/plugins/download.js @@ -1,9 +1,9 @@ import axios from 'axios' -import { ElLoading, ElMessage } from 'element-plus' -import { saveAs } from 'file-saver' -import { getToken } from '@/utils/auth' +import {ElLoading, ElMessage} from 'element-plus' +import {saveAs} from 'file-saver' +import {getToken} from '@/utils/auth' import errorCode from '@/utils/errorCode' -import { blobValidate, tansParams } from '@/utils/openhis' +import {blobValidate, tansParams} from '@/utils/openhis' const baseURL = import.meta.env.VITE_APP_BASE_API let downloadLoadingInstance; diff --git a/openhis-ui-vue3/src/plugins/modal.js b/openhis-ui-vue3/src/plugins/modal.js index b59e14d6..7825704d 100644 --- a/openhis-ui-vue3/src/plugins/modal.js +++ b/openhis-ui-vue3/src/plugins/modal.js @@ -1,4 +1,4 @@ -import { ElMessage, ElMessageBox, ElNotification, ElLoading } from 'element-plus' +import {ElLoading, ElMessage, ElMessageBox, ElNotification} from 'element-plus' let loadingInstance; diff --git a/openhis-ui-vue3/src/router/index.js b/openhis-ui-vue3/src/router/index.js index 153d935d..1ee2b1ae 100644 --- a/openhis-ui-vue3/src/router/index.js +++ b/openhis-ui-vue3/src/router/index.js @@ -1,7 +1,6 @@ -import { createWebHistory, createRouter } from 'vue-router'; +import {createRouter, createWebHistory} from 'vue-router'; /* Layout */ import Layout from '@/layout'; -import { path } from 'd3'; /** * Note: 路由配置项说明 @@ -91,7 +90,7 @@ export const constantRoutes = [ }, { path: '/tpr', - component: () => import('@/views/inpatientNurse/tprSheet/index.vue'), + component: () => import('@/views/inpatientNurse/tprsheet/index.vue'), }, ]; diff --git a/openhis-ui-vue3/src/store/modules/permission.js b/openhis-ui-vue3/src/store/modules/permission.js index f31a8ec8..39f31e9c 100644 --- a/openhis-ui-vue3/src/store/modules/permission.js +++ b/openhis-ui-vue3/src/store/modules/permission.js @@ -1,6 +1,6 @@ import auth from '@/plugins/auth' -import router, { constantRoutes, dynamicRoutes } from '@/router' -import { getRouters } from '@/api/menu' +import router, {constantRoutes, dynamicRoutes} from '@/router' +import {getRouters} from '@/api/menu' import Layout from '@/layout/index' import ParentView from '@/components/ParentView' import InnerLink from '@/layout/components/InnerLink' diff --git a/openhis-ui-vue3/src/store/modules/settings.js b/openhis-ui-vue3/src/store/modules/settings.js index 22b73366..3cf4b10c 100644 --- a/openhis-ui-vue3/src/store/modules/settings.js +++ b/openhis-ui-vue3/src/store/modules/settings.js @@ -1,5 +1,5 @@ import defaultSettings from '@/settings' -import { useDynamicTitle } from '@/utils/dynamicTitle' +import {useDynamicTitle} from '@/utils/dynamicTitle' const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dynamicTitle } = defaultSettings diff --git a/openhis-ui-vue3/src/store/modules/user.js b/openhis-ui-vue3/src/store/modules/user.js index 23cb8a19..8eca5e56 100644 --- a/openhis-ui-vue3/src/store/modules/user.js +++ b/openhis-ui-vue3/src/store/modules/user.js @@ -1,7 +1,7 @@ -import { login, logout, getInfo } from '@/api/login' -import { getToken, setToken, removeToken } from '@/utils/auth' +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' +import {defineStore} from 'pinia' const useUserStore = defineStore( 'user', @@ -19,6 +19,7 @@ const useUserStore = defineStore( roles: [], permissions: [], tenantId: '', + tenantName: '', // 租户名称 hospitalName:'' }), actions: { @@ -63,6 +64,7 @@ const useUserStore = defineStore( this.fixmedinsCode = res.optionJson.fixmedinsCode this.avatar = avatar this.hospitalName = res.optionJson.hospitalName + this.tenantName = res.tenantName || '' resolve(res) }).catch(error => { diff --git a/openhis-ui-vue3/src/store/store.js b/openhis-ui-vue3/src/store/store.js index 144504e9..17385025 100644 --- a/openhis-ui-vue3/src/store/store.js +++ b/openhis-ui-vue3/src/store/store.js @@ -1,4 +1,4 @@ -import { defineStore } from 'pinia' +import {defineStore} from 'pinia' export const useStore = defineStore('current', { state: () => ({ diff --git a/openhis-ui-vue3/src/template/DischargeDiagnosisCertificate.vue b/openhis-ui-vue3/src/template/DischargeDiagnosisCertificate.vue index 89cc991a..d2ac605b 100644 --- a/openhis-ui-vue3/src/template/DischargeDiagnosisCertificate.vue +++ b/openhis-ui-vue3/src/template/DischargeDiagnosisCertificate.vue @@ -139,9 +139,9 @@ + + diff --git a/openhis-ui-vue3/src/views/doctorstation/components/patientList.vue b/openhis-ui-vue3/src/views/doctorstation/components/patientList.vue index 225e7ca2..97b35a3e 100644 --- a/openhis-ui-vue3/src/views/doctorstation/components/patientList.vue +++ b/openhis-ui-vue3/src/views/doctorstation/components/patientList.vue @@ -85,8 +85,8 @@ \ No newline at end of file + diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/adviceBaseList.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/adviceBaseList.vue index 8832d2b8..576f9216 100644 --- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/adviceBaseList.vue +++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/adviceBaseList.vue @@ -23,11 +23,11 @@ diff --git a/openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/components/discharged/patientList.vue b/openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/components/discharged/patientList.vue index c3a198fc..74a7866d 100644 --- a/openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/components/discharged/patientList.vue +++ b/openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/components/discharged/patientList.vue @@ -22,8 +22,8 @@ - diff --git a/openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/components/waitForDischarge/medicalOrderList.vue b/openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/components/waitForDischarge/medicalOrderList.vue index 31e606f0..51046071 100644 --- a/openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/components/waitForDischarge/medicalOrderList.vue +++ b/openhis-ui-vue3/src/views/inpatientNurse/dischargedManagement/components/waitForDischarge/medicalOrderList.vue @@ -45,8 +45,8 @@ - diff --git a/openhis-ui-vue3/src/views/monitor/job/index.vue b/openhis-ui-vue3/src/views/monitor/job/index.vue index d378f274..19571ab0 100644 --- a/openhis-ui-vue3/src/views/monitor/job/index.vue +++ b/openhis-ui-vue3/src/views/monitor/job/index.vue @@ -1,6 +1,6 @@ - + diff --git a/openhis-ui-vue3/src/views/pharmacymanagement/dispensingOrder/components/medicineList.vue b/openhis-ui-vue3/src/views/pharmacymanagement/dispensingOrder/components/medicineList.vue index a0993aee..c15f4fbe 100644 --- a/openhis-ui-vue3/src/views/pharmacymanagement/dispensingOrder/components/medicineList.vue +++ b/openhis-ui-vue3/src/views/pharmacymanagement/dispensingOrder/components/medicineList.vue @@ -16,9 +16,9 @@ diff --git a/openhis-ui-vue3/src/views/system/config/index.vue b/openhis-ui-vue3/src/views/system/config/index.vue index 34fd53da..5e9a983c 100644 --- a/openhis-ui-vue3/src/views/system/config/index.vue +++ b/openhis-ui-vue3/src/views/system/config/index.vue @@ -1,6 +1,6 @@ + + diff --git a/openhis-ui-vue3/src/views/system/post/index.vue b/openhis-ui-vue3/src/views/system/post/index.vue index 6fd1b641..5da895d1 100644 --- a/openhis-ui-vue3/src/views/system/post/index.vue +++ b/openhis-ui-vue3/src/views/system/post/index.vue @@ -1,6 +1,6 @@ + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/AdmissionDiagnosis.vue b/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/AdmissionDiagnosis.vue index e30d30f5..dfe602af 100644 --- a/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/AdmissionDiagnosis.vue +++ b/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/AdmissionDiagnosis.vue @@ -94,7 +94,7 @@