pom.xml

@@ -141,30 +141,9 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <annotationProcessorPaths>
-                        <path>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok</artifactId>
-                            <version>1.18.32</version>
-                        </path>
-                    </annotationProcessorPaths>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok</artifactId>
-                        </exclude>
-                    </excludes>
-                </configuration>
             </plugin>
         </plugins>
     </build>

src/main/java/com/syjiaer/clinic/server/common/api/input/IM2202.java

@@ -6,6 +6,8 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.time.LocalDateTime;
+
 @Getter
 @Setter
 @ToString

src/main/java/com/syjiaer/clinic/server/common/api/input/IM2205.java

@@ -1,11 +1,16 @@
 package com.syjiaer.clinic.server.common.api.input;
 
 import com.syjiaer.clinic.server.common.api.annotations.IMField;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
 @Getter
 @Setter
 @ToString

src/main/java/com/syjiaer/clinic/server/common/api/input/IM2206A.java

@@ -1,12 +1,16 @@
 package com.syjiaer.clinic.server.common.api.input;
 
 import com.syjiaer.clinic.server.common.api.annotations.IMField;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
 
 @Getter
 @Setter

src/main/java/com/syjiaer/clinic/server/common/api/input/IM2207A.java

@@ -1,6 +1,7 @@
 package com.syjiaer.clinic.server.common.api.input;
 
 import com.syjiaer.clinic.server.common.api.annotations.IMField;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;

src/main/java/com/syjiaer/clinic/server/common/api/input/IM2208.java

@@ -6,6 +6,8 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
+
 @Getter
 @Setter
 @ToString

src/main/java/com/syjiaer/clinic/server/common/api/input/IM9001.java

@@ -6,6 +6,9 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.time.LocalDate;
+import java.util.Date;
+
 @Getter
 @Setter
 @ToString

src/main/java/com/syjiaer/clinic/server/common/api/output/OM5267.java

@@ -6,6 +6,8 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.time.LocalDate;
+
 @Getter
 @Setter
 @ToString

src/main/java/com/syjiaer/clinic/server/common/config/ControllerAspect.java

@@ -10,6 +10,7 @@ import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.stereotype.Component;
 
+import java.net.http.HttpResponse;
 
 @Slf4j
 @Component // 将当前类交给spring管理

src/main/java/com/syjiaer/clinic/server/common/config/RecordCommonLogAspect.java

@@ -1,17 +1,26 @@
 package com.syjiaer.clinic.server.common.config;
 
 import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
+import com.syjiaer.clinic.server.common.util.InfoUtil;
+import com.syjiaer.clinic.server.common.util.ParmsUtil;
+import com.syjiaer.clinic.server.entity.common.CommonLog;
+import com.syjiaer.clinic.server.entity.manager.ManagerUser;
+import com.syjiaer.clinic.server.mapper.common.CommonLogMapper;
 import com.syjiaer.clinic.server.service.common.CommonLogService;
+import lombok.extern.apachecommons.CommonsLog;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.After;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import org.aspectj.lang.reflect.MethodSignature;
 import java.lang.reflect.Method;
+import java.util.Map;
 
 @Component
 @Aspect

src/main/java/com/syjiaer/clinic/server/common/config/RedisConfig.java

@@ -4,6 +4,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
 @Configuration

src/main/java/com/syjiaer/clinic/server/common/task/SocialReconciliationManager.java

@@ -1,12 +1,21 @@
 package com.syjiaer.clinic.server.common.task;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.syjiaer.clinic.server.common.util.CacheUtil;
+import com.syjiaer.clinic.server.common.util.DateUtil;
+import com.syjiaer.clinic.server.entity.social.dto.ReconciliationItemDto;
+import com.syjiaer.clinic.server.entity.social.vo.ReconciliationItemVo;
 import com.syjiaer.clinic.server.service.social.SocialReconciliationService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
 @Component
 @Slf4j
 public class SocialReconciliationManager {

src/main/java/com/syjiaer/clinic/server/common/util/DebugUtil.java

@@ -1,5 +1,7 @@
 package com.syjiaer.clinic.server.common.util;
 
+import java.util.Properties;
+
 public class DebugUtil {
     private static long startTime;
 

src/main/java/com/syjiaer/clinic/server/common/util/RsaUtil.java

@@ -1,10 +1,17 @@
 package com.syjiaer.clinic.server.common.util;
 
 import com.syjiaer.clinic.server.common.exception.MessageException;
+import org.springframework.stereotype.Component;
 
+import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import java.security.InvalidKeyException;
 import java.security.KeyFactory;
+import java.security.NoSuchAlgorithmException;
 import java.security.PublicKey;
+import java.security.spec.InvalidKeySpecException;
 import java.security.spec.X509EncodedKeySpec;
 import java.util.Base64;
 public class RsaUtil {

src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeController.java

@@ -1,5 +1,6 @@
 package com.syjiaer.clinic.server.controller.charge;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
 import com.syjiaer.clinic.server.common.api.output.OM2206A;
 import com.syjiaer.clinic.server.common.api.output.OM2207A;
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/charge")

src/main/java/com/syjiaer/clinic/server/controller/common/CommonConfigController.java

@@ -1,7 +1,10 @@
 package com.syjiaer.clinic.server.controller.common;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
 import com.syjiaer.clinic.server.common.config.Config;
+import com.syjiaer.clinic.server.common.util.RsaUtil;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
 import com.syjiaer.clinic.server.entity.common.CommonConfig;
@@ -9,7 +12,9 @@ import com.syjiaer.clinic.server.service.common.CommonConfigService;
 import com.syjiaer.clinic.server.service.common.FileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.HashMap;
 import java.util.List;

src/main/java/com/syjiaer/clinic/server/controller/common/FileController.java

@@ -2,6 +2,7 @@ package com.syjiaer.clinic.server.controller.common;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.syjiaer.clinic.server.common.annotations.NoAuthCheck;
+import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
 import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.common.util.CacheUtil;
 import com.syjiaer.clinic.server.common.util.StringUtil;
@@ -15,18 +16,19 @@ import org.springframework.core.io.UrlResource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.MalformedURLException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
 
 @Slf4j
 @RestController

src/main/java/com/syjiaer/clinic/server/controller/common/ManagerUserController.java

@@ -1,15 +1,21 @@
 package com.syjiaer.clinic.server.controller.common;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.syjiaer.clinic.server.common.annotations.NoAuthCheck;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
 import com.syjiaer.clinic.server.entity.manager.ManagerUser;
 import com.syjiaer.clinic.server.service.common.ManagerUserService;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.security.Keys;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.crypto.SecretKey;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/syjiaer/clinic/server/controller/common/SignController.java

@@ -4,6 +4,7 @@ import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
 import com.syjiaer.clinic.server.entity.manager.ManagerUserSign;
+import com.syjiaer.clinic.server.service.common.ManagerUserService;
 import com.syjiaer.clinic.server.service.common.SignService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java

@@ -1,6 +1,7 @@
 package com.syjiaer.clinic.server.controller.goods;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
 import com.syjiaer.clinic.server.common.enums.GoodsPricingModelEnum;
 import com.syjiaer.clinic.server.common.util.ParmsUtil;
@@ -8,6 +9,7 @@ import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
 import com.syjiaer.clinic.server.entity.goods.Goods;
+import com.syjiaer.clinic.server.entity.goods.GoodsView;
 import com.syjiaer.clinic.server.entity.goods.dto.GoodsQuery;
 import com.syjiaer.clinic.server.entity.goods.vo.GoodsDetailVo;
 import com.syjiaer.clinic.server.entity.goods.vo.GoodsSearchVo;
@@ -16,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryApplyController.java

@@ -1,6 +1,8 @@
 package com.syjiaer.clinic.server.controller.inventory;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
+import com.syjiaer.clinic.server.common.constants.Constants;
 import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
@@ -9,6 +11,7 @@ import com.syjiaer.clinic.server.entity.inventory.dto.ApplyOrderQuery;
 import com.syjiaer.clinic.server.service.inventory.InventoryApplyService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 

src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryCheckController.java

@@ -8,6 +8,7 @@ import com.syjiaer.clinic.server.entity.inventory.InventoryCheck;
 import com.syjiaer.clinic.server.entity.inventory.dto.CheckQuery;
 import com.syjiaer.clinic.server.service.inventory.InventoryCheckService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 

src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryController.java

@@ -12,6 +12,7 @@ import com.syjiaer.clinic.server.service.inventory.InventoryPurchaseService;
 import com.syjiaer.clinic.server.service.inventory.InventoryService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 

src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryPurchaseController.java

@@ -1,6 +1,7 @@
 package com.syjiaer.clinic.server.controller.inventory;
 
 import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
+import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.common.util.CacheUtil;
 import com.syjiaer.clinic.server.common.util.StringUtil;
 import com.syjiaer.clinic.server.common.vo.Page;
@@ -11,10 +12,20 @@ import com.syjiaer.clinic.server.entity.inventory.InventoryPurchase;
 import com.syjiaer.clinic.server.entity.inventory.dto.PurchaseOrderQuery;
 import com.syjiaer.clinic.server.entity.inventory.vo.InventoryPurchaseVo;
 import com.syjiaer.clinic.server.service.inventory.InventoryPurchaseService;
+import okhttp3.Cache;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.UrlResource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.net.MalformedURLException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

src/main/java/com/syjiaer/clinic/server/controller/inventory/InventorySupplierController.java

@@ -1,6 +1,8 @@
 package com.syjiaer.clinic.server.controller.inventory;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
+import com.syjiaer.clinic.server.common.constants.Constants;
 import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;

src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @RestController

src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationMemberController.java

@@ -5,9 +5,12 @@ import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
+import com.syjiaer.clinic.server.entity.charge.dto.ChargeQuery;
 import com.syjiaer.clinic.server.entity.organization.OrganizationMember;
+import com.syjiaer.clinic.server.entity.organization.OrganizationSection;
 import com.syjiaer.clinic.server.entity.organization.dto.DockerSearchQuery;
 import com.syjiaer.clinic.server.entity.organization.dto.OrganizationMemberSaveDto;
+import com.syjiaer.clinic.server.entity.organization.vo.MemberVo;
 import com.syjiaer.clinic.server.service.organization.OrganizationMemberService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/syjiaer/clinic/server/controller/patient/PatientController.java

@@ -5,7 +5,10 @@ import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
 import com.syjiaer.clinic.server.entity.patient.PatientInfo;
+import com.syjiaer.clinic.server.entity.vip.Vip;
 import com.syjiaer.clinic.server.service.patient.PatientInfoService;
+import com.syjiaer.clinic.server.service.vip.VipLevelConfigService;
+import com.syjiaer.clinic.server.service.vip.VipService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/com/syjiaer/clinic/server/controller/social/SocialDiagnoseController.java

@@ -3,6 +3,7 @@ package com.syjiaer.clinic.server.controller.social;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
 import com.syjiaer.clinic.server.entity.social.SocialDiagnose;
+import com.syjiaer.clinic.server.entity.social.SocialDirectory;
 import com.syjiaer.clinic.server.service.social.SocialDiagnoseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java

@@ -5,7 +5,7 @@ import com.syjiaer.clinic.server.common.util.DictoryUtil;
 import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
-import com.syjiaer.clinic.server.entity.social.SocialItem;
+import com.syjiaer.clinic.server.entity.social.*;
 import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView;
 import com.syjiaer.clinic.server.entity.social.vo.SocialItemVo;
 import com.syjiaer.clinic.server.service.social.*;
@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/syjiaer/clinic/server/controller/social/SocialPersonController.java

@@ -1,11 +1,13 @@
 package com.syjiaer.clinic.server.controller.social;
 
 import com.syjiaer.clinic.server.common.api.input.IM1101;
+import com.syjiaer.clinic.server.common.api.output.OM1101;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
 import com.syjiaer.clinic.server.entity.social.vo.SocialPersonInfoVo;
 import com.syjiaer.clinic.server.service.social.SocialUserService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 

src/main/java/com/syjiaer/clinic/server/controller/social/SocialReconciliationController.java

@@ -1,25 +1,36 @@
 package com.syjiaer.clinic.server.controller.social;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
 import com.syjiaer.clinic.server.common.api.input.IM2601;
+import com.syjiaer.clinic.server.common.api.input.IM3201;
 import com.syjiaer.clinic.server.common.api.output.OM3201;
 import com.syjiaer.clinic.server.common.util.DateUtil;
 import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
+import com.syjiaer.clinic.server.entity.charge.ChargeSocialPayLog;
 import com.syjiaer.clinic.server.entity.social.SocialReconciliationLog;
 import com.syjiaer.clinic.server.entity.social.dto.ReconciliationItemDto;
 import com.syjiaer.clinic.server.entity.social.dto.ReconciliationLogQuery;
 import com.syjiaer.clinic.server.entity.social.vo.ReconciliationDetailVo;
 import com.syjiaer.clinic.server.entity.social.vo.ReconciliationItemVo;
 import com.syjiaer.clinic.server.service.social.SocialReconciliationService;
+
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @RestController

src/main/java/com/syjiaer/clinic/server/controller/social/SocialUploadController.java

@@ -1,9 +1,14 @@
 package com.syjiaer.clinic.server.controller.social;
 
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.syjiaer.clinic.server.common.enums.InventorySocialTypeEnum;
+import com.syjiaer.clinic.server.common.enums.UploadStatusEnum;
 import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
 import com.syjiaer.clinic.server.entity.charge.ChargeInventoryLog;
+import com.syjiaer.clinic.server.entity.inventory.InventoryInit;
 import com.syjiaer.clinic.server.entity.social.dto.InventoryInitQuery;
 import com.syjiaer.clinic.server.entity.social.dto.InventoryLogQuery;
 import com.syjiaer.clinic.server.entity.social.dto.InventoryPurchaseLogQuery;
@@ -18,6 +23,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
 @Slf4j
 @RestController
 @RequestMapping("/social/upload")

src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java

@@ -1,5 +1,6 @@
 package com.syjiaer.clinic.server.controller.statistics;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.syjiaer.clinic.server.common.util.DateUtil;
 import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.common.vo.Result;

src/main/java/com/syjiaer/clinic/server/controller/vip/VipController.java

@@ -1,5 +1,19 @@
 package com.syjiaer.clinic.server.controller.vip;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.syjiaer.clinic.server.common.vo.Page;
+import com.syjiaer.clinic.server.common.vo.Result;
+import com.syjiaer.clinic.server.controller.BaseController;
+import com.syjiaer.clinic.server.entity.vip.Vip;
+import com.syjiaer.clinic.server.service.vip.VipLevelConfigService;
+import com.syjiaer.clinic.server.service.vip.VipService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDate;
+import java.util.List;
+
 ///**
 // * <p>
 // * 商品 前端控制器

src/main/java/com/syjiaer/clinic/server/controller/vip/VipIntegralController.java

@@ -1,17 +1,22 @@
 package com.syjiaer.clinic.server.controller.vip;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
 import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
+import com.syjiaer.clinic.server.entity.patient.PatientInfo;
 import com.syjiaer.clinic.server.entity.vip.VipIntegralLog;
 import com.syjiaer.clinic.server.entity.vip.dto.VipIntegralLogQuery;
 import com.syjiaer.clinic.server.service.patient.PatientInfoService;
 import com.syjiaer.clinic.server.service.vip.VipIntegralLogService;
+import com.syjiaer.clinic.server.service.vip.VipService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/vip/integral")
 public class VipIntegralController extends BaseController {

src/main/java/com/syjiaer/clinic/server/controller/vip/VipLevelConfigController.java

@@ -1,14 +1,18 @@
 package com.syjiaer.clinic.server.controller.vip;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
 import com.syjiaer.clinic.server.entity.vip.VipLevelConfig;
 import com.syjiaer.clinic.server.service.vip.VipLevelConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**

src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeGoodsList.java

@@ -5,15 +5,14 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
 /**
  * <p>
  * 收费商品详情

src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeInventoryLog.java

@@ -5,13 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
 /**
  * <p>
  * 收费商品库存变化日志

src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeItemList.java

@@ -5,15 +5,14 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
 /**
  * <p>
  * 收费服务详情

src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeLog.java

@@ -6,14 +6,13 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
 /**
  * <p>
  * 

src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeOrder.java

@@ -5,15 +5,14 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
 /**
  * <p>
  * 收费主表

src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeSocialPayLog.java

@@ -5,14 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
 /**
  * <p>
  * 医保收费记录

src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeQuery.java

@@ -1,6 +1,7 @@
 package com.syjiaer.clinic.server.entity.charge.dto;
 
 import lombok.Data;
+import lombok.Getter;
 @Data
 public class ChargeQuery {
  private String patientName;

src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeSaveDto.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.syjiaer.clinic.server.entity.charge.vo.ChargeGoodsListVo;
 import com.syjiaer.clinic.server.entity.charge.vo.ChargeItemListVo;
+import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalItemList;
 import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalRecord;
 import com.syjiaer.clinic.server.entity.patient.PatientInfo;
 import com.syjiaer.clinic.server.entity.patient.PatientRegistration;

src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargeGoodsListVo.java

@@ -1,5 +1,7 @@
 package com.syjiaer.clinic.server.entity.charge.vo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargeItemListVo.java

@@ -1,5 +1,7 @@
 package com.syjiaer.clinic.server.entity.charge.vo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargeOrderPrintVo.java

@@ -2,8 +2,13 @@ package com.syjiaer.clinic.server.entity.charge.vo;
 
 import com.syjiaer.clinic.server.entity.charge.ChargeGoodsList;
 import com.syjiaer.clinic.server.entity.charge.ChargeItemList;
+import com.syjiaer.clinic.server.entity.charge.ChargeOrder;
 import com.syjiaer.clinic.server.entity.charge.ChargeSocialPayLog;
+import com.syjiaer.clinic.server.entity.patient.PatientInfo;
+import com.syjiaer.clinic.server.service.charge.ChargeService;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.List;
 @Data

src/main/java/com/syjiaer/clinic/server/entity/charge/vo/PatientPrintInfoVo.java

@@ -1,5 +1,8 @@
 package com.syjiaer.clinic.server.entity.charge.vo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;

src/main/java/com/syjiaer/clinic/server/entity/common/CommonLog.java

@@ -6,13 +6,12 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
 /**
  * <p>
  * 操作日志

src/main/java/com/syjiaer/clinic/server/entity/diagnosis/Diagnosis.java

@@ -4,13 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
 /**
  * <p>
  * 

src/main/java/com/syjiaer/clinic/server/entity/diagnosis/DiagnosisMedicalGoodsList.java

@@ -5,13 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
 /**
  * <p>
  * 病例商品详情

src/main/java/com/syjiaer/clinic/server/entity/diagnosis/DiagnosisMedicalItemList.java

@@ -5,13 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
 /**
  * <p>
  * 病例服务详情

src/main/java/com/syjiaer/clinic/server/entity/diagnosis/DiagnosisMedicalRecord.java

@@ -5,12 +5,11 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
 /**
  * <p>
  * 病例

src/main/java/com/syjiaer/clinic/server/entity/diagnosis/vo/ChargeQueueVo.java

@@ -1,6 +1,8 @@
 package com.syjiaer.clinic.server.entity.diagnosis.vo;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

src/main/java/com/syjiaer/clinic/server/entity/diagnosis/vo/MedicalHistoryVo.java

@@ -5,7 +5,9 @@ import com.syjiaer.clinic.server.entity.charge.vo.ChargeGoodsListVo;
 import com.syjiaer.clinic.server.entity.charge.vo.ChargeItemListVo;
 import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalRecord;
 import com.syjiaer.clinic.server.entity.patient.PatientInfo;
+import com.syjiaer.clinic.server.entity.patient.PatientRegistration;
 import com.syjiaer.clinic.server.entity.patient.vo.PatientAndRegistrationInfoVo;
+import com.syjiaer.clinic.server.entity.patient.vo.PatientRegistrationVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

src/main/java/com/syjiaer/clinic/server/entity/diagnosis/vo/MedicalRecordVo.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.syjiaer.clinic.server.entity.charge.vo.ChargeGoodsListVo;
 import com.syjiaer.clinic.server.entity.charge.vo.ChargeItemListVo;
+import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalGoodsList;
+import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalItemList;
 import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalRecord;
 import com.syjiaer.clinic.server.entity.patient.PatientInfo;
 import com.syjiaer.clinic.server.entity.patient.PatientRegistration;

src/main/java/com/syjiaer/clinic/server/entity/goods/Goods.java

@@ -4,13 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
 /**
  * <p>
  * 商品主表

src/main/java/com/syjiaer/clinic/server/entity/inventory/Inventory.java

@@ -4,15 +4,14 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
 /**
  * <p>
  * 库存主表

src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryApply.java

@@ -5,14 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
 /**
  * <p>
  * 库存领用表

src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryCheck.java

@@ -5,14 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
 /**
  * <p>
  * 盘点主表

src/main/java/com/syjiaer/clinic/server/entity/item/Item.java

@@ -4,14 +4,13 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
 /**
  * <p>
  * 诊疗项目

src/main/java/com/syjiaer/clinic/server/entity/item/vo/ItemSearchVo.java

@@ -1,5 +1,7 @@
 package com.syjiaer.clinic.server.entity.item.vo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

src/main/java/com/syjiaer/clinic/server/entity/manager/ManagerUser.java

@@ -5,12 +5,11 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
 /**
  * <p>
  * 用户表

src/main/java/com/syjiaer/clinic/server/entity/manager/ManagerUserSign.java

@@ -5,13 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
 /**
  * <p>
  * 

src/main/java/com/syjiaer/clinic/server/entity/organization/OrganizationMember.java

@@ -5,13 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
 /**
  * <p>
  * 成员表

src/main/java/com/syjiaer/clinic/server/entity/organization/OrganizationMemberSection.java

@@ -3,12 +3,11 @@ package com.syjiaer.clinic.server.entity.organization;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
 /**
  * <p>
  * 

src/main/java/com/syjiaer/clinic/server/entity/organization/OrganizationSection.java

@@ -5,14 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 /**
  * <p>
  * 科室

src/main/java/com/syjiaer/clinic/server/entity/organization/vo/MemberVo.java

@@ -1,5 +1,7 @@
 package com.syjiaer.clinic.server.entity.organization.vo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

src/main/java/com/syjiaer/clinic/server/entity/patient/PatientInfo.java

@@ -5,15 +5,14 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
 /**
  * <p>
  * 患者信息	

src/main/java/com/syjiaer/clinic/server/entity/patient/PatientRegistration.java

@@ -5,14 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
 /**
  * <p>
  * 挂号表

src/main/java/com/syjiaer/clinic/server/entity/patient/vo/PatientRegistrationVo.java

@@ -1,5 +1,7 @@
 package com.syjiaer.clinic.server.entity.patient.vo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

src/main/java/com/syjiaer/clinic/server/entity/social/SocialChineseMedicinalGranula.java

@@ -5,12 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
 /**
  * <p>
  * 中药配方颗粒目录1320

src/main/java/com/syjiaer/clinic/server/entity/social/SocialDiagnose.java

@@ -5,13 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
 /**
  * <p>
  * 疾病与诊断目录1307

src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectoryMongodb.java

@@ -8,6 +8,9 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 医保目录

src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectoryUpinfo.java

@@ -6,14 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.math.BigInteger;
-import java.time.LocalDateTime;
 /**
  * <p>
  * 医保有效期 1312

src/main/java/com/syjiaer/clinic/server/entity/social/SocialIcpcDiagnosis.java

@@ -5,13 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
 /**
  * <p>
  * 

src/main/java/com/syjiaer/clinic/server/entity/social/SocialIcpcItem.java

@@ -5,13 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
 /**
  * <p>
  * 

src/main/java/com/syjiaer/clinic/server/entity/social/SocialItem.java

@@ -5,13 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
 /**
  * <p>
  * 医保服务项目目录1305,1320

src/main/java/com/syjiaer/clinic/server/entity/social/SocialReconciliationLog.java

@@ -5,14 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
 /**
  * <p>
  * 

src/main/java/com/syjiaer/clinic/server/entity/social/SocialTcmDiseaseCatalogue.java

@@ -5,13 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
 /**
  * <p>
  * 

src/main/java/com/syjiaer/clinic/server/entity/social/SocialTcmSyndrome.java

@@ -5,13 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
 /**
  * <p>
  * 

src/main/java/com/syjiaer/clinic/server/entity/social/dto/ReconciliationItemDto.java

@@ -4,6 +4,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Getter

src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialDirectoryView.java

@@ -2,6 +2,7 @@ package com.syjiaer.clinic.server.entity.social.vo;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryInitVo.java

@@ -11,6 +11,7 @@ import lombok.experimental.Accessors;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>

src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryLogVo.java

@@ -2,6 +2,7 @@ package com.syjiaer.clinic.server.entity.social.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;

src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialItemVo.java

@@ -1,5 +1,10 @@
 package com.syjiaer.clinic.server.entity.social.vo;
 
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialPersonInfoVo.java

@@ -1,5 +1,7 @@
 package com.syjiaer.clinic.server.entity.social.vo;
 
+import com.syjiaer.clinic.server.common.api.annotations.IMField;
+import com.syjiaer.clinic.server.common.api.annotations.OMField;
 import com.syjiaer.clinic.server.common.api.output.OM1101;
 import com.syjiaer.clinic.server.common.api.output.OM5267;
 import com.syjiaer.clinic.server.common.api.output.OM5283;

src/main/java/com/syjiaer/clinic/server/entity/statistics/SalesVolumeOverviewVo.java

@@ -2,6 +2,7 @@ package com.syjiaer.clinic.server.entity.statistics;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 @Data
 public class SalesVolumeOverviewVo {

src/main/java/com/syjiaer/clinic/server/entity/vip/Vip.java

@@ -4,14 +4,13 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDate;
 /**
  * <p>
  * 

src/main/java/com/syjiaer/clinic/server/entity/vip/VipExpLog.java

@@ -5,13 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
 /**
  * <p>
  * 

src/main/java/com/syjiaer/clinic/server/entity/vip/VipIntegralLog.java

@@ -5,13 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
 /**
  * <p>
  * 

src/main/java/com/syjiaer/clinic/server/entity/vip/VipLevelConfig.java

@@ -5,12 +5,11 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
 /**
  * <p>
  * 

src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeGoodsListMapper.java

@@ -1,7 +1,7 @@
 package com.syjiaer.clinic.server.mapper.charge;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.syjiaer.clinic.server.entity.charge.ChargeGoodsList;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.syjiaer.clinic.server.entity.charge.vo.ChargeGoodsListVo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;

src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeInventoryLogMapper.java

@@ -1,7 +1,7 @@
 package com.syjiaer.clinic.server.mapper.charge;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.syjiaer.clinic.server.entity.charge.ChargeInventoryLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
 /**

src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeItemListMapper.java

@@ -1,7 +1,7 @@
 package com.syjiaer.clinic.server.mapper.charge;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.syjiaer.clinic.server.entity.charge.ChargeItemList;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;

src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeLogMapper.java

@@ -1,7 +1,7 @@
 package com.syjiaer.clinic.server.mapper.charge;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.syjiaer.clinic.server.entity.charge.ChargeLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
 /**

src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeOrderMapper.java

@@ -1,7 +1,7 @@
 package com.syjiaer.clinic.server.mapper.charge;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.syjiaer.clinic.server.entity.charge.ChargeOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;

src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeSocialPayLogMapper.java

@@ -1,7 +1,7 @@
 package com.syjiaer.clinic.server.mapper.charge;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.syjiaer.clinic.server.entity.charge.ChargeSocialPayLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Select;
 
 

src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMapper.java

@@ -1,7 +1,7 @@
 package com.syjiaer.clinic.server.mapper.diagnosis;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.syjiaer.clinic.server.entity.diagnosis.Diagnosis;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Select;