wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 1 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/personalization/appservice/IActivityDeviceAppService.java
View File

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

18
openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/ActivityDeviceAppServiceImpl.java
View File

@@ -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;
/**
* 诊疗耗材绑定 实现类

16
openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/IOrderGroupAppServiceImpl.java
View File

@@ -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;
/**
* 组套 实现类

16
openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java
View File

@@ -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;
/**
* 组合套餐 实现类

12
openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/ActivityDeviceController.java
View File

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

10
openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/OrderGroupController.java
View File

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

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/controller/OrdersGroupPackageController.java
View File

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

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

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

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

@@ -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;
/**
* 诊疗耗材绑定初始化
*

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

5
openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/ActivityDeviceAppMapper.java
View File

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

5
openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/OrderGroupAppMapper.java
View File

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

7
openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/mapper/OrdersGroupPackageAppMapper.java
View File

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