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/nenu/appservice/IGfRatioApplicationRecordAppService.java
View File

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

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

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

7
openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfStudentListAppService.java
View File

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

19
openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfRatioApplicationRecordAppServiceImpl.java
View File

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

13
openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfRatioManageAppServiceImpl.java
View File

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

52
openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfStudentListAppServiceImpl.java
View File

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

11
openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfRatioApplicationRecordController.java
View File

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

9
openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfRatioManageController.java
View File

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

13
openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfStudentListController.java
View File

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

10
openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfIndividualRatioDto.java
View File

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

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

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

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

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

15
openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationRecordDto.java
View File

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

13
openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListDto.java
View File

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

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

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

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

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

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

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

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

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

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

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