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

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实体
  *

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实体
  *

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;

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;

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实体
  *

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实体
  *

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实体
  *

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实体
  *

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实体
  *

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实体
  *

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;

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实体
  *

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实体
  *

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;

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

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;

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

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实体
  *

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实体
  *

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实体
  *

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;

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;

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;

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;

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实体
  *

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实体
  *

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实体
  *

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实体
  *

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实体
  *

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实体
  *

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;

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;

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;

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;

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

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 {

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的信息
  *

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
  *

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;
+
 /**
  * 费用明细查询条件
  * 

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;
+
 /**
  * 挂号和账户的集合实体
  *

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;
 
 /**

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;
 
 /**

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;

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;
 
 /**

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
  *

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接口

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接口

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接口
  *

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接口

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;
 

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;
 
 /**

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接口

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接口

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;
 

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接口

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接口

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接口

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接口

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接口

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接口

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接口

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接口

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接口

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接口

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接口

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接口

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接口
  *

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接口

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;
 

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接口

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接口

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;
 

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接口

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接口

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接口

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接口

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接口

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接口

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接口
  *

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接口

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接口
  *

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接口
  *

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接口
  *

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接口
  *

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接口
  *

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接口
  *

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接口
  *

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;
 
 /**

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接口

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;
 

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接口

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接口

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接口
  *

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;

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;
 

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接口
  *

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;
 
 /**

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业务层处理

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业务层处理

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业务层处理