From 9bc2f25707f4a4ff1312107e46db4be721590556 Mon Sep 17 00:00:00 2001 From: LiJianZhao Date: Tue, 20 May 2025 15:44:15 +0800 Subject: [PATCH] =?UTF-8?q?import=20=E4=BC=98=E5=8C=96=20+=20pom.xml?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 21 +++++++++++++++++++ .../server/common/api/input/IM2202.java | 2 -- .../server/common/api/input/IM2205.java | 5 ----- .../server/common/api/input/IM2206A.java | 4 ---- .../server/common/api/input/IM2207A.java | 1 - .../server/common/api/input/IM2208.java | 2 -- .../server/common/api/input/IM9001.java | 3 --- .../server/common/api/output/OM5267.java | 2 -- .../common/config/ControllerAspect.java | 1 - .../common/config/RecordCommonLogAspect.java | 11 +--------- .../server/common/config/RedisConfig.java | 1 - .../task/SocialReconciliationManager.java | 9 -------- .../clinic/server/common/util/DebugUtil.java | 2 -- .../clinic/server/common/util/RsaUtil.java | 7 ------- .../controller/charge/ChargeController.java | 2 -- .../common/CommonConfigController.java | 5 ----- .../controller/common/FileController.java | 10 ++++----- .../common/ManagerUserController.java | 6 ------ .../controller/common/SignController.java | 1 - .../controller/goods/GoodsController.java | 3 --- .../inventory/InventoryApplyController.java | 3 --- .../inventory/InventoryCheckController.java | 1 - .../inventory/InventoryController.java | 1 - .../InventoryPurchaseController.java | 11 ---------- .../InventorySupplierController.java | 2 -- .../controller/item/ItemController.java | 1 - .../OrganizationMemberController.java | 3 --- .../controller/patient/PatientController.java | 3 --- .../social/SocialDiagnoseController.java | 1 - .../social/SocialDirectoryController.java | 3 +-- .../social/SocialPersonController.java | 2 -- .../SocialReconciliationController.java | 11 ---------- .../social/SocialUploadController.java | 10 --------- .../statistics/StatisticsController.java | 1 - .../server/controller/vip/VipController.java | 14 ------------- .../controller/vip/VipIntegralController.java | 5 ----- .../vip/VipLevelConfigController.java | 4 ---- .../server/entity/charge/ChargeGoodsList.java | 9 ++++---- .../entity/charge/ChargeInventoryLog.java | 5 +++-- .../server/entity/charge/ChargeItemList.java | 9 ++++---- .../server/entity/charge/ChargeLog.java | 7 ++++--- .../server/entity/charge/ChargeOrder.java | 9 ++++---- .../entity/charge/ChargeSocialPayLog.java | 7 ++++--- .../server/entity/charge/dto/ChargeQuery.java | 1 - .../entity/charge/dto/ChargeSaveDto.java | 1 - .../entity/charge/vo/ChargeGoodsListVo.java | 2 -- .../entity/charge/vo/ChargeItemListVo.java | 2 -- .../entity/charge/vo/ChargeOrderPrintVo.java | 5 ----- .../entity/charge/vo/PatientPrintInfoVo.java | 3 --- .../server/entity/common/CommonLog.java | 5 +++-- .../server/entity/diagnosis/Diagnosis.java | 5 +++-- .../diagnosis/DiagnosisMedicalGoodsList.java | 5 +++-- .../diagnosis/DiagnosisMedicalItemList.java | 5 +++-- .../diagnosis/DiagnosisMedicalRecord.java | 3 ++- .../entity/diagnosis/vo/ChargeQueueVo.java | 2 -- .../entity/diagnosis/vo/MedicalHistoryVo.java | 2 -- .../entity/diagnosis/vo/MedicalRecordVo.java | 2 -- .../clinic/server/entity/goods/Goods.java | 5 +++-- .../server/entity/inventory/Inventory.java | 9 ++++---- .../entity/inventory/InventoryApply.java | 7 ++++--- .../entity/inventory/InventoryCheck.java | 7 ++++--- .../clinic/server/entity/item/Item.java | 7 ++++--- .../server/entity/item/vo/ItemSearchVo.java | 2 -- .../server/entity/manager/ManagerUser.java | 3 ++- .../entity/manager/ManagerUserSign.java | 5 +++-- .../organization/OrganizationMember.java | 5 +++-- .../OrganizationMemberSection.java | 3 ++- .../organization/OrganizationSection.java | 7 ++++--- .../entity/organization/vo/MemberVo.java | 2 -- .../server/entity/patient/PatientInfo.java | 9 ++++---- .../entity/patient/PatientRegistration.java | 7 ++++--- .../patient/vo/PatientRegistrationVo.java | 2 -- .../social/SocialChineseMedicinalGranula.java | 4 ++-- .../server/entity/social/SocialDiagnose.java | 5 +++-- .../entity/social/SocialDirectoryMongodb.java | 3 --- .../entity/social/SocialDirectoryUpinfo.java | 8 +++---- .../entity/social/SocialIcpcDiagnosis.java | 5 +++-- .../server/entity/social/SocialIcpcItem.java | 5 +++-- .../server/entity/social/SocialItem.java | 5 +++-- .../social/SocialReconciliationLog.java | 7 ++++--- .../social/SocialTcmDiseaseCatalogue.java | 5 +++-- .../entity/social/SocialTcmSyndrome.java | 5 +++-- .../social/dto/ReconciliationItemDto.java | 1 - .../entity/social/vo/SocialDirectoryView.java | 1 - .../social/vo/SocialInventoryInitVo.java | 1 - .../social/vo/SocialInventoryLogVo.java | 1 - .../server/entity/social/vo/SocialItemVo.java | 5 ----- .../entity/social/vo/SocialPersonInfoVo.java | 2 -- .../statistics/SalesVolumeOverviewVo.java | 1 - .../syjiaer/clinic/server/entity/vip/Vip.java | 7 ++++--- .../clinic/server/entity/vip/VipExpLog.java | 5 +++-- .../server/entity/vip/VipIntegralLog.java | 5 +++-- .../server/entity/vip/VipLevelConfig.java | 3 ++- .../mapper/charge/ChargeGoodsListMapper.java | 2 +- .../charge/ChargeInventoryLogMapper.java | 2 +- .../mapper/charge/ChargeItemListMapper.java | 2 +- .../server/mapper/charge/ChargeLogMapper.java | 2 +- .../mapper/charge/ChargeOrderMapper.java | 2 +- .../charge/ChargeSocialPayLogMapper.java | 2 +- .../mapper/diagnosis/DiagnosisMapper.java | 2 +- .../DiagnosisMedicalGoodsListMapper.java | 2 +- .../DiagnosisMedicalItemListMapper.java | 4 +--- .../mapper/inventory/InventoryMapper.java | 1 - .../clinic/server/mapper/item/ItemMapper.java | 5 ----- .../mapper/manager/ManagerUserSignMapper.java | 2 +- .../OrganizationMemberMapper.java | 7 ------- .../OrganizationMemberSectionMapper.java | 2 +- .../patient/PatientRegistrationMapper.java | 1 - .../SocialChineseMedicinalGranulaMapper.java | 2 +- .../social/SocialDirectoryLimitMapper.java | 2 -- .../social/SocialIcpcDiagnosisMapper.java | 2 +- .../mapper/social/SocialIcpcItemMapper.java | 2 +- .../mapper/social/SocialItemMapper.java | 1 - .../social/SocialReconciliationLogMapper.java | 2 +- .../SocialTcmDiseaseCatalogueMapper.java | 2 +- .../social/SocialTcmSyndromeMapper.java | 2 +- .../server/mapper/vip/VipExpLogMapper.java | 2 +- .../mapper/vip/VipIntegralLogMapper.java | 2 +- .../mapper/vip/VipLevelConfigMapper.java | 2 +- .../clinic/server/mapper/vip/VipMapper.java | 2 +- .../clinic/server/service/BaseService.java | 5 ----- .../server/service/charge/ChargeService.java | 5 +---- .../service/common/CommonConfigService.java | 1 - .../service/common/ManagerUserService.java | 11 ---------- .../diagnosis/MedicalRecordService.java | 18 ++++++++-------- .../server/service/goods/GoodsService.java | 1 - .../service/inventory/InventoryService.java | 1 - .../server/service/item/ItemService.java | 3 --- .../OrganizationMemberService.java | 3 --- .../service/patient/PatientInfoService.java | 1 - .../patient/PatientRegistrationService.java | 2 -- .../social/SocialDirectoryLimitService.java | 1 - .../social/SocialDirectorySelfService.java | 1 - .../social/SocialDirectoryService.java | 12 +++++++---- .../social/SocialDirectoryUpinfoService.java | 10 --------- .../social/SocialIcpcDiagnoseService.java | 4 ---- .../service/social/SocialIcpcItemService.java | 5 ----- .../social/SocialInventoryUploadService.java | 3 --- .../service/social/SocialItemService.java | 8 +++++-- .../service/social/SocialUserService.java | 4 +++- .../service/vip/VipIntegralLogService.java | 5 ----- .../service/vip/VipLevelConfigService.java | 1 - src/main/resources/application.yml | 6 +++--- 143 files changed, 201 insertions(+), 398 deletions(-) diff --git a/pom.xml b/pom.xml index 7979afd..7724959 100644 --- a/pom.xml +++ b/pom.xml @@ -141,9 +141,30 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.projectlombok + lombok + 1.18.32 + + + + org.springframework.boot spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + diff --git a/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2202.java b/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2202.java index 0584153..f7983bb 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2202.java +++ b/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2202.java @@ -6,8 +6,6 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; -import java.time.LocalDateTime; - @Getter @Setter @ToString diff --git a/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2205.java b/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2205.java index 18a4250..acf2cae 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2205.java +++ b/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2205.java @@ -1,16 +1,11 @@ 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 diff --git a/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2206A.java b/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2206A.java index 8c0c06f..1ab6706 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2206A.java +++ b/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2206A.java @@ -1,16 +1,12 @@ 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 diff --git a/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2207A.java b/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2207A.java index 278cc2f..fd35639 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2207A.java +++ b/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2207A.java @@ -1,7 +1,6 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2208.java b/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2208.java index 45655ac..884d316 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2208.java +++ b/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2208.java @@ -6,8 +6,6 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; -import java.math.BigDecimal; - @Getter @Setter @ToString diff --git a/src/main/java/com/syjiaer/clinic/server/common/api/input/IM9001.java b/src/main/java/com/syjiaer/clinic/server/common/api/input/IM9001.java index c3dde35..137b960 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/api/input/IM9001.java +++ b/src/main/java/com/syjiaer/clinic/server/common/api/input/IM9001.java @@ -6,9 +6,6 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; -import java.time.LocalDate; -import java.util.Date; - @Getter @Setter @ToString diff --git a/src/main/java/com/syjiaer/clinic/server/common/api/output/OM5267.java b/src/main/java/com/syjiaer/clinic/server/common/api/output/OM5267.java index b248b4d..775893b 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/api/output/OM5267.java +++ b/src/main/java/com/syjiaer/clinic/server/common/api/output/OM5267.java @@ -6,8 +6,6 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; -import java.time.LocalDate; - @Getter @Setter @ToString diff --git a/src/main/java/com/syjiaer/clinic/server/common/config/ControllerAspect.java b/src/main/java/com/syjiaer/clinic/server/common/config/ControllerAspect.java index fb4dadb..4bd3f60 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/config/ControllerAspect.java +++ b/src/main/java/com/syjiaer/clinic/server/common/config/ControllerAspect.java @@ -10,7 +10,6 @@ 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管理 diff --git a/src/main/java/com/syjiaer/clinic/server/common/config/RecordCommonLogAspect.java b/src/main/java/com/syjiaer/clinic/server/common/config/RecordCommonLogAspect.java index f21bece..63bde77 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/config/RecordCommonLogAspect.java +++ b/src/main/java/com/syjiaer/clinic/server/common/config/RecordCommonLogAspect.java @@ -1,26 +1,17 @@ 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 diff --git a/src/main/java/com/syjiaer/clinic/server/common/config/RedisConfig.java b/src/main/java/com/syjiaer/clinic/server/common/config/RedisConfig.java index 7f2b28c..a636f11 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/config/RedisConfig.java +++ b/src/main/java/com/syjiaer/clinic/server/common/config/RedisConfig.java @@ -4,7 +4,6 @@ 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 diff --git a/src/main/java/com/syjiaer/clinic/server/common/task/SocialReconciliationManager.java b/src/main/java/com/syjiaer/clinic/server/common/task/SocialReconciliationManager.java index 916aea5..d27167b 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/task/SocialReconciliationManager.java +++ b/src/main/java/com/syjiaer/clinic/server/common/task/SocialReconciliationManager.java @@ -1,21 +1,12 @@ 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 { diff --git a/src/main/java/com/syjiaer/clinic/server/common/util/DebugUtil.java b/src/main/java/com/syjiaer/clinic/server/common/util/DebugUtil.java index 032abae..2cefd51 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/util/DebugUtil.java +++ b/src/main/java/com/syjiaer/clinic/server/common/util/DebugUtil.java @@ -1,7 +1,5 @@ package com.syjiaer.clinic.server.common.util; -import java.util.Properties; - public class DebugUtil { private static long startTime; diff --git a/src/main/java/com/syjiaer/clinic/server/common/util/RsaUtil.java b/src/main/java/com/syjiaer/clinic/server/common/util/RsaUtil.java index 5ca7235..43927f4 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/util/RsaUtil.java +++ b/src/main/java/com/syjiaer/clinic/server/common/util/RsaUtil.java @@ -1,17 +1,10 @@ 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 { diff --git a/src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeController.java b/src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeController.java index 95a4e89..47b80d8 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeController.java @@ -1,6 +1,5 @@ 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; @@ -22,7 +21,6 @@ import org.springframework.web.bind.annotation.RestController; import java.time.LocalDateTime; import java.util.List; -import java.util.Map; @RestController @RequestMapping("/charge") diff --git a/src/main/java/com/syjiaer/clinic/server/controller/common/CommonConfigController.java b/src/main/java/com/syjiaer/clinic/server/controller/common/CommonConfigController.java index d294f7f..efa7ddf 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/common/CommonConfigController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/common/CommonConfigController.java @@ -1,10 +1,7 @@ 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; @@ -12,9 +9,7 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/controller/common/FileController.java b/src/main/java/com/syjiaer/clinic/server/controller/common/FileController.java index 988e9a8..323f00c 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/common/FileController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/common/FileController.java @@ -2,7 +2,6 @@ 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; @@ -16,19 +15,18 @@ import org.springframework.core.io.UrlResource; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.*; +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.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 diff --git a/src/main/java/com/syjiaer/clinic/server/controller/common/ManagerUserController.java b/src/main/java/com/syjiaer/clinic/server/controller/common/ManagerUserController.java index 62182e0..e77ff18 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/common/ManagerUserController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/common/ManagerUserController.java @@ -1,21 +1,15 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/controller/common/SignController.java b/src/main/java/com/syjiaer/clinic/server/controller/common/SignController.java index fb24fc9..d30963d 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/common/SignController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/common/SignController.java @@ -4,7 +4,6 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java b/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java index 7bf7a64..5a32610 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java @@ -1,7 +1,6 @@ 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; @@ -9,7 +8,6 @@ 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; @@ -18,7 +16,6 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryApplyController.java b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryApplyController.java index 44eb92a..1020472 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryApplyController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryApplyController.java @@ -1,8 +1,6 @@ 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; @@ -11,7 +9,6 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryCheckController.java b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryCheckController.java index 75ee646..8f78869 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryCheckController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryCheckController.java @@ -8,7 +8,6 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryController.java b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryController.java index 54c6d61..3fad992 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryController.java @@ -12,7 +12,6 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryPurchaseController.java b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryPurchaseController.java index 4b3159b..32f0c11 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryPurchaseController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryPurchaseController.java @@ -1,7 +1,6 @@ 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; @@ -12,20 +11,10 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventorySupplierController.java b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventorySupplierController.java index 72cb0b6..4b23403 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventorySupplierController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventorySupplierController.java @@ -1,8 +1,6 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java b/src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java index 124cd11..79961dd 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java @@ -12,7 +12,6 @@ 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 diff --git a/src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationMemberController.java b/src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationMemberController.java index 9b000e1..3a8ba0c 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationMemberController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationMemberController.java @@ -5,12 +5,9 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/controller/patient/PatientController.java b/src/main/java/com/syjiaer/clinic/server/controller/patient/PatientController.java index 99efe83..da38575 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/patient/PatientController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/patient/PatientController.java @@ -5,10 +5,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.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; diff --git a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDiagnoseController.java b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDiagnoseController.java index 7ec8961..005f5fd 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDiagnoseController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDiagnoseController.java @@ -3,7 +3,6 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java index ac1aa14..377c241 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java +++ b/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.*; +import com.syjiaer.clinic.server.entity.social.SocialItem; 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,7 +14,6 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialPersonController.java b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialPersonController.java index c97d89b..e38ea92 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialPersonController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialPersonController.java @@ -1,13 +1,11 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialReconciliationController.java b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialReconciliationController.java index 1659fce..ad26144 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialReconciliationController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialReconciliationController.java @@ -1,36 +1,25 @@ 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 diff --git a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialUploadController.java b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialUploadController.java index 9509496..4787e71 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialUploadController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialUploadController.java @@ -1,14 +1,9 @@ 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; @@ -23,11 +18,6 @@ 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") diff --git a/src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java b/src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java index c86bcaf..e0497e2 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java @@ -1,6 +1,5 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/controller/vip/VipController.java b/src/main/java/com/syjiaer/clinic/server/controller/vip/VipController.java index c409eaa..0f62324 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/vip/VipController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/vip/VipController.java @@ -1,19 +1,5 @@ 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; - ///** // *

// * 商品 前端控制器 diff --git a/src/main/java/com/syjiaer/clinic/server/controller/vip/VipIntegralController.java b/src/main/java/com/syjiaer/clinic/server/controller/vip/VipIntegralController.java index a19a867..30a7118 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/vip/VipIntegralController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/vip/VipIntegralController.java @@ -1,22 +1,17 @@ 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 { diff --git a/src/main/java/com/syjiaer/clinic/server/controller/vip/VipLevelConfigController.java b/src/main/java/com/syjiaer/clinic/server/controller/vip/VipLevelConfigController.java index b7be1b5..133c74f 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/vip/VipLevelConfigController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/vip/VipLevelConfigController.java @@ -1,18 +1,14 @@ 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; /** diff --git a/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeGoodsList.java b/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeGoodsList.java index 1aedc77..c64e1f3 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeGoodsList.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeGoodsList.java @@ -5,14 +5,15 @@ 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.LocalDate; -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.LocalDate; +import java.time.LocalDateTime; /** *

* 收费商品详情 diff --git a/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeInventoryLog.java b/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeInventoryLog.java index 227d106..c152245 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeInventoryLog.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeInventoryLog.java @@ -5,12 +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.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; /** *

* 收费商品库存变化日志 diff --git a/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeItemList.java b/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeItemList.java index ed0ca6e..3b8d750 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeItemList.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeItemList.java @@ -5,14 +5,15 @@ 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.LocalDate; -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.LocalDate; +import java.time.LocalDateTime; /** *

* 收费服务详情 diff --git a/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeLog.java b/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeLog.java index 166d90f..6eeb316 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeLog.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeLog.java @@ -6,13 +6,14 @@ 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; /** *

* diff --git a/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeOrder.java b/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeOrder.java index 76643c3..ccebf8f 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeOrder.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeOrder.java @@ -5,14 +5,15 @@ 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.LocalDate; -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.LocalDate; +import java.time.LocalDateTime; /** *

* 收费主表 diff --git a/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeSocialPayLog.java b/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeSocialPayLog.java index 7e1bd77..a9f335b 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeSocialPayLog.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeSocialPayLog.java @@ -5,13 +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 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; /** *

* 医保收费记录 diff --git a/src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeQuery.java b/src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeQuery.java index c20a8ca..569b52a 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeQuery.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeQuery.java @@ -1,7 +1,6 @@ package com.syjiaer.clinic.server.entity.charge.dto; import lombok.Data; -import lombok.Getter; @Data public class ChargeQuery { private String patientName; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeSaveDto.java b/src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeSaveDto.java index ee090aa..4ce85b8 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeSaveDto.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeSaveDto.java @@ -4,7 +4,6 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargeGoodsListVo.java b/src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargeGoodsListVo.java index d775c25..7c8bc1e 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargeGoodsListVo.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargeGoodsListVo.java @@ -1,7 +1,5 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargeItemListVo.java b/src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargeItemListVo.java index bae849e..baa91ec 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargeItemListVo.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargeItemListVo.java @@ -1,7 +1,5 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargeOrderPrintVo.java b/src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargeOrderPrintVo.java index f973dcd..5b60a33 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargeOrderPrintVo.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargeOrderPrintVo.java @@ -2,13 +2,8 @@ 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 diff --git a/src/main/java/com/syjiaer/clinic/server/entity/charge/vo/PatientPrintInfoVo.java b/src/main/java/com/syjiaer/clinic/server/entity/charge/vo/PatientPrintInfoVo.java index 9f8659b..60951ab 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/charge/vo/PatientPrintInfoVo.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/charge/vo/PatientPrintInfoVo.java @@ -1,8 +1,5 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/common/CommonLog.java b/src/main/java/com/syjiaer/clinic/server/entity/common/CommonLog.java index 30ff4cf..4f3319d 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/common/CommonLog.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/common/CommonLog.java @@ -6,12 +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.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; /** *

* 操作日志 diff --git a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/Diagnosis.java b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/Diagnosis.java index 81be0ea..66f6867 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/Diagnosis.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/Diagnosis.java @@ -4,12 +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.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; /** *

* diff --git a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/DiagnosisMedicalGoodsList.java b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/DiagnosisMedicalGoodsList.java index dd201a7..4d79ff5 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/DiagnosisMedicalGoodsList.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/DiagnosisMedicalGoodsList.java @@ -5,12 +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 lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; /** *

* 病例商品详情 diff --git a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/DiagnosisMedicalItemList.java b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/DiagnosisMedicalItemList.java index ab037c7..33ca2b8 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/DiagnosisMedicalItemList.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/DiagnosisMedicalItemList.java @@ -5,12 +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 lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; /** *

* 病例服务详情 diff --git a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/DiagnosisMedicalRecord.java b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/DiagnosisMedicalRecord.java index ed607a6..2a7d6bb 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/DiagnosisMedicalRecord.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/DiagnosisMedicalRecord.java @@ -5,11 +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 lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; + +import java.io.Serializable; /** *

* 病例 diff --git a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/vo/ChargeQueueVo.java b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/vo/ChargeQueueVo.java index 9e12c72..329768a 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/vo/ChargeQueueVo.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/vo/ChargeQueueVo.java @@ -1,8 +1,6 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/vo/MedicalHistoryVo.java b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/vo/MedicalHistoryVo.java index 37d34b6..b8974d8 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/vo/MedicalHistoryVo.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/vo/MedicalHistoryVo.java @@ -5,9 +5,7 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/vo/MedicalRecordVo.java b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/vo/MedicalRecordVo.java index 58c254a..83ecc48 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/vo/MedicalRecordVo.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/vo/MedicalRecordVo.java @@ -5,8 +5,6 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/goods/Goods.java b/src/main/java/com/syjiaer/clinic/server/entity/goods/Goods.java index cffbbee..cd3b5e3 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/goods/Goods.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/goods/Goods.java @@ -4,12 +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 lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; /** *

* 商品主表 diff --git a/src/main/java/com/syjiaer/clinic/server/entity/inventory/Inventory.java b/src/main/java/com/syjiaer/clinic/server/entity/inventory/Inventory.java index 1a48bd4..4f1ee01 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/inventory/Inventory.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/inventory/Inventory.java @@ -4,14 +4,15 @@ 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 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.LocalDate; +import java.time.LocalDateTime; /** *

* 库存主表 diff --git a/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryApply.java b/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryApply.java index a24b20f..1e8497b 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryApply.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryApply.java @@ -5,13 +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 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; /** *

* 库存领用表 diff --git a/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryCheck.java b/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryCheck.java index 9cfd0a3..71c8c10 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryCheck.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/inventory/InventoryCheck.java @@ -5,13 +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 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; /** *

* 盘点主表 diff --git a/src/main/java/com/syjiaer/clinic/server/entity/item/Item.java b/src/main/java/com/syjiaer/clinic/server/entity/item/Item.java index 76fad08..4c0b5d3 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/item/Item.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/item/Item.java @@ -4,13 +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 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; /** *

* 诊疗项目 diff --git a/src/main/java/com/syjiaer/clinic/server/entity/item/vo/ItemSearchVo.java b/src/main/java/com/syjiaer/clinic/server/entity/item/vo/ItemSearchVo.java index 41f9a4b..3625653 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/item/vo/ItemSearchVo.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/item/vo/ItemSearchVo.java @@ -1,7 +1,5 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/manager/ManagerUser.java b/src/main/java/com/syjiaer/clinic/server/entity/manager/ManagerUser.java index 978e3da..e4d8f1e 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/manager/ManagerUser.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/manager/ManagerUser.java @@ -5,11 +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 lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; + +import java.io.Serializable; /** *

* 用户表 diff --git a/src/main/java/com/syjiaer/clinic/server/entity/manager/ManagerUserSign.java b/src/main/java/com/syjiaer/clinic/server/entity/manager/ManagerUserSign.java index 72daebf..c6e9541 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/manager/ManagerUserSign.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/manager/ManagerUserSign.java @@ -5,12 +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.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; /** *

* diff --git a/src/main/java/com/syjiaer/clinic/server/entity/organization/OrganizationMember.java b/src/main/java/com/syjiaer/clinic/server/entity/organization/OrganizationMember.java index de2d0e9..161c940 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/organization/OrganizationMember.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/organization/OrganizationMember.java @@ -5,12 +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.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; /** *

* 成员表 diff --git a/src/main/java/com/syjiaer/clinic/server/entity/organization/OrganizationMemberSection.java b/src/main/java/com/syjiaer/clinic/server/entity/organization/OrganizationMemberSection.java index a291f68..82e8823 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/organization/OrganizationMemberSection.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/organization/OrganizationMemberSection.java @@ -3,11 +3,12 @@ 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; /** *

* diff --git a/src/main/java/com/syjiaer/clinic/server/entity/organization/OrganizationSection.java b/src/main/java/com/syjiaer/clinic/server/entity/organization/OrganizationSection.java index 6d99353..da9bed9 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/organization/OrganizationSection.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/organization/OrganizationSection.java @@ -5,13 +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 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; /** *

* 科室 diff --git a/src/main/java/com/syjiaer/clinic/server/entity/organization/vo/MemberVo.java b/src/main/java/com/syjiaer/clinic/server/entity/organization/vo/MemberVo.java index a4ee1df..7543f9c 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/organization/vo/MemberVo.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/organization/vo/MemberVo.java @@ -1,7 +1,5 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/patient/PatientInfo.java b/src/main/java/com/syjiaer/clinic/server/entity/patient/PatientInfo.java index 6e5beb9..b654fe2 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/patient/PatientInfo.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/patient/PatientInfo.java @@ -5,14 +5,15 @@ 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.LocalDate; -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.LocalDate; +import java.time.LocalDateTime; /** *

* 患者信息 diff --git a/src/main/java/com/syjiaer/clinic/server/entity/patient/PatientRegistration.java b/src/main/java/com/syjiaer/clinic/server/entity/patient/PatientRegistration.java index a2efd65..2e0ad30 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/patient/PatientRegistration.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/patient/PatientRegistration.java @@ -5,13 +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 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; /** *

* 挂号表 diff --git a/src/main/java/com/syjiaer/clinic/server/entity/patient/vo/PatientRegistrationVo.java b/src/main/java/com/syjiaer/clinic/server/entity/patient/vo/PatientRegistrationVo.java index 632a0f7..e2d1c0f 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/patient/vo/PatientRegistrationVo.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/patient/vo/PatientRegistrationVo.java @@ -1,7 +1,5 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialChineseMedicinalGranula.java b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialChineseMedicinalGranula.java index f4d2324..8a5da6f 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialChineseMedicinalGranula.java +++ b/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; /** *

* 中药配方颗粒目录1320 diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDiagnose.java b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDiagnose.java index b090d40..af531ed 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDiagnose.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDiagnose.java @@ -5,12 +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.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; /** *

* 疾病与诊断目录1307 diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectoryMongodb.java b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectoryMongodb.java index 204e627..a403b06 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectoryMongodb.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectoryMongodb.java @@ -8,9 +8,6 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; -import java.io.Serializable; -import java.time.LocalDateTime; - /** *

* 医保目录 diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectoryUpinfo.java b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectoryUpinfo.java index 5f123ee..82d50e7 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialDirectoryUpinfo.java +++ b/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; /** *

* 医保有效期 1312 diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialIcpcDiagnosis.java b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialIcpcDiagnosis.java index 49bf42b..de048d7 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialIcpcDiagnosis.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialIcpcDiagnosis.java @@ -5,12 +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.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; /** *

* diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialIcpcItem.java b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialIcpcItem.java index 34ce4fb..b04703f 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialIcpcItem.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialIcpcItem.java @@ -5,12 +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.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; /** *

* diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialItem.java b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialItem.java index 1c4d491..f53d285 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialItem.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialItem.java @@ -5,12 +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.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; /** *

* 医保服务项目目录1305,1320 diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialReconciliationLog.java b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialReconciliationLog.java index e41f6f1..4f87aa9 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialReconciliationLog.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialReconciliationLog.java @@ -5,13 +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 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; /** *

* diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialTcmDiseaseCatalogue.java b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialTcmDiseaseCatalogue.java index 0490747..6494af9 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialTcmDiseaseCatalogue.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialTcmDiseaseCatalogue.java @@ -5,12 +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.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; /** *

* diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialTcmSyndrome.java b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialTcmSyndrome.java index 7395efb..f256389 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/social/SocialTcmSyndrome.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/social/SocialTcmSyndrome.java @@ -5,12 +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.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; /** *

* diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/dto/ReconciliationItemDto.java b/src/main/java/com/syjiaer/clinic/server/entity/social/dto/ReconciliationItemDto.java index dd87bb1..76d82d2 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/social/dto/ReconciliationItemDto.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/social/dto/ReconciliationItemDto.java @@ -4,7 +4,6 @@ import lombok.Getter; import lombok.Setter; import java.math.BigDecimal; -import java.time.LocalDate; import java.time.LocalDateTime; @Getter diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialDirectoryView.java b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialDirectoryView.java index 3c36d4d..ae86206 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialDirectoryView.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialDirectoryView.java @@ -2,7 +2,6 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryInitVo.java b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryInitVo.java index 245040d..7beca81 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryInitVo.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryInitVo.java @@ -11,7 +11,6 @@ import lombok.experimental.Accessors; import java.io.Serializable; import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.Date; /** *

diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryLogVo.java b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryLogVo.java index ce51890..93ff127 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryLogVo.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryLogVo.java @@ -2,7 +2,6 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialItemVo.java b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialItemVo.java index 4ff9059..43d5785 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialItemVo.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialItemVo.java @@ -1,10 +1,5 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialPersonInfoVo.java b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialPersonInfoVo.java index 1ebc9b6..b29b515 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialPersonInfoVo.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialPersonInfoVo.java @@ -1,7 +1,5 @@ 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; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/statistics/SalesVolumeOverviewVo.java b/src/main/java/com/syjiaer/clinic/server/entity/statistics/SalesVolumeOverviewVo.java index 61a3d8b..5fb655a 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/statistics/SalesVolumeOverviewVo.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/statistics/SalesVolumeOverviewVo.java @@ -2,7 +2,6 @@ package com.syjiaer.clinic.server.entity.statistics; import lombok.Data; -import java.math.BigDecimal; import java.util.List; @Data public class SalesVolumeOverviewVo { diff --git a/src/main/java/com/syjiaer/clinic/server/entity/vip/Vip.java b/src/main/java/com/syjiaer/clinic/server/entity/vip/Vip.java index 55db9aa..7218ae1 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/vip/Vip.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/vip/Vip.java @@ -4,13 +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 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; /** *

* diff --git a/src/main/java/com/syjiaer/clinic/server/entity/vip/VipExpLog.java b/src/main/java/com/syjiaer/clinic/server/entity/vip/VipExpLog.java index 8afe0b0..1738b12 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/vip/VipExpLog.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/vip/VipExpLog.java @@ -5,12 +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.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; /** *

* diff --git a/src/main/java/com/syjiaer/clinic/server/entity/vip/VipIntegralLog.java b/src/main/java/com/syjiaer/clinic/server/entity/vip/VipIntegralLog.java index 2d2a58f..c21d9cf 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/vip/VipIntegralLog.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/vip/VipIntegralLog.java @@ -5,12 +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.LocalDateTime; import lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; /** *

* diff --git a/src/main/java/com/syjiaer/clinic/server/entity/vip/VipLevelConfig.java b/src/main/java/com/syjiaer/clinic/server/entity/vip/VipLevelConfig.java index 5bc80b8..a6e3be8 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/vip/VipLevelConfig.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/vip/VipLevelConfig.java @@ -5,11 +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 lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; + +import java.io.Serializable; /** *

* diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeGoodsListMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeGoodsListMapper.java index a6dd1e8..1fb16bb 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeGoodsListMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeGoodsListMapper.java @@ -1,7 +1,7 @@ package com.syjiaer.clinic.server.mapper.charge; -import com.syjiaer.clinic.server.entity.charge.ChargeGoodsList; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.syjiaer.clinic.server.entity.charge.ChargeGoodsList; import com.syjiaer.clinic.server.entity.charge.vo.ChargeGoodsListVo; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeInventoryLogMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeInventoryLogMapper.java index 54f4f35..c5edd2c 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeInventoryLogMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeInventoryLogMapper.java @@ -1,7 +1,7 @@ package com.syjiaer.clinic.server.mapper.charge; -import com.syjiaer.clinic.server.entity.charge.ChargeInventoryLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.syjiaer.clinic.server.entity.charge.ChargeInventoryLog; /** diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeItemListMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeItemListMapper.java index 9039662..56cf8fa 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeItemListMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeItemListMapper.java @@ -1,7 +1,7 @@ package com.syjiaer.clinic.server.mapper.charge; -import com.syjiaer.clinic.server.entity.charge.ChargeItemList; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.syjiaer.clinic.server.entity.charge.ChargeItemList; import org.apache.ibatis.annotations.Select; import java.util.List; diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeLogMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeLogMapper.java index ea53350..e59f3f9 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeLogMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeLogMapper.java @@ -1,7 +1,7 @@ package com.syjiaer.clinic.server.mapper.charge; -import com.syjiaer.clinic.server.entity.charge.ChargeLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.syjiaer.clinic.server.entity.charge.ChargeLog; /** diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeOrderMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeOrderMapper.java index 8797e28..eb5b443 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeOrderMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeOrderMapper.java @@ -1,7 +1,7 @@ package com.syjiaer.clinic.server.mapper.charge; -import com.syjiaer.clinic.server.entity.charge.ChargeOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.syjiaer.clinic.server.entity.charge.ChargeOrder; import org.apache.ibatis.annotations.Select; import java.util.List; diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeSocialPayLogMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeSocialPayLogMapper.java index 59b4e2a..c84695f 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeSocialPayLogMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeSocialPayLogMapper.java @@ -1,7 +1,7 @@ package com.syjiaer.clinic.server.mapper.charge; -import com.syjiaer.clinic.server.entity.charge.ChargeSocialPayLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.syjiaer.clinic.server.entity.charge.ChargeSocialPayLog; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMapper.java index 463dfd9..a5777c7 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMapper.java @@ -1,7 +1,7 @@ package com.syjiaer.clinic.server.mapper.diagnosis; -import com.syjiaer.clinic.server.entity.diagnosis.Diagnosis; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.syjiaer.clinic.server.entity.diagnosis.Diagnosis; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMedicalGoodsListMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMedicalGoodsListMapper.java index bbd4bd8..bf7c763 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMedicalGoodsListMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMedicalGoodsListMapper.java @@ -1,8 +1,8 @@ package com.syjiaer.clinic.server.mapper.diagnosis; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.syjiaer.clinic.server.entity.charge.vo.ChargeGoodsListVo; import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalGoodsList; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMedicalItemListMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMedicalItemListMapper.java index 8072d6a..09eb196 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMedicalItemListMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMedicalItemListMapper.java @@ -1,10 +1,8 @@ package com.syjiaer.clinic.server.mapper.diagnosis; -import com.syjiaer.clinic.server.entity.charge.vo.ChargeGoodsListVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.syjiaer.clinic.server.entity.charge.vo.ChargeItemListVo; import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalItemList; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryMapper.java index add6a83..15526d1 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryMapper.java @@ -1,6 +1,5 @@ package com.syjiaer.clinic.server.mapper.inventory; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.syjiaer.clinic.server.entity.inventory.Inventory; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/item/ItemMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/item/ItemMapper.java index 5c01f9a..7701f80 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/item/ItemMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/item/ItemMapper.java @@ -1,12 +1,7 @@ package com.syjiaer.clinic.server.mapper.item; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.syjiaer.clinic.server.entity.item.Item; -import com.syjiaer.clinic.server.entity.social.SocialDiagnose; -import org.apache.ibatis.annotations.Update; - -import java.util.List; /** diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/manager/ManagerUserSignMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/manager/ManagerUserSignMapper.java index 49d18dc..2db3ec0 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/manager/ManagerUserSignMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/manager/ManagerUserSignMapper.java @@ -1,7 +1,7 @@ package com.syjiaer.clinic.server.mapper.manager; -import com.syjiaer.clinic.server.entity.manager.ManagerUserSign; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.syjiaer.clinic.server.entity.manager.ManagerUserSign; /** diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/organization/OrganizationMemberMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/organization/OrganizationMemberMapper.java index 8d531f1..a6833c2 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/organization/OrganizationMemberMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/organization/OrganizationMemberMapper.java @@ -2,13 +2,6 @@ package com.syjiaer.clinic.server.mapper.organization; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.syjiaer.clinic.server.entity.organization.OrganizationMember; -import com.syjiaer.clinic.server.entity.organization.dto.DockerSearchQuery; -import com.syjiaer.clinic.server.entity.organization.vo.MemberVo; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -import java.io.Serializable; -import java.util.List; /** diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/organization/OrganizationMemberSectionMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/organization/OrganizationMemberSectionMapper.java index 5eb2a5b..630cf26 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/organization/OrganizationMemberSectionMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/organization/OrganizationMemberSectionMapper.java @@ -1,7 +1,7 @@ package com.syjiaer.clinic.server.mapper.organization; -import com.syjiaer.clinic.server.entity.organization.OrganizationMemberSection; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.syjiaer.clinic.server.entity.organization.OrganizationMemberSection; /** diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/patient/PatientRegistrationMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/patient/PatientRegistrationMapper.java index 656fed9..e57bf58 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/patient/PatientRegistrationMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/patient/PatientRegistrationMapper.java @@ -2,7 +2,6 @@ package com.syjiaer.clinic.server.mapper.patient; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.syjiaer.clinic.server.entity.patient.PatientRegistration; -import org.apache.ibatis.annotations.Select; /** diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialChineseMedicinalGranulaMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialChineseMedicinalGranulaMapper.java index cfd7156..04d7287 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialChineseMedicinalGranulaMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialChineseMedicinalGranulaMapper.java @@ -1,7 +1,7 @@ package com.syjiaer.clinic.server.mapper.social; -import com.syjiaer.clinic.server.entity.social.SocialChineseMedicinalGranula; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.syjiaer.clinic.server.entity.social.SocialChineseMedicinalGranula; /** diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectoryLimitMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectoryLimitMapper.java index f84d69c..23eec28 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectoryLimitMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialDirectoryLimitMapper.java @@ -5,8 +5,6 @@ import com.syjiaer.clinic.server.entity.social.SocialDirectoryLimit; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import java.util.Map; - /** *

diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialIcpcDiagnosisMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialIcpcDiagnosisMapper.java index 6c7efcb..38f343f 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialIcpcDiagnosisMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialIcpcDiagnosisMapper.java @@ -1,7 +1,7 @@ package com.syjiaer.clinic.server.mapper.social; -import com.syjiaer.clinic.server.entity.social.SocialIcpcDiagnosis; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.syjiaer.clinic.server.entity.social.SocialIcpcDiagnosis; /** diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialIcpcItemMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialIcpcItemMapper.java index 758f79b..a2e2517 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialIcpcItemMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialIcpcItemMapper.java @@ -1,7 +1,7 @@ package com.syjiaer.clinic.server.mapper.social; -import com.syjiaer.clinic.server.entity.social.SocialIcpcItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.syjiaer.clinic.server.entity.social.SocialIcpcItem; /** diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialItemMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialItemMapper.java index 596b43d..1e955a9 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialItemMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialItemMapper.java @@ -1,7 +1,6 @@ package com.syjiaer.clinic.server.mapper.social; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.syjiaer.clinic.server.entity.social.SocialDirectory; import com.syjiaer.clinic.server.entity.social.SocialItem; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialReconciliationLogMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialReconciliationLogMapper.java index 378450d..b0a595d 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialReconciliationLogMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialReconciliationLogMapper.java @@ -1,7 +1,7 @@ package com.syjiaer.clinic.server.mapper.social; -import com.syjiaer.clinic.server.entity.social.SocialReconciliationLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.syjiaer.clinic.server.entity.social.SocialReconciliationLog; /** diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialTcmDiseaseCatalogueMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialTcmDiseaseCatalogueMapper.java index 5dc5851..5658e79 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialTcmDiseaseCatalogueMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialTcmDiseaseCatalogueMapper.java @@ -1,7 +1,7 @@ package com.syjiaer.clinic.server.mapper.social; -import com.syjiaer.clinic.server.entity.social.SocialTcmDiseaseCatalogue; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.syjiaer.clinic.server.entity.social.SocialTcmDiseaseCatalogue; /** diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialTcmSyndromeMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialTcmSyndromeMapper.java index 5a479b1..f6969f0 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialTcmSyndromeMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/social/SocialTcmSyndromeMapper.java @@ -1,7 +1,7 @@ package com.syjiaer.clinic.server.mapper.social; -import com.syjiaer.clinic.server.entity.social.SocialTcmSyndrome; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.syjiaer.clinic.server.entity.social.SocialTcmSyndrome; /** diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/vip/VipExpLogMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/vip/VipExpLogMapper.java index fc330bc..6ce5b00 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/vip/VipExpLogMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/vip/VipExpLogMapper.java @@ -1,7 +1,7 @@ package com.syjiaer.clinic.server.mapper.vip; -import com.syjiaer.clinic.server.entity.vip.VipExpLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.syjiaer.clinic.server.entity.vip.VipExpLog; /** diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/vip/VipIntegralLogMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/vip/VipIntegralLogMapper.java index c7747c3..7b06d9c 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/vip/VipIntegralLogMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/vip/VipIntegralLogMapper.java @@ -1,7 +1,7 @@ package com.syjiaer.clinic.server.mapper.vip; -import com.syjiaer.clinic.server.entity.vip.VipIntegralLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.syjiaer.clinic.server.entity.vip.VipIntegralLog; /** diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/vip/VipLevelConfigMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/vip/VipLevelConfigMapper.java index c325acf..e30c5e5 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/vip/VipLevelConfigMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/vip/VipLevelConfigMapper.java @@ -1,7 +1,7 @@ package com.syjiaer.clinic.server.mapper.vip; -import com.syjiaer.clinic.server.entity.vip.VipLevelConfig; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.syjiaer.clinic.server.entity.vip.VipLevelConfig; /** diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/vip/VipMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/vip/VipMapper.java index 533f1b4..5fa94f4 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/vip/VipMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/vip/VipMapper.java @@ -1,7 +1,7 @@ package com.syjiaer.clinic.server.mapper.vip; -import com.syjiaer.clinic.server.entity.vip.Vip; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.syjiaer.clinic.server.entity.vip.Vip; /** diff --git a/src/main/java/com/syjiaer/clinic/server/service/BaseService.java b/src/main/java/com/syjiaer/clinic/server/service/BaseService.java index ac2536c..a87ecb6 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/BaseService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/BaseService.java @@ -8,15 +8,10 @@ import com.syjiaer.clinic.server.common.util.InfoUtil; import com.syjiaer.clinic.server.common.util.ManagerUtil; import com.syjiaer.clinic.server.common.util.ParmsUtil; import com.syjiaer.clinic.server.common.vo.Page; -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.mapper.manager.ManagerUserMapper; -import com.syjiaer.clinic.server.mapper.organization.OrganizationMemberMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import java.time.LocalDateTime; import java.util.List; import java.util.Map; import java.util.Objects; diff --git a/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java b/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java index 1a52849..2c687eb 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java @@ -2,7 +2,6 @@ package com.syjiaer.clinic.server.service.charge; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.syjiaer.clinic.server.common.api.annotations.IMField; import com.syjiaer.clinic.server.common.api.input.*; import com.syjiaer.clinic.server.common.api.output.OM2206A; import com.syjiaer.clinic.server.common.api.output.OM2207A; @@ -13,7 +12,6 @@ import com.syjiaer.clinic.server.common.constants.Constants; import com.syjiaer.clinic.server.common.enums.*; import com.syjiaer.clinic.server.common.exception.MessageException; import com.syjiaer.clinic.server.common.util.InfoUtil; -import com.syjiaer.clinic.server.common.util.ManagerUtil; import com.syjiaer.clinic.server.common.util.StringUtil; import com.syjiaer.clinic.server.common.vo.Page; import com.syjiaer.clinic.server.entity.charge.*; @@ -40,9 +38,9 @@ import com.syjiaer.clinic.server.mapper.charge.*; import com.syjiaer.clinic.server.mapper.diagnosis.DiagnosisMapper; import com.syjiaer.clinic.server.mapper.diagnosis.DiagnosisMedicalGoodsListMapper; import com.syjiaer.clinic.server.mapper.diagnosis.DiagnosisMedicalItemListMapper; +import com.syjiaer.clinic.server.mapper.diagnosis.DiagnosisMedicalRecordMapper; import com.syjiaer.clinic.server.mapper.goods.GoodsMapper; import com.syjiaer.clinic.server.mapper.inventory.InventoryLogMapper; -import com.syjiaer.clinic.server.mapper.diagnosis.DiagnosisMedicalRecordMapper; import com.syjiaer.clinic.server.mapper.inventory.InventoryMapper; import com.syjiaer.clinic.server.mapper.item.ItemMapper; import com.syjiaer.clinic.server.mapper.organization.OrganizationMemberMapper; @@ -56,7 +54,6 @@ import com.syjiaer.clinic.server.service.BaseService; import com.syjiaer.clinic.server.service.charge.vo.PaymentMethodVo; import com.syjiaer.clinic.server.service.charge.vo.RetailOrderDailyChargingReportVo; import com.syjiaer.clinic.server.service.inventory.InventoryService; -import com.syjiaer.clinic.server.service.patient.PatientRegistrationService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; diff --git a/src/main/java/com/syjiaer/clinic/server/service/common/CommonConfigService.java b/src/main/java/com/syjiaer/clinic/server/service/common/CommonConfigService.java index 284f1c0..9e54efe 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/common/CommonConfigService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/common/CommonConfigService.java @@ -6,7 +6,6 @@ import com.syjiaer.clinic.server.mapper.common.CommonConfigMapper; import com.syjiaer.clinic.server.service.BaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; import java.util.List; diff --git a/src/main/java/com/syjiaer/clinic/server/service/common/ManagerUserService.java b/src/main/java/com/syjiaer/clinic/server/service/common/ManagerUserService.java index 9cf25a5..e51ab77 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/common/ManagerUserService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/common/ManagerUserService.java @@ -1,30 +1,19 @@ package com.syjiaer.clinic.server.service.common; -import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.syjiaer.clinic.server.common.api.input.IM9001; -import com.syjiaer.clinic.server.common.api.input.IM9002; -import com.syjiaer.clinic.server.common.api.request.SocialRequest; import com.syjiaer.clinic.server.common.exception.MessageException; import com.syjiaer.clinic.server.common.util.DebugUtil; -import com.syjiaer.clinic.server.controller.BaseController; import com.syjiaer.clinic.server.entity.manager.ManagerUser; -import com.syjiaer.clinic.server.entity.manager.ManagerUserSign; import com.syjiaer.clinic.server.mapper.manager.ManagerUserMapper; -import com.syjiaer.clinic.server.mapper.manager.ManagerUserSignMapper; import com.syjiaer.clinic.server.service.BaseService; 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.stereotype.Service; import javax.crypto.SecretKey; -import java.time.LocalDateTime; import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Map; @Service public class ManagerUserService extends BaseService { diff --git a/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java b/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java index fa8e447..74741d8 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java @@ -15,19 +15,19 @@ import com.syjiaer.clinic.server.common.vo.Page; 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.Diagnosis; -import com.syjiaer.clinic.server.entity.diagnosis.dto.ChargeQueueQuery; -import com.syjiaer.clinic.server.entity.diagnosis.dto.ItemRetailDto; -import com.syjiaer.clinic.server.entity.diagnosis.vo.ChargeQueueVo; -import com.syjiaer.clinic.server.entity.diagnosis.vo.MedicalHistoryVo; -import com.syjiaer.clinic.server.entity.goods.Goods; -import com.syjiaer.clinic.server.entity.item.Item; -import com.syjiaer.clinic.server.entity.manager.ManagerUser; 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.diagnosis.dto.ChargeQueueQuery; import com.syjiaer.clinic.server.entity.diagnosis.dto.GoodsRetailDto; +import com.syjiaer.clinic.server.entity.diagnosis.dto.ItemRetailDto; import com.syjiaer.clinic.server.entity.diagnosis.dto.MedicalRecordSaveDto; +import com.syjiaer.clinic.server.entity.diagnosis.vo.ChargeQueueVo; +import com.syjiaer.clinic.server.entity.diagnosis.vo.MedicalHistoryVo; import com.syjiaer.clinic.server.entity.diagnosis.vo.MedicalRecordVo; +import com.syjiaer.clinic.server.entity.goods.Goods; +import com.syjiaer.clinic.server.entity.item.Item; +import com.syjiaer.clinic.server.entity.manager.ManagerUser; import com.syjiaer.clinic.server.entity.organization.OrganizationMember; import com.syjiaer.clinic.server.entity.organization.OrganizationMemberSection; import com.syjiaer.clinic.server.entity.organization.OrganizationSection; @@ -37,11 +37,11 @@ import com.syjiaer.clinic.server.entity.patient.vo.PatientAndRegistrationInfoVo; import com.syjiaer.clinic.server.entity.patient.vo.SeeDoctorInfoVo; import com.syjiaer.clinic.server.entity.social.SocialDiagnose; import com.syjiaer.clinic.server.mapper.diagnosis.DiagnosisMapper; -import com.syjiaer.clinic.server.mapper.goods.GoodsMapper; -import com.syjiaer.clinic.server.mapper.item.ItemMapper; import com.syjiaer.clinic.server.mapper.diagnosis.DiagnosisMedicalGoodsListMapper; import com.syjiaer.clinic.server.mapper.diagnosis.DiagnosisMedicalItemListMapper; import com.syjiaer.clinic.server.mapper.diagnosis.DiagnosisMedicalRecordMapper; +import com.syjiaer.clinic.server.mapper.goods.GoodsMapper; +import com.syjiaer.clinic.server.mapper.item.ItemMapper; import com.syjiaer.clinic.server.mapper.organization.OrganizationMemberMapper; import com.syjiaer.clinic.server.mapper.organization.OrganizationMemberSectionMapper; import com.syjiaer.clinic.server.mapper.organization.OrganizationSectionMapper; diff --git a/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java b/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java index 23f8c07..221a36a 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java @@ -20,7 +20,6 @@ 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; import com.syjiaer.clinic.server.entity.inventory.Inventory; -import com.syjiaer.clinic.server.entity.item.Item; import com.syjiaer.clinic.server.entity.social.SocialDirectoryUpinfo; import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView; import com.syjiaer.clinic.server.mapper.goods.GoodsMapper; diff --git a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java index 77f3597..af22cdc 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java @@ -27,7 +27,6 @@ import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java b/src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java index 4917c59..c7f32ff 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java @@ -6,12 +6,9 @@ import com.syjiaer.clinic.server.common.enums.ChrgitmLvEnum; import com.syjiaer.clinic.server.common.exception.MessageException; import com.syjiaer.clinic.server.common.util.PinYinUtil; import com.syjiaer.clinic.server.common.vo.Page; -import com.syjiaer.clinic.server.entity.goods.Goods; -import com.syjiaer.clinic.server.entity.goods.vo.GoodsSearchVo; import com.syjiaer.clinic.server.entity.item.Item; import com.syjiaer.clinic.server.entity.item.vo.ItemSearchVo; import com.syjiaer.clinic.server.entity.manager.ManagerUser; -import com.syjiaer.clinic.server.entity.social.SocialDiagnose; import com.syjiaer.clinic.server.entity.social.SocialDirectoryUpinfo; import com.syjiaer.clinic.server.mapper.item.ItemMapper; import com.syjiaer.clinic.server.mapper.social.SocialDirectoryUpinfoMapper; diff --git a/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java b/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java index c5c6941..9e23fa8 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java @@ -2,18 +2,15 @@ package com.syjiaer.clinic.server.service.organization; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.syjiaer.clinic.server.common.api.annotations.IMField; import com.syjiaer.clinic.server.common.exception.MessageException; import com.syjiaer.clinic.server.common.util.FileUtil; import com.syjiaer.clinic.server.common.vo.Page; -import com.syjiaer.clinic.server.entity.charge.dto.ChargeQuery; import com.syjiaer.clinic.server.entity.manager.ManagerUser; import com.syjiaer.clinic.server.entity.organization.OrganizationMember; import com.syjiaer.clinic.server.entity.organization.OrganizationMemberSection; 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.mapper.manager.ManagerUserMapper; import com.syjiaer.clinic.server.mapper.organization.OrganizationMemberMapper; import com.syjiaer.clinic.server.mapper.organization.OrganizationMemberSectionMapper; diff --git a/src/main/java/com/syjiaer/clinic/server/service/patient/PatientInfoService.java b/src/main/java/com/syjiaer/clinic/server/service/patient/PatientInfoService.java index adb8d84..145dd86 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/patient/PatientInfoService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/patient/PatientInfoService.java @@ -6,7 +6,6 @@ import com.syjiaer.clinic.server.common.exception.MessageException; import com.syjiaer.clinic.server.common.util.DebugUtil; import com.syjiaer.clinic.server.common.vo.Page; import com.syjiaer.clinic.server.entity.patient.PatientInfo; -import com.syjiaer.clinic.server.entity.vip.Vip; import com.syjiaer.clinic.server.entity.vip.VipExpLog; import com.syjiaer.clinic.server.entity.vip.VipIntegralLog; import com.syjiaer.clinic.server.entity.vip.VipLevelConfig; diff --git a/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java b/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java index d006839..6a46c45 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java @@ -3,10 +3,8 @@ package com.syjiaer.clinic.server.service.patient; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.syjiaer.clinic.server.common.api.input.IM1101; import com.syjiaer.clinic.server.common.api.input.IM2201; import com.syjiaer.clinic.server.common.api.input.IM2202; -import com.syjiaer.clinic.server.common.api.input.IM2203A; import com.syjiaer.clinic.server.common.api.request.SocialRequest; import com.syjiaer.clinic.server.common.constants.Constants; import com.syjiaer.clinic.server.common.enums.RegistrationStatusEnum; diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryLimitService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryLimitService.java index 41bd82c..eed5345 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryLimitService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryLimitService.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.syjiaer.clinic.server.common.api.request.SocialRequest; -import com.syjiaer.clinic.server.common.util.DebugUtil; import com.syjiaer.clinic.server.common.util.HttpUtil; import com.syjiaer.clinic.server.entity.social.SocialDirectoryLimit; import com.syjiaer.clinic.server.mapper.social.SocialDirectoryLimitMapper; diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectorySelfService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectorySelfService.java index 3d62a58..00ac125 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectorySelfService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectorySelfService.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.syjiaer.clinic.server.common.api.request.SocialRequest; -import com.syjiaer.clinic.server.common.util.DebugUtil; import com.syjiaer.clinic.server.common.util.HttpUtil; import com.syjiaer.clinic.server.entity.social.SocialDirectorySelf; import com.syjiaer.clinic.server.mapper.social.SocialDirectorySelfMapper; diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java index bc15e8a..7d1f038 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java @@ -5,13 +5,19 @@ import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.syjiaer.clinic.server.common.exception.MessageException; -import com.syjiaer.clinic.server.common.util.*; +import com.syjiaer.clinic.server.common.util.DateUtil; +import com.syjiaer.clinic.server.common.util.DebugUtil; +import com.syjiaer.clinic.server.common.util.DictoryUtil; +import com.syjiaer.clinic.server.common.util.HttpUtil; import com.syjiaer.clinic.server.common.vo.Page; import com.syjiaer.clinic.server.entity.goods.Goods; import com.syjiaer.clinic.server.entity.social.*; import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView; import com.syjiaer.clinic.server.mapper.goods.GoodsMapper; -import com.syjiaer.clinic.server.mapper.social.*; +import com.syjiaer.clinic.server.mapper.social.SocialDirectoryLimitMapper; +import com.syjiaer.clinic.server.mapper.social.SocialDirectoryMapper; +import com.syjiaer.clinic.server.mapper.social.SocialDirectorySelfMapper; +import com.syjiaer.clinic.server.mapper.social.SocialDirectoryUpinfoMapper; import com.syjiaer.clinic.server.service.BaseService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -24,7 +30,6 @@ import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.io.BufferedReader; import java.io.IOException; @@ -33,7 +38,6 @@ import java.io.InputStreamReader; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; -import java.util.logging.Logger; import java.util.stream.Collectors; /* diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryUpinfoService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryUpinfoService.java index 5361cf6..db488dc 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryUpinfoService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryUpinfoService.java @@ -3,23 +3,13 @@ package com.syjiaer.clinic.server.service.social; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.syjiaer.clinic.server.common.api.input.IM1312; -import com.syjiaer.clinic.server.common.api.output.OM1312; import com.syjiaer.clinic.server.common.api.request.SocialRequest; -import com.syjiaer.clinic.server.common.exception.MessageException; -import com.syjiaer.clinic.server.common.util.DateUtil; -import com.syjiaer.clinic.server.common.util.DebugUtil; import com.syjiaer.clinic.server.common.util.HttpUtil; import com.syjiaer.clinic.server.entity.social.SocialDirectoryUpinfo; import com.syjiaer.clinic.server.mapper.social.SocialDirectoryUpinfoMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.math.BigInteger; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialIcpcDiagnoseService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialIcpcDiagnoseService.java index 5b8c25e..3206cc4 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialIcpcDiagnoseService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialIcpcDiagnoseService.java @@ -8,11 +8,7 @@ import com.syjiaer.clinic.server.common.util.DateUtil; import com.syjiaer.clinic.server.common.util.HttpUtil; import com.syjiaer.clinic.server.common.vo.Page; import com.syjiaer.clinic.server.entity.social.SocialIcpcDiagnosis; -import com.syjiaer.clinic.server.entity.social.SocialIcpcDoctorDiagnose; -import com.syjiaer.clinic.server.entity.social.SocialIcpcItem; -import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView; import com.syjiaer.clinic.server.mapper.social.SocialIcpcDiagnosisMapper; -import com.syjiaer.clinic.server.mapper.social.SocialIcpcDoctorDiagnoseMapper; import com.syjiaer.clinic.server.service.BaseService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialIcpcItemService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialIcpcItemService.java index b6f2dec..21bcc23 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialIcpcItemService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialIcpcItemService.java @@ -4,17 +4,13 @@ import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONException; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.fasterxml.jackson.databind.ObjectMapper; import com.syjiaer.clinic.server.common.util.DateUtil; import com.syjiaer.clinic.server.common.util.HttpUtil; import com.syjiaer.clinic.server.common.vo.Page; -import com.syjiaer.clinic.server.entity.social.SocialDiagnose; import com.syjiaer.clinic.server.entity.social.SocialIcpcItem; -import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView; import com.syjiaer.clinic.server.mapper.social.SocialIcpcItemMapper; import com.syjiaer.clinic.server.service.BaseService; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,7 +18,6 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; -import java.util.Map; @Slf4j @Service public class SocialIcpcItemService extends BaseService { diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialInventoryUploadService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialInventoryUploadService.java index 30f1986..e85a16f 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialInventoryUploadService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialInventoryUploadService.java @@ -2,7 +2,6 @@ package com.syjiaer.clinic.server.service.social; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.syjiaer.clinic.server.common.annotations.RecordCommonLog; import com.syjiaer.clinic.server.common.api.input.*; import com.syjiaer.clinic.server.common.api.request.SocialRequest; import com.syjiaer.clinic.server.common.constants.Constants; @@ -11,7 +10,6 @@ import com.syjiaer.clinic.server.common.enums.RetailInventoryTypeEnum; import com.syjiaer.clinic.server.common.enums.RetailOrderPayTypeEnum; import com.syjiaer.clinic.server.common.enums.UploadStatusEnum; import com.syjiaer.clinic.server.common.exception.MessageException; -import com.syjiaer.clinic.server.common.util.DebugUtil; import com.syjiaer.clinic.server.common.vo.Page; import com.syjiaer.clinic.server.entity.charge.ChargeInventoryLog; import com.syjiaer.clinic.server.entity.charge.ChargeOrder; @@ -41,7 +39,6 @@ import com.syjiaer.clinic.server.service.BaseService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.RequestMapping; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialItemService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialItemService.java index acf994d..0f5dbc0 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialItemService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialItemService.java @@ -4,7 +4,10 @@ import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.syjiaer.clinic.server.common.util.HttpUtil; import com.syjiaer.clinic.server.common.vo.Page; -import com.syjiaer.clinic.server.entity.social.*; +import com.syjiaer.clinic.server.entity.social.SocialDirectoryLimit; +import com.syjiaer.clinic.server.entity.social.SocialDirectorySelf; +import com.syjiaer.clinic.server.entity.social.SocialDirectoryUpinfo; +import com.syjiaer.clinic.server.entity.social.SocialItem; import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView; import com.syjiaer.clinic.server.entity.social.vo.SocialItemVo; import com.syjiaer.clinic.server.mapper.social.SocialDirectoryLimitMapper; @@ -16,7 +19,8 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.List; @Service public class SocialItemService extends BaseService { diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialUserService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialUserService.java index 6f7a952..6c9dda0 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialUserService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialUserService.java @@ -1,7 +1,9 @@ package com.syjiaer.clinic.server.service.social; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.syjiaer.clinic.server.common.api.input.*; +import com.syjiaer.clinic.server.common.api.input.IM1101; +import com.syjiaer.clinic.server.common.api.input.IM5267; +import com.syjiaer.clinic.server.common.api.input.IM5283; 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; diff --git a/src/main/java/com/syjiaer/clinic/server/service/vip/VipIntegralLogService.java b/src/main/java/com/syjiaer/clinic/server/service/vip/VipIntegralLogService.java index 558b65d..78dafdc 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/vip/VipIntegralLogService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/vip/VipIntegralLogService.java @@ -5,19 +5,14 @@ import com.syjiaer.clinic.server.common.constants.Constants; import com.syjiaer.clinic.server.common.exception.MessageException; import com.syjiaer.clinic.server.common.vo.Page; import com.syjiaer.clinic.server.entity.patient.PatientInfo; -import com.syjiaer.clinic.server.entity.vip.Vip; import com.syjiaer.clinic.server.entity.vip.VipIntegralLog; import com.syjiaer.clinic.server.entity.vip.dto.VipIntegralLogQuery; import com.syjiaer.clinic.server.mapper.patient.PatientInfoMapper; import com.syjiaer.clinic.server.mapper.vip.VipIntegralLogMapper; -import com.syjiaer.clinic.server.mapper.vip.VipLevelConfigMapper; -import com.syjiaer.clinic.server.mapper.vip.VipMapper; import com.syjiaer.clinic.server.service.BaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; - @Service public class VipIntegralLogService extends BaseService { @Autowired diff --git a/src/main/java/com/syjiaer/clinic/server/service/vip/VipLevelConfigService.java b/src/main/java/com/syjiaer/clinic/server/service/vip/VipLevelConfigService.java index 6462b32..631784f 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/vip/VipLevelConfigService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/vip/VipLevelConfigService.java @@ -7,7 +7,6 @@ import com.syjiaer.clinic.server.mapper.vip.VipLevelConfigMapper; import com.syjiaer.clinic.server.service.BaseService; import com.syjiaer.clinic.server.service.patient.PatientInfoService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 4aeb28d..e24630d 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,15 +3,15 @@ spring: name: server data: mongodb: - host: dev.jizhiweb.cn # MongoDB服务器地址 + host: localhost # MongoDB服务器地址 port: 27017 # MongoDB端口 database: syjiaer_clinic # 使用的数据库名称 redis: - host: dev.jizhiweb.cn + host: localhost port: 6379 datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://dev.jizhiweb.cn:3306/syjiaer_clinic + url: jdbc:mysql://localhost:3306/syjiaer_clinic username: root password: i7L0BS91pADGuy7z config: