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/inpatientmanage/appservice/IDepositAppService.java
View File

@@ -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;
/**
* 住院登记 应用实现
*

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

@@ -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;
/**
* 护理记录单 应用实现
*

9
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/IPatientHomeAppService.java
View File

@@ -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;
/**
* 患者首页 应用实现
*

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

@@ -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;
/**
* 三测单 应用实现
*

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

@@ -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.*;
/**
* 预交金管理 实现类

22
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/NursingRecordAppServiceImpl.java
View File

@@ -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;
/**
* 护理记录单 实现类

12
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/PatientHomeAppServiceImpl.java
View File

@@ -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.*;
/**
* 患者首页 实现类

38
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/VitalSignsAppServiceImpl.java
View File

@@ -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;
/**
* 三测单 实现类

14
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/DepositController.java
View File

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

15
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/NursingRecordController.java
View File

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

15
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/PatientHomeController.java
View File

@@ -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;
/**
* 患者首页 应用实现

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

@@ -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;
/**
* 三测单 应用实现

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

@@ -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;
/**
* 预交金信息
*

8
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/DepositPaymentDto.java
View File

@@ -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;
/**
* 预交金付款入参
*

8
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingDetailDto.java
View File

@@ -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;
/**
* 住院患者信息
*

8
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingEmrTemplateDto.java
View File

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

8
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingPageDto.java
View File

@@ -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;
/**
* 住院患者信息
*

8
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingRecordDto.java
View File

@@ -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;
/**
* 护理记录单入参
*

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

@@ -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;
/**
* 患者首页信息
*

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

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

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

@@ -1,7 +1,6 @@
package com.openhis.web.inpatientmanage.dto;
import com.core.common.core.domain.HisBaseEntity;
import lombok.Data;
import lombok.experimental.Accessors;

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

@@ -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;
/**
* 三测单信息
*

8
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsMedicalRecordDto.java
View File

@@ -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;
/**
* 三测单信息
*

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

@@ -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;
/**
* 生命体征管理
*

6
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/VitalSignsTemperaturePulsesDto.java
View File

@@ -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;
/**
* 三测单信息
*

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

@@ -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;
/**
* 预交金管理

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

@@ -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;
/**
* 护理记录单

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

@@ -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;
/**
* 患者首页

11
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/mapper/VitalSignsAppMapper.java
View File

@@ -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;
/**
* 三测单