diff --git a/virtual-patient-model/src/main/java/com/supervision/model/AskDefaultQuestionAnswer.java b/virtual-patient-model/src/main/java/com/supervision/model/AskDefaultQuestionAnswer.java index 8e7e7d7d..133ed3fe 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/AskDefaultQuestionAnswer.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/AskDefaultQuestionAnswer.java @@ -10,6 +10,7 @@ import java.time.LocalDateTime; import java.util.List; import com.supervision.handler.StringListTypeHandler; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -29,22 +30,26 @@ public class AskDefaultQuestionAnswer implements Serializable { /** * 编码 */ + @ApiModelProperty("编码") private String code; /** * 中文注释 */ + @ApiModelProperty("中文注释") private String description; /** * 问题列表 */ + @ApiModelProperty("问题列表") @TableField(typeHandler = StringListTypeHandler.class) private List question; /** - * 回答 + * 回答列表 */ + @ApiModelProperty("回答列表") @TableField(typeHandler = StringListTypeHandler.class) private List answer; diff --git a/virtual-patient-model/src/main/java/com/supervision/model/AskDiseaseQuestionAnswer.java b/virtual-patient-model/src/main/java/com/supervision/model/AskDiseaseQuestionAnswer.java index 9444db09..01c1cb50 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/AskDiseaseQuestionAnswer.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/AskDiseaseQuestionAnswer.java @@ -11,6 +11,7 @@ import java.util.List; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.supervision.handler.StringListTypeHandler; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -30,32 +31,38 @@ public class AskDiseaseQuestionAnswer extends Model im /** * 疾病ID */ + @ApiModelProperty("疾病ID") private String diseaseId; /** * 模板问题ID(如果not null,则从template_question表出code,desc,question) */ + @ApiModelProperty("") private String templateQuestionId; /** * 编码 */ + @ApiModelProperty("编码") private String code; /** * 中文注释 */ + @ApiModelProperty("中文注释") private String description; /** * 问题列表 */ + @ApiModelProperty("问题列表") @TableField(typeHandler = StringListTypeHandler.class) private List question; /** - * 回答 + * 回答列表 */ + @ApiModelProperty("回答列表") @TableField(typeHandler = StringListTypeHandler.class) private List answer; diff --git a/virtual-patient-model/src/main/java/com/supervision/model/AskTemplateQuestion.java b/virtual-patient-model/src/main/java/com/supervision/model/AskTemplateQuestion.java index 948aaaa1..4036b80c 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/AskTemplateQuestion.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/AskTemplateQuestion.java @@ -10,6 +10,7 @@ import java.util.List; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.supervision.handler.StringListTypeHandler; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -28,16 +29,19 @@ public class AskTemplateQuestion extends Model implements S /** * 编码 */ + @ApiModelProperty("编码") private String code; /** * 中文注释 */ + @ApiModelProperty("中文注释") private String description; /** * 问题列表 */ + @ApiModelProperty("问题列表") @TableField(typeHandler = StringListTypeHandler.class) private List question; diff --git a/virtual-patient-model/src/main/java/com/supervision/model/ConfigAncillaryItem.java b/virtual-patient-model/src/main/java/com/supervision/model/ConfigAncillaryItem.java index 9e72f9f7..1fbd07ab 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/ConfigAncillaryItem.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/ConfigAncillaryItem.java @@ -10,6 +10,7 @@ import java.time.LocalDateTime; import java.util.List; import com.supervision.handler.StringListTypeHandler; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -26,23 +27,37 @@ public class ConfigAncillaryItem implements Serializable { @TableId private String id; + /** + * 类型 + */ + @ApiModelProperty("类型") + private String type; + + /** + * 编码 + */ + @ApiModelProperty("编码") private String code; /** * 类别 */ + @ApiModelProperty("类别") private String itemClass; /** * 检查名称 */ + @ApiModelProperty("检查名称") private String itemName; /** * 该项检查描述信息 */ + @ApiModelProperty("该项检查描述信息") private String info; + @ApiModelProperty("呼出问题") @TableField(typeHandler = StringListTypeHandler.class) private List callOutQuestion; diff --git a/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalLocation.java b/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalLocation.java index efaf25d3..fb018bf6 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalLocation.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalLocation.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -24,16 +26,19 @@ public class ConfigPhysicalLocation implements Serializable { /** * 编码 */ + @ApiModelProperty("编码") private String code; /** * 位置分类 */ + @ApiModelProperty("位置分类") private String locationClass; /** * 位置名称 */ + @ApiModelProperty("位置名称") private String locationName; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalTool.java b/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalTool.java index 71f6d038..3c66d159 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalTool.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalTool.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.supervision.handler.StringListTypeHandler; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -27,23 +28,28 @@ public class ConfigPhysicalTool implements Serializable { /** * 体格检查类别 */ - private String toolClass; + @ApiModelProperty("体格检查类别") + private String type; /** * 体格检查工具编码 */ + @ApiModelProperty("体格检查工具编码") private String code; /** * 体格检查工具名称 */ + @ApiModelProperty("体格检查工具名称") private String toolName; /** * 是否需要具体部位(0否1是) */ + @ApiModelProperty("是否需要具体部位(0否1是)") private Integer requireLocation; + @ApiModelProperty("呼出问题") @TableField(typeHandler = StringListTypeHandler.class) private List callOutQuestion; diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisAncillaryRecord.java b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisAncillaryRecord.java index 5d30d166..b16f67ed 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisAncillaryRecord.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisAncillaryRecord.java @@ -8,6 +8,7 @@ import java.io.Serializable; import java.time.LocalDateTime; import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -26,26 +27,31 @@ public class DiagnosisAncillaryRecord extends Model im /** * 流程ID */ + @ApiModelProperty("流程ID") private String processId; /** * 项目ID */ + @ApiModelProperty("项目ID") private String itemId; /** * 检查结果 */ + @ApiModelProperty("检查结果") private String value; /** * 创建人ID */ + @ApiModelProperty("") private String createUserId; /** * 创建时间 */ + @ApiModelProperty("") private LocalDateTime createTime; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPhysicalRecord.java b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPhysicalRecord.java index f0235273..8c2c3664 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPhysicalRecord.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPhysicalRecord.java @@ -8,6 +8,7 @@ import java.io.Serializable; import java.time.LocalDateTime; import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -26,21 +27,25 @@ public class DiagnosisPhysicalRecord extends Model impl /** * 诊断进程ID */ + @ApiModelProperty("诊断进程ID") private String processId; /** * 体格检查工具ID */ + @ApiModelProperty("体格检查工具ID") private String toolId; /** * 体格检查部位ID */ + @ApiModelProperty("体格检查部位ID") private String locationId; /** * 体格检查结果 */ + @ApiModelProperty("体格检查结果") private String result; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPrimary.java b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPrimary.java index bd6784fc..ea6350fe 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPrimary.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPrimary.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -24,11 +26,13 @@ public class DiagnosisPrimary implements Serializable { /** * 诊断流程ID */ + @ApiModelProperty("诊断流程ID") private String processId; /** * 初步诊断疾病 */ + @ApiModelProperty("初步诊断疾病") private String primaryDiagnosis; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisQaRecord.java b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisQaRecord.java index c20ffcd2..f9402c04 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisQaRecord.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisQaRecord.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -24,26 +26,31 @@ public class DiagnosisQaRecord implements Serializable { /** * 诊断进程ID */ + @ApiModelProperty("诊断进程ID") private String processId; /** * 问题 */ + @ApiModelProperty("问题") private String question; /** * 问题语音文件ID */ + @ApiModelProperty("问题语音文件ID") private String questionWavId; /** * 回答 */ + @ApiModelProperty("回答") private String answer; /** * 回答语音文件ID */ + @ApiModelProperty("回答语音文件ID") private String answerWavId; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisResult.java b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisResult.java index 5332a688..d6f8617a 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisResult.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisResult.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -24,21 +26,25 @@ public class DiagnosisResult implements Serializable { /** * 诊断进程ID */ + @ApiModelProperty("诊断进程ID") private String processId; /** * 诊断结果 */ + @ApiModelProperty("诊断结果") private String finalDiagnosis; /** * 治疗计划 */ + @ApiModelProperty("治疗计划") private String treatmentPlan; /** * 论证诊断 */ + @ApiModelProperty("论证诊断") private String proveDiagnosisDesc; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/Disease.java b/virtual-patient-model/src/main/java/com/supervision/model/Disease.java index 30cd383b..1f11382a 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/Disease.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/Disease.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -24,36 +26,43 @@ public class Disease implements Serializable { /** * 疾病编码 */ + @ApiModelProperty("疾病编码") private String code; /** * 状态 0未训练 1已训练 */ + @ApiModelProperty("状态 0未训练 1已训练") private Integer status; /** * 预期诊断结果 */ + @ApiModelProperty("预期诊断结果") private String expectedDiagnosisResult; /** * 初步诊断依据 */ + @ApiModelProperty("初步诊断依据") private String preliminaryDiagnosis; /** * 证实诊断依据 */ + @ApiModelProperty("证实诊断依据") private String confirmingDiagnosis; /** * 鉴别依据 */ + @ApiModelProperty("鉴别依据") private String basisIdentification; /** * 其他 */ + @ApiModelProperty("其他") private String other; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseAncillary.java b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseAncillary.java index 6ea3eb61..1f188d05 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseAncillary.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseAncillary.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -24,26 +26,31 @@ public class DiseaseAncillary implements Serializable { /** * 病人ID */ + @ApiModelProperty("病人ID") private String patientId; /** * 工具ID */ + @ApiModelProperty("工具ID") private String itemId; /** * 是否必查 */ + @ApiModelProperty("是否必查") private Integer requireCheck; /** * 结果 */ + @ApiModelProperty("结果") private String result; /** * 说明 */ + @ApiModelProperty("说明") private String description; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiseasePhysical.java b/virtual-patient-model/src/main/java/com/supervision/model/DiseasePhysical.java index ef7cfc52..f86c63c9 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiseasePhysical.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiseasePhysical.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -24,31 +26,37 @@ public class DiseasePhysical implements Serializable { /** * 病人ID */ + @ApiModelProperty("病人ID") private String patientId; /** * 工具ID */ + @ApiModelProperty("工具ID") private String toolId; /** * 检查部位ID */ + @ApiModelProperty("检查部位ID") private String locationId; /** * 是否必查 */ + @ApiModelProperty("是否必查") private Integer requireCheck; /** * 结果 */ + @ApiModelProperty("结果") private String result; /** * 表征 */ + @ApiModelProperty("表征") private String trait; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/Patient.java b/virtual-patient-model/src/main/java/com/supervision/model/Patient.java index a54154e8..1993243a 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/Patient.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/Patient.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.supervision.handler.StringListTypeHandler; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -28,36 +29,43 @@ public class Patient implements Serializable { /** * 病人名称 */ + @ApiModelProperty("病人名称") private String name; /** * 性别 0男 1女 */ + @ApiModelProperty("性别 0男 1女") private Integer gender; /** * 病人年龄 */ + @ApiModelProperty("病人年龄") private Integer age; /** * 症状 */ + @ApiModelProperty("症状") private String symptoms; /** * 身高 */ + @ApiModelProperty("身高") private BigDecimal height; /** * 体重 */ + @ApiModelProperty("体重") private BigDecimal weight; /** * 疾病列表 */ + @ApiModelProperty("疾病列表") @TableField(typeHandler = StringListTypeHandler.class) private List diseaseList; diff --git a/virtual-patient-model/src/main/java/com/supervision/model/Process.java b/virtual-patient-model/src/main/java/com/supervision/model/Process.java index e496fcc8..9a8f32df 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/Process.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/Process.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -24,16 +26,19 @@ public class Process implements Serializable { /** * 病人ID */ + @ApiModelProperty("病人ID") private String patientId; /** * 用户ID */ + @ApiModelProperty("用户ID") private String userId; /** * 任务状态 0进行中 1已完成 */ + @ApiModelProperty("任务状态 0进行中 1已完成") private Integer status; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/User.java b/virtual-patient-model/src/main/java/com/supervision/model/User.java index 9dd7103c..c0ebe1a3 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/User.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/User.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -24,21 +26,25 @@ public class User implements Serializable { /** * 用户账户 */ + @ApiModelProperty("用户账户") private String account; /** * 用户名称 */ + @ApiModelProperty("用户名称") private String name; /** * 用户密码 */ + @ApiModelProperty("用户密码") private String password; /** * 用户角色编码，0管理员 1普通用户 */ + @ApiModelProperty("用户角色编码，0管理员 1普通用户") private String roleCode; /** diff --git a/virtual-patient-model/src/main/resources/mapper/ConfigAncillaryItemMapper.xml b/virtual-patient-model/src/main/resources/mapper/ConfigAncillaryItemMapper.xml index ff83bd49..9649f835 100644 --- a/virtual-patient-model/src/main/resources/mapper/ConfigAncillaryItemMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/ConfigAncillaryItemMapper.xml @@ -5,20 +5,23 @@ - - - - - - - - - - + + + + + + + + + + + - id,item_class,item_name, + id + ,type,item_class,item_name, info,create_user_id,create_time, update_user_id,update_time diff --git a/virtual-patient-model/src/main/resources/mapper/ConfigPhysicalLocationMapper.xml b/virtual-patient-model/src/main/resources/mapper/ConfigPhysicalLocationMapper.xml index 5d548380..5a0c6558 100644 --- a/virtual-patient-model/src/main/resources/mapper/ConfigPhysicalLocationMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/ConfigPhysicalLocationMapper.xml @@ -5,18 +5,19 @@ - - - - - - - - + + + + + + + + - id,code,location_class, + id + ,code,location_class location_name,create_user_id,create_time, update_user_id,update_time diff --git a/virtual-patient-model/src/main/resources/mapper/ConfigPhysicalToolMapper.xml b/virtual-patient-model/src/main/resources/mapper/ConfigPhysicalToolMapper.xml index f65668af..900b4747 100644 --- a/virtual-patient-model/src/main/resources/mapper/ConfigPhysicalToolMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/ConfigPhysicalToolMapper.xml @@ -6,7 +6,7 @@ - + @@ -20,7 +20,7 @@ id - ,tool_class,code, + ,type,code, tool_name,require_location,create_user_id, create_time,update_user_id,update_time diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/AskAncillaryController.java b/virtual-patient-web/src/main/java/com/supervision/controller/AskAncillaryController.java index 7c062527..e0ab2998 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/AskAncillaryController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/AskAncillaryController.java @@ -1,5 +1,7 @@ package com.supervision.controller; +import com.supervision.model.ConfigAncillaryItem; +import com.supervision.model.ConfigPhysicalLocation; import com.supervision.model.DiagnosisAncillaryRecord; import com.supervision.pojo.vo.AskAncillaryResultReqVO; import com.supervision.service.AskAncillaryService; @@ -10,6 +12,9 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; +import java.util.Map; + @Api(tags = "辅助检查") @RestController @RequestMapping("askAncillary") @@ -18,9 +23,18 @@ public class AskAncillaryController { private final AskAncillaryService askAncillaryService; + @ApiOperation("查询辅助检查项目列表") + @GetMapping("queryAncillaryItemList") + public Map> queryAncillaryItemList(){ + return askAncillaryService.queryAncillaryItemList(); + } + + @ApiOperation("查询辅助检查的结果") @GetMapping("queryAskAncillaryResult") public DiagnosisAncillaryRecord queryAskAncillaryResult(AskAncillaryResultReqVO reqVO){ return askAncillaryService.queryAskAncillaryResult(reqVO); } + + } diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/AskPhysicalController.java b/virtual-patient-web/src/main/java/com/supervision/controller/AskPhysicalController.java index 2c6b4b71..d5344ed4 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/AskPhysicalController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/AskPhysicalController.java @@ -1,15 +1,23 @@ package com.supervision.controller; +import com.supervision.model.ConfigPhysicalLocation; +import com.supervision.model.ConfigPhysicalTool; import com.supervision.model.DiagnosisPhysicalRecord; import com.supervision.pojo.vo.AskPhysicalResultReqVO; import com.supervision.service.AskPhysicalService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; +import java.util.Map; + +@Api(tags = "体格检查") @RestController @RequestMapping("askPhysical") @RequiredArgsConstructor @@ -18,6 +26,12 @@ public class AskPhysicalController { private final AskPhysicalService askPhysicalService; + @ApiOperation("查询体格检查的工具列表") + @GetMapping("queryPhysicalToolList") + public Map> queryPhysicalToolList() { + return askPhysicalService.queryPhysicalToolList(); + } + @ApiOperation("查询体格检查的结果") @GetMapping("queryAskPhysicalResult") public DiagnosisPhysicalRecord queryAskPhysicalResult(AskPhysicalResultReqVO reqVO) { diff --git a/virtual-patient-web/src/main/java/com/supervision/paddlespeech/dto/req/AsrReqDTO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/paddlespeech/req/AsrReqDTO.java similarity index 87% rename from virtual-patient-web/src/main/java/com/supervision/paddlespeech/dto/req/AsrReqDTO.java rename to virtual-patient-web/src/main/java/com/supervision/pojo/paddlespeech/req/AsrReqDTO.java index 902cc710..a5d49703 100644 --- a/virtual-patient-web/src/main/java/com/supervision/paddlespeech/dto/req/AsrReqDTO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/paddlespeech/req/AsrReqDTO.java @@ -1,4 +1,4 @@ -package com.supervision.paddlespeech.dto.req; +package com.supervision.pojo.paddlespeech.req; import lombok.Data; diff --git a/virtual-patient-web/src/main/java/com/supervision/paddlespeech/dto/req/TtsReqDTO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/paddlespeech/req/TtsReqDTO.java similarity index 90% rename from virtual-patient-web/src/main/java/com/supervision/paddlespeech/dto/req/TtsReqDTO.java rename to virtual-patient-web/src/main/java/com/supervision/pojo/paddlespeech/req/TtsReqDTO.java index d3f96e55..aac30cc4 100644 --- a/virtual-patient-web/src/main/java/com/supervision/paddlespeech/dto/req/TtsReqDTO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/paddlespeech/req/TtsReqDTO.java @@ -1,4 +1,4 @@ -package com.supervision.paddlespeech.dto.req; +package com.supervision.pojo.paddlespeech.req; import lombok.Data; diff --git a/virtual-patient-web/src/main/java/com/supervision/paddlespeech/dto/res/AsrResultDTO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/paddlespeech/res/AsrResultDTO.java similarity index 66% rename from virtual-patient-web/src/main/java/com/supervision/paddlespeech/dto/res/AsrResultDTO.java rename to virtual-patient-web/src/main/java/com/supervision/pojo/paddlespeech/res/AsrResultDTO.java index 85563f4b..d1803872 100644 --- a/virtual-patient-web/src/main/java/com/supervision/paddlespeech/dto/res/AsrResultDTO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/paddlespeech/res/AsrResultDTO.java @@ -1,4 +1,4 @@ -package com.supervision.paddlespeech.dto.res; +package com.supervision.pojo.paddlespeech.res; import lombok.Data; diff --git a/virtual-patient-web/src/main/java/com/supervision/paddlespeech/dto/res/PaddleSpeechResDTO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/paddlespeech/res/PaddleSpeechResDTO.java similarity index 78% rename from virtual-patient-web/src/main/java/com/supervision/paddlespeech/dto/res/PaddleSpeechResDTO.java rename to virtual-patient-web/src/main/java/com/supervision/pojo/paddlespeech/res/PaddleSpeechResDTO.java index a56c4fa6..61601377 100644 --- a/virtual-patient-web/src/main/java/com/supervision/paddlespeech/dto/res/PaddleSpeechResDTO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/paddlespeech/res/PaddleSpeechResDTO.java @@ -1,4 +1,4 @@ -package com.supervision.paddlespeech.dto.res; +package com.supervision.pojo.paddlespeech.res; import lombok.Data; diff --git a/virtual-patient-web/src/main/java/com/supervision/paddlespeech/dto/res/TtsResultDTO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/paddlespeech/res/TtsResultDTO.java similarity index 85% rename from virtual-patient-web/src/main/java/com/supervision/paddlespeech/dto/res/TtsResultDTO.java rename to virtual-patient-web/src/main/java/com/supervision/pojo/paddlespeech/res/TtsResultDTO.java index f6f7c22c..07d75b0a 100644 --- a/virtual-patient-web/src/main/java/com/supervision/paddlespeech/dto/res/TtsResultDTO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/paddlespeech/res/TtsResultDTO.java @@ -1,4 +1,4 @@ -package com.supervision.paddlespeech.dto.res; +package com.supervision.pojo.paddlespeech.res; import lombok.Data; diff --git a/virtual-patient-web/src/main/java/com/supervision/rasa/dto/train/DomainYmlTemplate.java b/virtual-patient-web/src/main/java/com/supervision/pojo/rasa/train/DomainYmlTemplate.java similarity index 92% rename from virtual-patient-web/src/main/java/com/supervision/rasa/dto/train/DomainYmlTemplate.java rename to virtual-patient-web/src/main/java/com/supervision/pojo/rasa/train/DomainYmlTemplate.java index 418164b3..40a3b314 100644 --- a/virtual-patient-web/src/main/java/com/supervision/rasa/dto/train/DomainYmlTemplate.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/rasa/train/DomainYmlTemplate.java @@ -1,4 +1,4 @@ -package com.supervision.rasa.dto.train; +package com.supervision.pojo.rasa.train; import lombok.Data; diff --git a/virtual-patient-web/src/main/java/com/supervision/rasa/dto/train/NluYmlTemplate.java b/virtual-patient-web/src/main/java/com/supervision/pojo/rasa/train/NluYmlTemplate.java similarity index 88% rename from virtual-patient-web/src/main/java/com/supervision/rasa/dto/train/NluYmlTemplate.java rename to virtual-patient-web/src/main/java/com/supervision/pojo/rasa/train/NluYmlTemplate.java index b2a7f689..2bb9c3af 100644 --- a/virtual-patient-web/src/main/java/com/supervision/rasa/dto/train/NluYmlTemplate.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/rasa/train/NluYmlTemplate.java @@ -1,4 +1,4 @@ -package com.supervision.rasa.dto.train; +package com.supervision.pojo.rasa.train; import lombok.Data; import org.yaml.snakeyaml.nodes.Tag; diff --git a/virtual-patient-web/src/main/java/com/supervision/rasa/dto/train/QuestionAnswerDTO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/rasa/train/QuestionAnswerDTO.java similarity index 87% rename from virtual-patient-web/src/main/java/com/supervision/rasa/dto/train/QuestionAnswerDTO.java rename to virtual-patient-web/src/main/java/com/supervision/pojo/rasa/train/QuestionAnswerDTO.java index f79a8439..7a337a19 100644 --- a/virtual-patient-web/src/main/java/com/supervision/rasa/dto/train/QuestionAnswerDTO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/rasa/train/QuestionAnswerDTO.java @@ -1,4 +1,4 @@ -package com.supervision.rasa.dto.train; +package com.supervision.pojo.rasa.train; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/virtual-patient-web/src/main/java/com/supervision/rasa/dto/train/RuleYmlTemplate.java b/virtual-patient-web/src/main/java/com/supervision/pojo/rasa/train/RuleYmlTemplate.java similarity index 94% rename from virtual-patient-web/src/main/java/com/supervision/rasa/dto/train/RuleYmlTemplate.java rename to virtual-patient-web/src/main/java/com/supervision/pojo/rasa/train/RuleYmlTemplate.java index a690fdca..69e3906e 100644 --- a/virtual-patient-web/src/main/java/com/supervision/rasa/dto/train/RuleYmlTemplate.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/rasa/train/RuleYmlTemplate.java @@ -1,4 +1,4 @@ -package com.supervision.rasa.dto.train; +package com.supervision.pojo.rasa.train; import cn.hutool.core.map.MapUtil; import lombok.AllArgsConstructor; diff --git a/virtual-patient-web/src/main/java/com/supervision/rasa/dto/RasaReqDTO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/rasa/train/dto/RasaReqDTO.java similarity index 71% rename from virtual-patient-web/src/main/java/com/supervision/rasa/dto/RasaReqDTO.java rename to virtual-patient-web/src/main/java/com/supervision/pojo/rasa/train/dto/RasaReqDTO.java index 1daef8d9..09908cea 100644 --- a/virtual-patient-web/src/main/java/com/supervision/rasa/dto/RasaReqDTO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/rasa/train/dto/RasaReqDTO.java @@ -1,4 +1,4 @@ -package com.supervision.rasa.dto; +package com.supervision.pojo.rasa.train.dto; import lombok.Data; diff --git a/virtual-patient-web/src/main/java/com/supervision/rasa/dto/RasaResDTO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/rasa/train/dto/RasaResDTO.java similarity index 72% rename from virtual-patient-web/src/main/java/com/supervision/rasa/dto/RasaResDTO.java rename to virtual-patient-web/src/main/java/com/supervision/pojo/rasa/train/dto/RasaResDTO.java index 5f1042e8..f27bb4ec 100644 --- a/virtual-patient-web/src/main/java/com/supervision/rasa/dto/RasaResDTO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/rasa/train/dto/RasaResDTO.java @@ -1,4 +1,4 @@ -package com.supervision.rasa.dto; +package com.supervision.pojo.rasa.train.dto; import lombok.Data; diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/AncillaryListReqVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/AncillaryListReqVO.java new file mode 100644 index 00000000..fe55948c --- /dev/null +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/AncillaryListReqVO.java @@ -0,0 +1,14 @@ +package com.supervision.pojo.vo; + +import com.supervision.model.ConfigAncillaryItem; +import lombok.Data; + +import java.util.List; + +@Data +public class AncillaryListReqVO { + + private String className; + + private List ancillaryItemList; +} 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 b0a206d4..8e94f146 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 @@ -7,8 +7,8 @@ import javax.validation.constraints.NotBlank; @Data public class AskAncillaryResultReqVO { - @NotBlank(message = "辅助检查工具名称不能为空") - private String itemName; + @NotBlank(message = "辅助检查工具ID不能为空") + private String itemId; @NotBlank(message = "流程ID不能为空") private String processId; 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 90bc371b..aa2233d9 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 @@ -1,5 +1,6 @@ package com.supervision.pojo.vo; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -7,10 +8,11 @@ import javax.validation.constraints.NotBlank; @Data public class AskPhysicalResultReqVO { - @NotBlank(message = "体格检查工具名称不能为空") - private String toolName; + @NotBlank(message = "体格检查工具ID不能为空") + private String toolId; - private String locationName; + @ApiModelProperty("位置编码") + private String locationCode; @NotBlank(message = "流程ID不能为空") private String processId; diff --git a/virtual-patient-web/src/main/java/com/supervision/service/AskAncillaryService.java b/virtual-patient-web/src/main/java/com/supervision/service/AskAncillaryService.java index bbbbd0e3..1dea17c0 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/AskAncillaryService.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/AskAncillaryService.java @@ -1,9 +1,17 @@ package com.supervision.service; +import com.supervision.model.ConfigAncillaryItem; +import com.supervision.model.ConfigPhysicalLocation; import com.supervision.model.DiagnosisAncillaryRecord; import com.supervision.pojo.vo.AskAncillaryResultReqVO; +import java.util.List; +import java.util.Map; + public interface AskAncillaryService { + Map> queryAncillaryItemList(); + + DiagnosisAncillaryRecord queryAskAncillaryResult(AskAncillaryResultReqVO reqVO); } diff --git a/virtual-patient-web/src/main/java/com/supervision/service/AskPhysicalService.java b/virtual-patient-web/src/main/java/com/supervision/service/AskPhysicalService.java index 17f22609..f1c4d499 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/AskPhysicalService.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/AskPhysicalService.java @@ -1,9 +1,17 @@ package com.supervision.service; +import com.supervision.model.ConfigPhysicalLocation; +import com.supervision.model.ConfigPhysicalTool; import com.supervision.model.DiagnosisPhysicalRecord; import com.supervision.pojo.vo.AskPhysicalResultReqVO; +import java.util.List; +import java.util.Map; + public interface AskPhysicalService { + Map> queryPhysicalToolList(); + + DiagnosisPhysicalRecord queryAskPhysicalResult(AskPhysicalResultReqVO reqVO); } diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskAncillaryServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskAncillaryServiceImpl.java index c6c99945..27b54b1d 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskAncillaryServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskAncillaryServiceImpl.java @@ -1,17 +1,18 @@ package com.supervision.service.impl; +import cn.hutool.core.collection.CollUtil; import com.supervision.exception.BusinessException; -import com.supervision.model.ConfigAncillaryItem; -import com.supervision.model.DiagnosisAncillaryRecord; -import com.supervision.model.DiseaseAncillary; +import com.supervision.model.*; import com.supervision.model.Process; import com.supervision.pojo.vo.AskAncillaryResultReqVO; import com.supervision.service.*; import com.supervision.util.UserUtil; import lombok.RequiredArgsConstructor; +import org.apache.commons.collections4.SetUtils; import org.springframework.stereotype.Service; -import java.util.Optional; +import java.util.*; +import java.util.stream.Collectors; @Service @RequiredArgsConstructor @@ -23,15 +24,21 @@ public class AskAncillaryServiceImpl implements AskAncillaryService { private final ConfigAncillaryItemService ancillaryItemService; + private final ConfigPhysicalLocationService configPhysicalLocationService; + + @Override + public Map> queryAncillaryItemList() { + List list = ancillaryItemService.lambdaQuery().list(); + return list.stream().collect(Collectors.groupingBy(ConfigAncillaryItem::getType)); + } + @Override public DiagnosisAncillaryRecord queryAskAncillaryResult(AskAncillaryResultReqVO reqVO) { // 首先根据process_id查新到流程ID Process process = Optional.ofNullable(processService.getById(reqVO.getProcessId())).orElseThrow(() -> new BusinessException("未找到流程ID")); - // 找到对应的项目 - ConfigAncillaryItem ancillaryItem = ancillaryItemService.lambdaQuery().eq(ConfigAncillaryItem::getItemName, reqVO.getItemName()).last("limit 1") - .oneOpt().orElseThrow(() -> new BusinessException("未找到对应的辅助工具")); + // 找到对应的项目的检查结果 - DiseaseAncillary diseaseAncillary = diseaseAncillaryService.lambdaQuery().eq(DiseaseAncillary::getPatientId, process.getPatientId()).eq(DiseaseAncillary::getItemId, ancillaryItem.getId()) + DiseaseAncillary diseaseAncillary = diseaseAncillaryService.lambdaQuery().eq(DiseaseAncillary::getPatientId, process.getPatientId()).eq(DiseaseAncillary::getItemId, reqVO.getItemId()) .oneOpt().orElseGet(() -> { DiseaseAncillary get = new DiseaseAncillary(); get.setResult("无相关资讯"); @@ -39,7 +46,7 @@ public class AskAncillaryServiceImpl implements AskAncillaryService { }); DiagnosisAncillaryRecord record = new DiagnosisAncillaryRecord(); record.setProcessId(process.getId()); - record.setItemId(ancillaryItem.getId()); + record.setItemId(reqVO.getItemId()); record.setValue(diseaseAncillary.getResult()); record.setCreateUserId(UserUtil.getUser().getId()); record.setUpdateUserId(UserUtil.getUser().getId()); diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPhysicalServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPhysicalServiceImpl.java index 474ede32..816e4880 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPhysicalServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPhysicalServiceImpl.java @@ -8,9 +8,13 @@ import com.supervision.pojo.vo.AskPhysicalResultReqVO; import com.supervision.service.*; import com.supervision.util.UserUtil; import lombok.RequiredArgsConstructor; +import org.apache.commons.collections4.SetUtils; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Map; import java.util.Optional; +import java.util.stream.Collectors; @Service @RequiredArgsConstructor @@ -24,16 +28,21 @@ public class AskPhysicalServiceImpl implements AskPhysicalService { private final ProcessService processService; + @Override + public Map> queryPhysicalToolList() { + List list = toolService.lambdaQuery().list(); + return list.stream().collect(Collectors.groupingBy(ConfigPhysicalTool::getType)); + } + @Override public DiagnosisPhysicalRecord queryAskPhysicalResult(AskPhysicalResultReqVO reqVO) { // 首先根据process_id查新到流程ID Process process = Optional.ofNullable(processService.getById(reqVO.getProcessId())).orElseThrow(() -> new BusinessException("未找到流程ID")); - ConfigPhysicalTool tool = toolService.lambdaQuery().eq(ConfigPhysicalTool::getToolName, reqVO.getToolName()).last("limit 1") - .oneOpt().orElseThrow(() -> new BusinessException("工具不支持")); + ConfigPhysicalTool tool = Optional.ofNullable(toolService.getById(reqVO.getToolId())).orElseThrow(() -> new BusinessException("工具不支持")); // 是否需要具体的部位,0否1是 String locationId = null; if (1 == tool.getRequireLocation()){ - ConfigPhysicalLocation location = locationService.lambdaQuery().eq(ConfigPhysicalLocation::getLocationName, reqVO.getLocationName()).last("limit 1") + ConfigPhysicalLocation location = locationService.lambdaQuery().eq(ConfigPhysicalLocation::getCode, reqVO.getLocationCode()).last("limit 1") .oneOpt().orElseThrow(() -> new BusinessException("为找到对应部位")); locationId = location.getId(); } diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskServiceImpl.java index 9b78e5b9..c776479a 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskServiceImpl.java @@ -3,10 +3,9 @@ package com.supervision.service.impl; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.supervision.exception.BusinessException; -import com.supervision.model.User; -import com.supervision.paddlespeech.AsrUtil; -import com.supervision.paddlespeech.TtsUtil; -import com.supervision.rasa.RasaUtil; +import com.supervision.util.AsrUtil; +import com.supervision.util.TtsUtil; +import com.supervision.util.RasaUtil; import com.supervision.service.AskService; import com.supervision.util.UserUtil; import com.supervision.websocket.cache.WebSocketUserCache; diff --git a/virtual-patient-web/src/main/java/com/supervision/paddlespeech/AsrUtil.java b/virtual-patient-web/src/main/java/com/supervision/util/AsrUtil.java similarity index 85% rename from virtual-patient-web/src/main/java/com/supervision/paddlespeech/AsrUtil.java rename to virtual-patient-web/src/main/java/com/supervision/util/AsrUtil.java index bbaa4253..9afc7f0f 100644 --- a/virtual-patient-web/src/main/java/com/supervision/paddlespeech/AsrUtil.java +++ b/virtual-patient-web/src/main/java/com/supervision/util/AsrUtil.java @@ -1,4 +1,4 @@ -package com.supervision.paddlespeech; +package com.supervision.util; import cn.hutool.core.codec.Base64; import cn.hutool.core.util.ObjectUtil; @@ -7,10 +7,9 @@ import cn.hutool.json.JSONUtil; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.supervision.exception.BusinessException; -import com.supervision.paddlespeech.dto.req.AsrReqDTO; -import com.supervision.paddlespeech.dto.res.AsrResultDTO; -import com.supervision.paddlespeech.dto.res.PaddleSpeechResDTO; -import com.supervision.util.SpringBeanUtil; +import com.supervision.pojo.paddlespeech.req.AsrReqDTO; +import com.supervision.pojo.paddlespeech.res.AsrResultDTO; +import com.supervision.pojo.paddlespeech.res.PaddleSpeechResDTO; import org.springframework.core.env.Environment; public class AsrUtil { diff --git a/virtual-patient-web/src/main/java/com/supervision/rasa/RasaUtil.java b/virtual-patient-web/src/main/java/com/supervision/util/RasaUtil.java similarity index 82% rename from virtual-patient-web/src/main/java/com/supervision/rasa/RasaUtil.java rename to virtual-patient-web/src/main/java/com/supervision/util/RasaUtil.java index bd653df6..0aba82dc 100644 --- a/virtual-patient-web/src/main/java/com/supervision/rasa/RasaUtil.java +++ b/virtual-patient-web/src/main/java/com/supervision/util/RasaUtil.java @@ -1,10 +1,9 @@ -package com.supervision.rasa; +package com.supervision.util; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; -import com.supervision.rasa.dto.RasaReqDTO; -import com.supervision.rasa.dto.RasaResDTO; -import com.supervision.util.SpringBeanUtil; +import com.supervision.pojo.rasa.train.dto.RasaReqDTO; +import com.supervision.pojo.rasa.train.dto.RasaResDTO; import org.springframework.core.env.Environment; import java.util.List; diff --git a/virtual-patient-web/src/main/java/com/supervision/paddlespeech/TtsUtil.java b/virtual-patient-web/src/main/java/com/supervision/util/TtsUtil.java similarity index 82% rename from virtual-patient-web/src/main/java/com/supervision/paddlespeech/TtsUtil.java rename to virtual-patient-web/src/main/java/com/supervision/util/TtsUtil.java index 776e7b14..b591dc50 100644 --- a/virtual-patient-web/src/main/java/com/supervision/paddlespeech/TtsUtil.java +++ b/virtual-patient-web/src/main/java/com/supervision/util/TtsUtil.java @@ -1,4 +1,4 @@ -package com.supervision.paddlespeech; +package com.supervision.util; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpUtil; @@ -6,10 +6,9 @@ import cn.hutool.json.JSONUtil; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.supervision.exception.BusinessException; -import com.supervision.paddlespeech.dto.req.TtsReqDTO; -import com.supervision.paddlespeech.dto.res.PaddleSpeechResDTO; -import com.supervision.paddlespeech.dto.res.TtsResultDTO; -import com.supervision.util.SpringBeanUtil; +import com.supervision.pojo.paddlespeech.req.TtsReqDTO; +import com.supervision.pojo.paddlespeech.res.PaddleSpeechResDTO; +import com.supervision.pojo.paddlespeech.res.TtsResultDTO; import org.springframework.core.env.Environment; public class TtsUtil {