wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

style(flowable): 优化流程相关代码的import顺序和代码结构

Browse Source
This commit is contained in:
chenqi
2025-12-30 15:11:32 +08:00
parent 54cde91aac
commit d1670b79a0
2528 changed files with 7710 additions and 10794 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/ICommonService.java
View File

@@ -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常用接口
*

17
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/impl/CommonServiceImpl.java
View File

@@ -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常用接口

17
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/controller/CommonAppController.java
View File

@@ -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常用接口

1
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/ActivityDefinitionDto.java
View File

@@ -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;

5
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/AdviceItemPrintInfoDto.java
View File

@@ -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;
/**
* 医嘱项目打印信息
*

7
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/AdvicePrintInfoDto.java
View File

@@ -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;
/**
* 处方信息
*

9
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/InventoryItemDto.java
View File

@@ -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
*

1
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/LocationDto.java
View File

@@ -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;

7
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/LocationInventoryDto.java
View File

@@ -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;
/**
* 库存项目所在对应库房信息
*

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformInfoDto.java
View File

@@ -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;

5
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformRecordDto.java
View File

@@ -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
*

1
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PractitionerInfoDto.java
View File

@@ -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;

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/UnitQuantityDto.java
View File

@@ -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;
/**
* 单位数量列表
*

9
openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/mapper/CommonAppMapper.java
View File

@@ -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