diff --git a/pom.xml b/pom.xml index cbd815f8..ff22f209 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.5.RELEASE + 3.2.5 com.supervision @@ -27,18 +27,17 @@ + 17 UTF-8 - 1.8 - 1.8 - - - 2.2.5.RELEASE - Hoxton.SR6 - 1.4.1 - 2.3.5.RELEASE + 17 + 17 + 2023.0.1.0 + 2023.0.1 + 2.3.2 + 3.2.5 1.2.76 - 3.3.1 - 1.1.22 + 3.5.5 + 1.2.21 5.8.16 3.0.3 1.18.20 @@ -114,7 +113,7 @@ com.alibaba - druid-spring-boot-starter + druid-spring-boot-3-starter ${druid.version} @@ -123,7 +122,7 @@ com.baomidou - mybatis-plus-boot-starter + mybatis-plus-spring-boot3-starter ${mybatis-puls-spring-boot.version} diff --git a/virtual-patient-common/pom.xml b/virtual-patient-common/pom.xml index 5011adfa..2d38d575 100644 --- a/virtual-patient-common/pom.xml +++ b/virtual-patient-common/pom.xml @@ -12,8 +12,9 @@ virtual-patient-common - 8 - 8 + 17 + 17 + 17 UTF-8 @@ -79,7 +80,7 @@ com.alibaba - druid-spring-boot-starter + druid-spring-boot-3-starter @@ -87,7 +88,7 @@ com.baomidou - mybatis-plus-boot-starter + mybatis-plus-spring-boot3-starter diff --git a/virtual-patient-common/src/main/java/com/supervision/config/JwtInterceptor.java b/virtual-patient-common/src/main/java/com/supervision/config/JwtInterceptor.java index 70fe2534..4a7f1c7e 100644 --- a/virtual-patient-common/src/main/java/com/supervision/config/JwtInterceptor.java +++ b/virtual-patient-common/src/main/java/com/supervision/config/JwtInterceptor.java @@ -1,29 +1,23 @@ package com.supervision.config; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import cn.hutool.jwt.JWT; import cn.hutool.jwt.JWTUtil; -import com.supervision.constant.UserTokenConstant; import com.supervision.exception.BusinessException; -import com.supervision.util.SpringBeanUtil; import com.supervision.util.TokenUtil; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; +import org.jetbrains.annotations.NotNull; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.http.HttpStatus; import org.springframework.lang.Nullable; import org.springframework.web.servlet.HandlerInterceptor; -import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.TimeUnit; @Slf4j public class JwtInterceptor implements HandlerInterceptor { @@ -57,7 +51,7 @@ public class JwtInterceptor implements HandlerInterceptor { @Override - public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, + public void afterCompletion(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response, @NotNull Object handler, @Nullable Exception ex) throws Exception { // 请求结束,将用户信息从thread中移除 clearAuth(); diff --git a/virtual-patient-common/src/main/java/com/supervision/config/MybatisPlusConfig.java b/virtual-patient-common/src/main/java/com/supervision/config/MybatisPlusConfig.java deleted file mode 100644 index ec5c1754..00000000 --- a/virtual-patient-common/src/main/java/com/supervision/config/MybatisPlusConfig.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 文 件 名: MybatisPlusConfig - * 版 权: - * 描 述: <描述> - * 修 改 人: RedName - * 修改时间: 2022/8/9 - * 跟踪单号: <跟踪单号> - * 修改单号: <修改单号> - * 修改内容: <修改内容> - */ -package com.supervision.config; - -import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * <功能详细描述> - * - * @author RedName - * @version [版本号, 2022/8/9] - * @see [相关类/方法] - * @since [产品/模块版本] - */ -@Configuration -public class MybatisPlusConfig { - - @Bean - public PaginationInterceptor paginationInterceptor() { - return new PaginationInterceptor(); - } -} diff --git a/virtual-patient-common/src/main/java/com/supervision/config/RequestLogConfig.java b/virtual-patient-common/src/main/java/com/supervision/config/RequestLogConfig.java index 6f32566d..ee748bb5 100644 --- a/virtual-patient-common/src/main/java/com/supervision/config/RequestLogConfig.java +++ b/virtual-patient-common/src/main/java/com/supervision/config/RequestLogConfig.java @@ -2,6 +2,9 @@ package com.supervision.config; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; @@ -16,9 +19,6 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; import java.util.HashMap; import java.util.Map; diff --git a/virtual-patient-graph/pom.xml b/virtual-patient-graph/pom.xml index 847186f2..b70fa744 100644 --- a/virtual-patient-graph/pom.xml +++ b/virtual-patient-graph/pom.xml @@ -13,8 +13,9 @@ jar - 8 - 8 + 17 + 17 + 17 UTF-8 @@ -53,7 +54,7 @@ org.nebula-contrib ngbatis - 1.2.1 + 1.2.2-jdk17 diff --git a/virtual-patient-graph/src/main/java/com/supervision/domain/AllergyHistoryVertex.java b/virtual-patient-graph/src/main/java/com/supervision/domain/AllergyHistoryVertex.java index 4443f3fe..a594aeb7 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/domain/AllergyHistoryVertex.java +++ b/virtual-patient-graph/src/main/java/com/supervision/domain/AllergyHistoryVertex.java @@ -1,10 +1,9 @@ package com.supervision.domain; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.Data; -import javax.persistence.Id; -import javax.persistence.Table; - /** * 过敏史 */ diff --git a/virtual-patient-graph/src/main/java/com/supervision/domain/AncillaryResultVertex.java b/virtual-patient-graph/src/main/java/com/supervision/domain/AncillaryResultVertex.java index 3c50de5d..921674d6 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/domain/AncillaryResultVertex.java +++ b/virtual-patient-graph/src/main/java/com/supervision/domain/AncillaryResultVertex.java @@ -1,10 +1,9 @@ package com.supervision.domain; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.Data; -import javax.persistence.Id; -import javax.persistence.Table; - /** * 辅助检查结果 */ diff --git a/virtual-patient-graph/src/main/java/com/supervision/domain/AncillaryVertex.java b/virtual-patient-graph/src/main/java/com/supervision/domain/AncillaryVertex.java index 8a1f13aa..a882b6cb 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/domain/AncillaryVertex.java +++ b/virtual-patient-graph/src/main/java/com/supervision/domain/AncillaryVertex.java @@ -1,10 +1,9 @@ package com.supervision.domain; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.Data; -import javax.persistence.Id; -import javax.persistence.Table; - /** * 体格检查节点 */ diff --git a/virtual-patient-graph/src/main/java/com/supervision/domain/DiagnosisVertex.java b/virtual-patient-graph/src/main/java/com/supervision/domain/DiagnosisVertex.java index e01a8233..746f2470 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/domain/DiagnosisVertex.java +++ b/virtual-patient-graph/src/main/java/com/supervision/domain/DiagnosisVertex.java @@ -1,10 +1,9 @@ package com.supervision.domain; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.Data; -import javax.persistence.Id; -import javax.persistence.Table; - /** * 诊断(疾病)节点 */ diff --git a/virtual-patient-graph/src/main/java/com/supervision/domain/FamilyHistoryVertex.java b/virtual-patient-graph/src/main/java/com/supervision/domain/FamilyHistoryVertex.java index f045ad5a..9a3c52da 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/domain/FamilyHistoryVertex.java +++ b/virtual-patient-graph/src/main/java/com/supervision/domain/FamilyHistoryVertex.java @@ -1,10 +1,9 @@ package com.supervision.domain; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.Data; -import javax.persistence.Id; -import javax.persistence.Table; - /** * 家族史 */ diff --git a/virtual-patient-graph/src/main/java/com/supervision/domain/IllnessHistoryVertex.java b/virtual-patient-graph/src/main/java/com/supervision/domain/IllnessHistoryVertex.java index cad34ec7..7b67c009 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/domain/IllnessHistoryVertex.java +++ b/virtual-patient-graph/src/main/java/com/supervision/domain/IllnessHistoryVertex.java @@ -1,10 +1,9 @@ package com.supervision.domain; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.Data; -import javax.persistence.Id; -import javax.persistence.Table; - /** * 现病史节点 */ diff --git a/virtual-patient-graph/src/main/java/com/supervision/domain/MarriageChildHistoryVertex.java b/virtual-patient-graph/src/main/java/com/supervision/domain/MarriageChildHistoryVertex.java index 1862c7a8..2349d3fa 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/domain/MarriageChildHistoryVertex.java +++ b/virtual-patient-graph/src/main/java/com/supervision/domain/MarriageChildHistoryVertex.java @@ -1,10 +1,9 @@ package com.supervision.domain; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.Data; -import javax.persistence.Id; -import javax.persistence.Table; - /** * 婚育史 */ diff --git a/virtual-patient-graph/src/main/java/com/supervision/domain/MedicalRecVertex.java b/virtual-patient-graph/src/main/java/com/supervision/domain/MedicalRecVertex.java index 5ee8d585..05b22918 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/domain/MedicalRecVertex.java +++ b/virtual-patient-graph/src/main/java/com/supervision/domain/MedicalRecVertex.java @@ -1,10 +1,9 @@ package com.supervision.domain; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.Data; -import javax.persistence.Id; -import javax.persistence.Table; - @Data @Table(name = "medical_rec") public class MedicalRecVertex { diff --git a/virtual-patient-graph/src/main/java/com/supervision/domain/NoPropertyEdge.java b/virtual-patient-graph/src/main/java/com/supervision/domain/NoPropertyEdge.java index 371af500..f18d687c 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/domain/NoPropertyEdge.java +++ b/virtual-patient-graph/src/main/java/com/supervision/domain/NoPropertyEdge.java @@ -1,8 +1,8 @@ package com.supervision.domain; +import jakarta.persistence.Table; import lombok.Data; -import javax.persistence.Table; /** * 无属性节点 diff --git a/virtual-patient-graph/src/main/java/com/supervision/domain/OperationHistoryVertex.java b/virtual-patient-graph/src/main/java/com/supervision/domain/OperationHistoryVertex.java index e018b498..d67fad96 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/domain/OperationHistoryVertex.java +++ b/virtual-patient-graph/src/main/java/com/supervision/domain/OperationHistoryVertex.java @@ -1,10 +1,9 @@ package com.supervision.domain; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.Data; -import javax.persistence.Id; -import javax.persistence.Table; - /** * 手术史 */ diff --git a/virtual-patient-graph/src/main/java/com/supervision/domain/PatientVertex.java b/virtual-patient-graph/src/main/java/com/supervision/domain/PatientVertex.java index 8d6eae16..3c461cab 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/domain/PatientVertex.java +++ b/virtual-patient-graph/src/main/java/com/supervision/domain/PatientVertex.java @@ -1,10 +1,9 @@ package com.supervision.domain; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.Data; -import javax.persistence.Id; -import javax.persistence.Table; - /** * 患者信息 */ diff --git a/virtual-patient-graph/src/main/java/com/supervision/domain/PersonalHistoryVertex.java b/virtual-patient-graph/src/main/java/com/supervision/domain/PersonalHistoryVertex.java index a0419409..d7814ec7 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/domain/PersonalHistoryVertex.java +++ b/virtual-patient-graph/src/main/java/com/supervision/domain/PersonalHistoryVertex.java @@ -1,10 +1,9 @@ package com.supervision.domain; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.Data; -import javax.persistence.Id; -import javax.persistence.Table; - /** * 个人史 */ diff --git a/virtual-patient-graph/src/main/java/com/supervision/domain/PhysicalResultVertex.java b/virtual-patient-graph/src/main/java/com/supervision/domain/PhysicalResultVertex.java index 20849007..c44e3744 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/domain/PhysicalResultVertex.java +++ b/virtual-patient-graph/src/main/java/com/supervision/domain/PhysicalResultVertex.java @@ -1,9 +1,9 @@ package com.supervision.domain; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.Data; -import javax.persistence.Id; -import javax.persistence.Table; /** * 辅助检查结果信息 diff --git a/virtual-patient-graph/src/main/java/com/supervision/domain/PhysicalVertex.java b/virtual-patient-graph/src/main/java/com/supervision/domain/PhysicalVertex.java index 35ab71e4..f357790a 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/domain/PhysicalVertex.java +++ b/virtual-patient-graph/src/main/java/com/supervision/domain/PhysicalVertex.java @@ -1,10 +1,9 @@ package com.supervision.domain; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.Data; -import javax.persistence.Id; -import javax.persistence.Table; - /** * 体格检查节点 */ diff --git a/virtual-patient-graph/src/main/java/com/supervision/domain/PreviousHistoryVertex.java b/virtual-patient-graph/src/main/java/com/supervision/domain/PreviousHistoryVertex.java index 2c699542..1f6f08e6 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/domain/PreviousHistoryVertex.java +++ b/virtual-patient-graph/src/main/java/com/supervision/domain/PreviousHistoryVertex.java @@ -1,10 +1,9 @@ package com.supervision.domain; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.Data; -import javax.persistence.Id; -import javax.persistence.Table; - /** * 既往病史节点 */ diff --git a/virtual-patient-graph/src/main/java/com/supervision/domain/ProcessMedicalVertex.java b/virtual-patient-graph/src/main/java/com/supervision/domain/ProcessMedicalVertex.java index 0d7bef92..bcf7e7f7 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/domain/ProcessMedicalVertex.java +++ b/virtual-patient-graph/src/main/java/com/supervision/domain/ProcessMedicalVertex.java @@ -1,10 +1,9 @@ package com.supervision.domain; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.Data; -import javax.persistence.Id; -import javax.persistence.Table; - @Data @Table(name = "process_medical") public class ProcessMedicalVertex { diff --git a/virtual-patient-graph/src/main/java/com/supervision/domain/SelfDescVertex.java b/virtual-patient-graph/src/main/java/com/supervision/domain/SelfDescVertex.java index f6f17187..13aa806b 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/domain/SelfDescVertex.java +++ b/virtual-patient-graph/src/main/java/com/supervision/domain/SelfDescVertex.java @@ -1,10 +1,9 @@ package com.supervision.domain; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.Data; -import javax.persistence.Id; -import javax.persistence.Table; - @Data @Table(name = "self_desc") public class SelfDescVertex { diff --git a/virtual-patient-graph/src/main/java/com/supervision/domain/SinglePropertyEdge.java b/virtual-patient-graph/src/main/java/com/supervision/domain/SinglePropertyEdge.java index fe12ac74..32db87ad 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/domain/SinglePropertyEdge.java +++ b/virtual-patient-graph/src/main/java/com/supervision/domain/SinglePropertyEdge.java @@ -1,10 +1,10 @@ package com.supervision.domain; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.Table; /** * 单一属性节点 diff --git a/virtual-patient-graph/src/main/java/com/supervision/domain/SymptomsVertex.java b/virtual-patient-graph/src/main/java/com/supervision/domain/SymptomsVertex.java index d1a8657d..ffbd34f7 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/domain/SymptomsVertex.java +++ b/virtual-patient-graph/src/main/java/com/supervision/domain/SymptomsVertex.java @@ -1,10 +1,9 @@ package com.supervision.domain; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.Data; -import javax.persistence.Id; -import javax.persistence.Table; - /** * 症状 */ diff --git a/virtual-patient-graph/src/main/java/com/supervision/domain/TreatmentPlanVertex.java b/virtual-patient-graph/src/main/java/com/supervision/domain/TreatmentPlanVertex.java index 56aaf7bb..4ffb7ea4 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/domain/TreatmentPlanVertex.java +++ b/virtual-patient-graph/src/main/java/com/supervision/domain/TreatmentPlanVertex.java @@ -1,10 +1,9 @@ package com.supervision.domain; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.Data; -import javax.persistence.Id; -import javax.persistence.Table; - /** * 治疗计划节点 */ diff --git a/virtual-patient-manage/pom.xml b/virtual-patient-manage/pom.xml index 90f370b2..0df4167f 100644 --- a/virtual-patient-manage/pom.xml +++ b/virtual-patient-manage/pom.xml @@ -2,25 +2,32 @@ 4.0.0 - - com.supervision - virtual-patient - 1.0-SNAPSHOT - - - virtual-patient-manage - virtual-patient-manage - jar - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - com.alibaba + + com.supervision + virtual-patient + 1.0-SNAPSHOT + + + virtual-patient-manage + virtual-patient-manage + jar + + + 17 + 17 + 17 + UTF-8 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + com.alibaba fastjson diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/AskQuestionLibraryManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/AskQuestionLibraryManageController.java index 9c20d488..63740401 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/AskQuestionLibraryManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/AskQuestionLibraryManageController.java @@ -11,11 +11,11 @@ import com.supervision.vo.manage.AskQuestionLibraryResVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletResponse; import java.util.List; @Api(tags = "问题库管理") diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/file/FileManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/file/FileManageController.java index 22c50d8a..6a930398 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/file/FileManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/file/FileManageController.java @@ -4,11 +4,11 @@ import com.supervision.manage.service.FileManageService; import com.supervision.model.FileResource; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletResponse; @Api(tags = "文件管理") @RestController diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java index ace029f9..d6451fc5 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java @@ -5,20 +5,20 @@ import com.supervision.manage.pojo.vo.MedicalAnswerVideoResVo; import com.supervision.manage.pojo.vo.MedicalRecInfoVO; import com.supervision.manage.pojo.vo.MedicalRecManageVO; import com.supervision.manage.pojo.vo.MedicalRecQaVO; +import com.supervision.manage.service.MedicalRecManageService; +import com.supervision.model.Disease; import com.supervision.vo.manage.DiseaseAncillaryResVo; import com.supervision.vo.manage.DiseasePhysicalResVo; import com.supervision.vo.manage.DiseaseTreatmentPlanResVo; import com.supervision.vo.manage.MedicalRecPageResVO; -import com.supervision.manage.service.MedicalRecManageService; -import com.supervision.model.Disease; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletResponse; import java.util.List; @Api(tags = "病历管理") diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecManageVO.java b/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecManageVO.java index ac83c15b..9d2c80b8 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecManageVO.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecManageVO.java @@ -3,10 +3,10 @@ package com.supervision.manage.pojo.vo; import com.supervision.model.MedicalRec; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.validation.constraints.NotBlank; import java.util.List; @EqualsAndHashCode(callSuper = true) diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/AskQuestionLibraryManageService.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/AskQuestionLibraryManageService.java index 7d7b8de4..00998f47 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/AskQuestionLibraryManageService.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/AskQuestionLibraryManageService.java @@ -6,9 +6,9 @@ import com.supervision.model.AskTemplateQuestionLibrary; import com.supervision.model.CommonDic; import com.supervision.vo.manage.AskQuestionLibraryReqVo; import com.supervision.vo.manage.AskQuestionLibraryResVo; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletResponse; import java.util.List; public interface AskQuestionLibraryManageService { diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/FileManageService.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/FileManageService.java index 7527dad3..9e37b0be 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/FileManageService.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/FileManageService.java @@ -1,9 +1,9 @@ package com.supervision.manage.service; import com.supervision.model.FileResource; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.InputStream; diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/MedicalRecManageService.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/MedicalRecManageService.java index 12935d1d..b03570fd 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/MedicalRecManageService.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/MedicalRecManageService.java @@ -5,14 +5,14 @@ import com.supervision.manage.pojo.vo.MedicalAnswerVideoResVo; import com.supervision.manage.pojo.vo.MedicalRecInfoVO; import com.supervision.manage.pojo.vo.MedicalRecManageVO; import com.supervision.manage.pojo.vo.MedicalRecQaVO; +import com.supervision.model.Disease; import com.supervision.vo.manage.DiseaseAncillaryResVo; import com.supervision.vo.manage.DiseasePhysicalResVo; import com.supervision.vo.manage.DiseaseTreatmentPlanResVo; import com.supervision.vo.manage.MedicalRecPageResVO; -import com.supervision.model.Disease; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletResponse; import java.util.List; public interface MedicalRecManageService { diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java index 5a6a9d8b..2730f108 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java @@ -24,6 +24,8 @@ import com.supervision.service.CommonDicService; import com.supervision.util.RedisSequenceUtil; import com.supervision.vo.manage.AskQuestionLibraryReqVo; import com.supervision.vo.manage.AskQuestionLibraryResVo; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.core.io.Resource; @@ -32,8 +34,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; import java.io.BufferedOutputStream; import java.io.File; import java.io.InputStream; diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ConfigTreatmentPlanManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ConfigTreatmentPlanManageServiceImpl.java index 1cf3c91b..a924e375 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ConfigTreatmentPlanManageServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ConfigTreatmentPlanManageServiceImpl.java @@ -133,7 +133,7 @@ public class ConfigTreatmentPlanManageServiceImpl implements ConfigTreatmentPlan //如果一级措施id为空，则判断一级措施是否已经存在，如果存在，则抛出异常 if(StrUtil.isBlank(configTreatmentPlan.getFirstMeasuresId())){ - Integer count = configTreatmentPlanService.lambdaQuery() + Long count = configTreatmentPlanService.lambdaQuery() .eq(ConfigTreatmentPlan::getDisposalMethod, configTreatmentPlan.getDisposalMethod()) .eq(ConfigTreatmentPlan::getDisposalPlanId, configTreatmentPlan.getDisposalPlanId()) .eq(ConfigTreatmentPlan::getFirstMeasures, configTreatmentPlan.getFirstMeasures()).count(); diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DirectoryInfoManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DirectoryInfoManageServiceImpl.java index 48326360..c9f89528 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DirectoryInfoManageServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DirectoryInfoManageServiceImpl.java @@ -7,7 +7,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.supervision.manage.pojo.vo.DirectoryInfoVO; import com.supervision.manage.service.DirectoryInfoManageService; -import com.supervision.manage.service.FileManageService; import com.supervision.model.DirectoryInfo; import com.supervision.model.MaterialLibrary; import com.supervision.service.DirectoryInfoService; @@ -17,7 +16,6 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; -import java.util.Objects; import java.util.stream.Collectors; @Service @@ -56,7 +54,7 @@ public class DirectoryInfoManageServiceImpl implements DirectoryInfoManageServic Assert.notEmpty(directoryId, "文件目录id不能为空"); - Integer count = directoryInfoService.lambdaQuery() + Long count = directoryInfoService.lambdaQuery() .eq(DirectoryInfo::getParentId, directoryId).count(); Assert.isTrue(count == 0, "目录下有子目录，不能删除"); diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java index df8b2067..b036c47d 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java @@ -220,7 +220,7 @@ public class DiseaseTreatmentPlanManageServiceImpl implements DiseaseTreatmentPl Assert.notEmpty(diseaseTreatmentPlan.getTreatmentPlanId(),"处置计划id不能为空"); // 根据疾病id和处置计划id进行重复校验 - Integer count = diseaseTreatmentPlanService.lambdaQuery() + Long count = diseaseTreatmentPlanService.lambdaQuery() .eq(DiseaseTreatmentPlan::getTreatmentPlanId, diseaseTreatmentPlan.getTreatmentPlanId()) .eq(DiseaseTreatmentPlan::getDiseaseId, diseaseTreatmentPlan.getDiseaseId()).count(); Assert.isFalse(count > 0, "该处置计划已存在"); diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/FileManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/FileManageServiceImpl.java index 613f5c66..f800ba5d 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/FileManageServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/FileManageServiceImpl.java @@ -8,13 +8,13 @@ import com.supervision.manage.service.FileManageService; import com.supervision.model.FileResource; import com.supervision.service.FileResourceService; import com.supervision.util.MinioUtil; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; import java.io.BufferedInputStream; import java.io.File; import java.io.FileOutputStream; diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MaterialLibraryManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MaterialLibraryManageServiceImpl.java index 3106fe4e..dc48b3ed 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MaterialLibraryManageServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MaterialLibraryManageServiceImpl.java @@ -3,7 +3,6 @@ package com.supervision.manage.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.AbstractWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.supervision.manage.service.FileManageService; @@ -94,7 +93,7 @@ public class MaterialLibraryManageServiceImpl implements MaterialLibraryManageSe if (!material.getMaterialName().equals(materialLibrary.getMaterialName())){ // 如果素材名发生改变，需要校验素材名是否已经存在 - Integer count = materialLibraryService.lambdaQuery().eq(MaterialLibrary::getMaterialName, materialLibrary.getMaterialName()).count(); + Long count = materialLibraryService.lambdaQuery().eq(MaterialLibrary::getMaterialName, materialLibrary.getMaterialName()).count(); Assert.isTrue(count == 0, "素材名已存在"); List split = StrUtil.split(material.getMaterialName(), "."); if (split.size() > 1){ diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java index be68d042..f8b5fc73 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java @@ -19,6 +19,8 @@ import com.supervision.vo.manage.DiseaseAncillaryResVo; import com.supervision.vo.manage.DiseasePhysicalResVo; import com.supervision.vo.manage.DiseaseTreatmentPlanResVo; import com.supervision.vo.manage.MedicalRecPageResVO; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.core.io.Resource; @@ -27,8 +29,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; import java.net.URLEncoder; import java.util.*; import java.util.function.Function; diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/PhysicalToolManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/PhysicalToolManageServiceImpl.java index 3a3a79e0..2087b28b 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/PhysicalToolManageServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/PhysicalToolManageServiceImpl.java @@ -78,7 +78,7 @@ public class PhysicalToolManageServiceImpl implements PhysicalToolManageService Assert.notBlank(physicalToolVO.getToolName(), () -> new BusinessException("体格检查工具名称不能为空")); Assert.notBlank(physicalToolVO.getType(), () -> new BusinessException("体格检查工具类型不能为空")); // 校验,相同类型下,不允许存在相同名称的工具 - Integer nameCount = configPhysicalToolService.lambdaQuery().eq(ConfigPhysicalTool::getType, physicalToolVO.getType()) + Long nameCount = configPhysicalToolService.lambdaQuery().eq(ConfigPhysicalTool::getType, physicalToolVO.getType()) .eq(ConfigPhysicalTool::getToolName, physicalToolVO.getToolName()).count(); if (nameCount > 0) { throw new BusinessException("体格检查工具类型:" + physicalToolVO.getType() + " 存在重复名称"); @@ -115,7 +115,7 @@ public class PhysicalToolManageServiceImpl implements PhysicalToolManageService Assert.notBlank(physicalToolVO.getToolName(), () -> new BusinessException("体格检查工具名称不能为空")); Assert.notBlank(physicalToolVO.getType(), () -> new BusinessException("体格检查工具类型不能为空")); // 校验,相同类型下,不允许存在除这个ID相同名称的工具 - Integer nameCount = configPhysicalToolService.lambdaQuery().eq(ConfigPhysicalTool::getType, physicalToolVO.getType()) + Long nameCount = configPhysicalToolService.lambdaQuery().eq(ConfigPhysicalTool::getType, physicalToolVO.getType()) .ne(ConfigPhysicalTool::getId, physicalToolVO.getId()) .eq(ConfigPhysicalTool::getToolName, physicalToolVO.getToolName()).count(); if (nameCount > 0) { @@ -152,7 +152,7 @@ public class PhysicalToolManageServiceImpl implements PhysicalToolManageService @Transactional(rollbackFor = Exception.class) public void deleteConfigPhysicalTool(String id) { // 删除之前,校验这个工具是否在某些地方已经被配置了,如果配置了,就不允许删除 - Integer count = diseasePhysicalService.lambdaQuery().eq(DiseasePhysical::getToolId, id).count(); + Long count = diseasePhysicalService.lambdaQuery().eq(DiseasePhysical::getToolId, id).count(); if (count > 0 ) { throw new BusinessException("工具已被使用,不允许删除"); } diff --git a/virtual-patient-model/pom.xml b/virtual-patient-model/pom.xml index 7d8c07fc..edc54842 100644 --- a/virtual-patient-model/pom.xml +++ b/virtual-patient-model/pom.xml @@ -13,6 +13,9 @@ virtual-patient-model + 17 + 17 + 17 UTF-8 diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseAncillaryServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseAncillaryServiceImpl.java index 110b633a..27a0dcb5 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseAncillaryServiceImpl.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseAncillaryServiceImpl.java @@ -1,20 +1,15 @@ package com.supervision.service.impl; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.supervision.dto.DiseaseAncillaryDto; import com.supervision.exception.BusinessException; -import com.supervision.model.Disease; +import com.supervision.mapper.DiseaseAncillaryMapper; import com.supervision.model.DiseaseAncillary; import com.supervision.service.DiseaseAncillaryService; -import com.supervision.mapper.DiseaseAncillaryMapper; import com.supervision.vo.manage.DiseaseAncillaryResVo; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import sun.awt.image.BufImgSurfaceData; import java.util.List; import java.util.function.Supplier; diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/ask/ModifyPrimaryDiseaseInfoReqVO.java b/virtual-patient-model/src/main/java/com/supervision/vo/ask/ModifyPrimaryDiseaseInfoReqVO.java index ae7825f3..e149279c 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/ask/ModifyPrimaryDiseaseInfoReqVO.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/ask/ModifyPrimaryDiseaseInfoReqVO.java @@ -1,9 +1,9 @@ package com.supervision.vo.ask; import io.swagger.annotations.ApiModelProperty; +import jakarta.validation.constraints.NotBlank; import lombok.Data; -import javax.validation.constraints.NotBlank; import java.util.List; @Data diff --git a/virtual-patient-rasa/pom.xml b/virtual-patient-rasa/pom.xml index 00705150..7f71b069 100644 --- a/virtual-patient-rasa/pom.xml +++ b/virtual-patient-rasa/pom.xml @@ -16,6 +16,9 @@ + 17 + 17 + 17 UTF-8 diff --git a/virtual-patient-rasa/src/main/java/com/supervision/rasa/util/PortUtil.java b/virtual-patient-rasa/src/main/java/com/supervision/rasa/util/PortUtil.java index f946bdad..5cf6c855 100644 --- a/virtual-patient-rasa/src/main/java/com/supervision/rasa/util/PortUtil.java +++ b/virtual-patient-rasa/src/main/java/com/supervision/rasa/util/PortUtil.java @@ -1,14 +1,11 @@ package com.supervision.rasa.util; import cn.hutool.core.collection.CollectionUtil; -import jdk.nashorn.internal.runtime.regexp.JoniRegExp; import lombok.extern.slf4j.Slf4j; import java.io.IOException; import java.net.Socket; import java.util.List; -import java.util.TreeMap; -import java.util.function.Predicate; @Slf4j public class PortUtil { diff --git a/virtual-patient-web/pom.xml b/virtual-patient-web/pom.xml index 7a198506..9515ad2d 100644 --- a/virtual-patient-web/pom.xml +++ b/virtual-patient-web/pom.xml @@ -14,6 +14,7 @@ UTF-8 + 17 diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/AskController.java b/virtual-patient-web/src/main/java/com/supervision/controller/AskController.java index 4d85a763..6569efdb 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/AskController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/AskController.java @@ -1,21 +1,15 @@ package com.supervision.controller; -import cn.hutool.json.JSONUtil; -import com.supervision.pojo.paddlespeech.req.TtsReqDTO; -import com.supervision.pojo.vo.TalkReqVO; import com.supervision.pojo.vo.TalkResultResVO; import com.supervision.pojo.vo.TalkVideoReqVO; import com.supervision.service.AskService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.io.OutputStream; @Api(tags = "问诊") @RestController diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java b/virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java index 54328d43..24c1ccdb 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java @@ -12,12 +12,12 @@ import com.supervision.vo.ask.ModifyPrimaryDiseaseInfoReqVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import jakarta.validation.constraints.NotBlank; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import javax.validation.constraints.NotBlank; import java.util.List; @Api(tags = "初步诊断") diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/AskAncillaryResultReqVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/AskAncillaryResultReqVO.java index c7096c5c..ed16b30a 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/AskAncillaryResultReqVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/AskAncillaryResultReqVO.java @@ -2,9 +2,9 @@ package com.supervision.pojo.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import jakarta.validation.constraints.NotBlank; import lombok.Data; -import javax.validation.constraints.NotBlank; @Data @ApiModel diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/AskPhysicalResultReqVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/AskPhysicalResultReqVO.java index 03f31657..8e91c13f 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/AskPhysicalResultReqVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/AskPhysicalResultReqVO.java @@ -2,9 +2,9 @@ package com.supervision.pojo.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import jakarta.validation.constraints.NotBlank; import lombok.Data; -import javax.validation.constraints.NotBlank; import java.util.List; @Data diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/PrimaryConfirmNodeReqVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/PrimaryConfirmNodeReqVO.java index 19854c6c..9c94da8d 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/PrimaryConfirmNodeReqVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/PrimaryConfirmNodeReqVO.java @@ -1,9 +1,9 @@ package com.supervision.pojo.vo; import io.swagger.annotations.ApiModelProperty; +import jakarta.validation.constraints.NotBlank; import lombok.Data; -import javax.validation.constraints.NotBlank; import java.util.List; @Data diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/PrimaryConfirmReqVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/PrimaryConfirmReqVO.java index 07c4fb50..453afd57 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/PrimaryConfirmReqVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/PrimaryConfirmReqVO.java @@ -1,9 +1,9 @@ package com.supervision.pojo.vo; import io.swagger.annotations.ApiModelProperty; +import jakarta.validation.constraints.NotBlank; import lombok.Data; -import javax.validation.constraints.NotBlank; import java.util.List; @Data diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/SaveDiagnosisPrimaryReqVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/SaveDiagnosisPrimaryReqVO.java index 63ee0dff..0f1081e4 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/SaveDiagnosisPrimaryReqVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/SaveDiagnosisPrimaryReqVO.java @@ -1,15 +1,10 @@ package com.supervision.pojo.vo; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.supervision.model.DiagnosisPrimary; -import com.supervision.model.DiagnosisPrimaryRelation; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import jakarta.validation.constraints.NotBlank; import lombok.Data; -import lombok.EqualsAndHashCode; -import javax.validation.constraints.NotBlank; import java.util.List; @Data diff --git a/virtual-patient-web/src/main/java/com/supervision/service/AskService.java b/virtual-patient-web/src/main/java/com/supervision/service/AskService.java index 48791bf3..a7f5db14 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/AskService.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/AskService.java @@ -1,15 +1,10 @@ package com.supervision.service; -import com.supervision.pojo.vo.TalkReqVO; import com.supervision.pojo.vo.TalkResultResVO; import com.supervision.pojo.vo.TalkVideoReqVO; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.io.OutputStream; public interface AskService { diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java index b123dea4..08c5108c 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java @@ -504,10 +504,10 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService * ( 用户命中病历配置问题数 / 病历问题总数 ) * (用户提问命中病历配置问题数 / 用户实际提问的数量 ) */ private ChartNodeVO computeAncillaryChart(Process process) { - Integer userHitCount = diagnosisAncillaryRecordService.lambdaQuery().isNotNull(DiagnosisAncillaryRecord::getAncillaryId) + Long userHitCount = diagnosisAncillaryRecordService.lambdaQuery().isNotNull(DiagnosisAncillaryRecord::getAncillaryId) .eq(DiagnosisAncillaryRecord::getProcessId, process.getId()).count(); - Integer userCount = diagnosisAncillaryRecordService.lambdaQuery().eq(DiagnosisAncillaryRecord::getProcessId, process.getId()).count(); - Integer medicalCount = diseaseAncillaryService.lambdaQuery().eq(DiseaseAncillary::getDiseaseId, process.getDiseaseId()).count(); + Long userCount = diagnosisAncillaryRecordService.lambdaQuery().eq(DiagnosisAncillaryRecord::getProcessId, process.getId()).count(); + Long medicalCount = diseaseAncillaryService.lambdaQuery().eq(DiseaseAncillary::getDiseaseId, process.getDiseaseId()).count(); // 过程数据3：问诊vs问诊正确率 BigDecimal num3 = BigDecimal.ZERO; if (userCount > 0) { @@ -522,9 +522,9 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService ChartNodeVO chartNodeVO = new ChartNodeVO(); chartNodeVO.setNodePer(num2.multiply(num3).multiply(BigDecimal.valueOf(100))); chartNodeVO.setScoreLevel(chartNodeVO.computeScoreLevel()); - chartNodeVO.setCorrect(userHitCount); - chartNodeVO.setUnCorrect(medicalCount - userHitCount); - chartNodeVO.setStandard(medicalCount); + chartNodeVO.setCorrect(Math.toIntExact(userHitCount)); + chartNodeVO.setUnCorrect((int) (medicalCount - userHitCount)); + chartNodeVO.setStandard(Math.toIntExact(medicalCount)); chartNodeVO.setTotal(NumberUtil.add(chartNodeVO.getUnCorrect(), chartNodeVO.getStandard(), chartNodeVO.getCorrect()).intValue()); return chartNodeVO; @@ -536,12 +536,12 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService */ private ChartNodeVO computePhysicalChart(Process process) { // 查询用户命中病历配置问题数 - Integer userHitCount = diagnosisPhysicalRecordService.lambdaQuery().isNotNull(DiagnosisPhysicalRecord::getPhysicalId) + Long userHitCount = diagnosisPhysicalRecordService.lambdaQuery().isNotNull(DiagnosisPhysicalRecord::getPhysicalId) .eq(DiagnosisPhysicalRecord::getProcessId, process.getId()).count(); // 查询用户实际检查数量 - Integer userCount = diagnosisPhysicalRecordService.lambdaQuery().eq(DiagnosisPhysicalRecord::getProcessId, process.getId()).count(); + Long userCount = diagnosisPhysicalRecordService.lambdaQuery().eq(DiagnosisPhysicalRecord::getProcessId, process.getId()).count(); // 查询病例配置的数量 - Integer medicalCount = diseasePhysicalService.lambdaQuery().eq(DiseasePhysical::getDiseaseId, process.getDiseaseId()).count(); + Long medicalCount = diseasePhysicalService.lambdaQuery().eq(DiseasePhysical::getDiseaseId, process.getDiseaseId()).count(); // 过程数据3：问诊vs问诊正确率 BigDecimal num3 = BigDecimal.ZERO; if (userCount > 0) { @@ -555,9 +555,9 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService ChartNodeVO chartNodeVO = new ChartNodeVO(); chartNodeVO.setNodePer(num2.multiply(num3).multiply(BigDecimal.valueOf(100))); chartNodeVO.setScoreLevel(chartNodeVO.computeScoreLevel()); - chartNodeVO.setCorrect(userHitCount); - chartNodeVO.setUnCorrect(medicalCount - userHitCount); - chartNodeVO.setStandard(medicalCount); + chartNodeVO.setCorrect(Math.toIntExact(userHitCount)); + chartNodeVO.setUnCorrect((int) (medicalCount - userHitCount)); + chartNodeVO.setStandard(Math.toIntExact(medicalCount)); chartNodeVO.setTotal(NumberUtil.add(chartNodeVO.getUnCorrect(), chartNodeVO.getStandard(), chartNodeVO.getCorrect()).intValue()); return chartNodeVO; diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPrimaryServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPrimaryServiceImpl.java index b45a0024..145edcbb 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPrimaryServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPrimaryServiceImpl.java @@ -120,7 +120,7 @@ public class AskPrimaryServiceImpl implements AskPrimaryService { @Transactional(rollbackFor = Exception.class) public void savePrimary(SaveDiagnosisPrimaryReqVO reqVO) { // 新增初步诊断之前,校验是否已经存在相同的初步诊断,如果有了,则不允许重复添加 - Integer count = diagnosisPrimaryService.lambdaQuery().eq(DiagnosisPrimary::getProcessId, reqVO.getProcessId()) + Long count = diagnosisPrimaryService.lambdaQuery().eq(DiagnosisPrimary::getProcessId, reqVO.getProcessId()) .eq(DiagnosisPrimary::getPrimaryDiagnosisId, reqVO.getPrimaryDiagnosisId()).count(); if (0 < count) { throw new BusinessException("已经存在该疾病的初步诊断"); @@ -207,7 +207,7 @@ public class AskPrimaryServiceImpl implements AskPrimaryService { // 如果 != 1 ,不是暂存,那么就校验电子病历是否填写 if (ObjectUtil.isEmpty(reqVO.getTempSaveFlag()) || 1 != reqVO.getTempSaveFlag()) { // 校验,如果没有填写病历,那么就不允许诊毕 - Integer count = processMedicalService.lambdaQuery().eq(ProcessMedical::getProcessId, reqVO.getProcessId()).count(); + Long count = processMedicalService.lambdaQuery().eq(ProcessMedical::getProcessId, reqVO.getProcessId()).count(); if (count < 1) { throw new BusinessException("电子病历未填写,请填写电子病例后诊毕"); } @@ -262,11 +262,11 @@ public class AskPrimaryServiceImpl implements AskPrimaryService { public void deletePrimary(String id) { // 如果本项初步诊断已经做过了辅助检查和体格检查,则不允许删除 DiagnosisPrimary primary = diagnosisPrimaryService.getById(id); - Integer ancillaryCount = diagnosisAncillaryRecordService.lambdaQuery().eq(DiagnosisAncillaryRecord::getProcessId, primary.getProcessId()).count(); + Long ancillaryCount = diagnosisAncillaryRecordService.lambdaQuery().eq(DiagnosisAncillaryRecord::getProcessId, primary.getProcessId()).count(); if (ancillaryCount > 0) { throw new BusinessException("仅支持删除没有做过体格、辅助检查的初步诊断项目"); } - Integer physicalCount = diagnosisPhysicalRecordService.lambdaQuery().eq(DiagnosisPhysicalRecord::getProcessId, primary.getProcessId()).count(); + Long physicalCount = diagnosisPhysicalRecordService.lambdaQuery().eq(DiagnosisPhysicalRecord::getProcessId, primary.getProcessId()).count(); if (physicalCount > 0) { throw new BusinessException("仅支持删除没有做过体格、辅助检查的初步诊断项目"); } diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/MedicalRecordServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/MedicalRecordServiceImpl.java index a63e2f2a..323defde 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/MedicalRecordServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/MedicalRecordServiceImpl.java @@ -125,7 +125,7 @@ public class MedicalRecordServiceImpl implements MedicalRecordService { } - Integer count = processMedicalService.lambdaQuery().eq(ProcessMedical::getProcessId, processMedical.getProcessId()).count(); + Long count = processMedicalService.lambdaQuery().eq(ProcessMedical::getProcessId, processMedical.getProcessId()).count(); Assert.isFalse(count > 0, "当前实例已经存在电子病例信息"); } }