manage:代码结构调整

dev_2.0.0
xueqingkun 1 year ago
parent b607d93da1
commit 41f2a9282d

@ -1,19 +1,15 @@
package com.supervision.manage.controller;
import cn.hutool.core.util.StrUtil;
import com.supervision.exception.BusinessException;
import com.supervision.manage.pojo.vo.DiseaseVo;
import com.supervision.model.DiseaseAncillary;
import com.supervision.model.DiseasePhysical;
import com.supervision.model.DiseaseQuestionRelation;
import com.supervision.model.DiseaseTreatmentPlan;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
@Api(tags = "疾病管理")
@RestController
@ -43,7 +39,7 @@ public class DiseaseController {
@ApiOperation("保存体格检查信息")
@PostMapping("/savePhysical")
public String savePhysical(DiseaseVo diseaseVo) {
public String savePhysical(DiseasePhysical diseasePhysical) {
return null;
@ -51,7 +47,9 @@ public class DiseaseController {
@ApiOperation("分页查询疾病体格检查列表信息")
@GetMapping("/queryPagePhysicalList")
public List<DiseaseVo> queryPagePhysicalList(DiseaseVo diseaseVo) {
public List<DiseaseVo> queryPagePhysicalList(@RequestParam(defaultValue = "1")Integer pageNum,
@RequestParam(defaultValue = "1")Integer pageSize,
@RequestParam DiseasePhysical diseasePhysical) {
return null;
@ -60,7 +58,7 @@ public class DiseaseController {
@ApiOperation("保存辅助检查信息")
@GetMapping("/saveAncillary")
public List<DiseaseVo> saveAncillary(DiseaseVo diseaseVo) {
public String saveAncillary(DiseaseAncillary diseaseAncillary) {
return null;
@ -69,7 +67,9 @@ public class DiseaseController {
@ApiOperation("分页查询疾病辅助检查列表信息")
@GetMapping("/queryPageAncillaryList")
public List<DiseaseVo> queryPageAncillaryList(DiseaseVo diseaseVo) {
public List<DiseaseAncillary> queryPageAncillaryList(@RequestParam(defaultValue = "1") Integer pageNum,
@RequestParam(defaultValue = "1") Integer pageSize,
@RequestParam DiseaseAncillary diseaseAncillary) {
return null;
@ -77,7 +77,7 @@ public class DiseaseController {
@ApiOperation("保存问题库信息")
@GetMapping("/saveQuestionList")
public List<DiseaseVo> saveQuestionList(DiseaseVo diseaseVo) {
public String saveQuestionList(DiseaseQuestionRelation diseaseQuestionRelation) {
return null;
@ -85,7 +85,9 @@ public class DiseaseController {
@ApiOperation("分页查询疾病问题库信息")
@GetMapping("/queryPageQuestionList")
public List<DiseaseVo> queryPageQuestionList(DiseaseVo diseaseVo) {
public List<DiseaseQuestionRelation> queryPageQuestionList(@RequestParam(defaultValue = "1") Integer pageNum,
@RequestParam(defaultValue = "1") Integer pageSize,
@RequestParam DiseaseQuestionRelation diseaseQuestionRelation) {
return null;
@ -93,7 +95,7 @@ public class DiseaseController {
@ApiOperation("保存处置信息")
@GetMapping("/saveTreatmentPlan")
public List<DiseaseVo> saveTreatmentPlan(DiseaseVo diseaseVo) {
public String saveTreatmentPlan(DiseaseTreatmentPlan diseaseTreatmentPlan) {
return null;
@ -102,7 +104,9 @@ public class DiseaseController {
@ApiOperation("分页查询疾病处置信息")
@GetMapping("/queryPageTreatmentPlanList")
public List<DiseaseVo> queryPageTreatmentPlanList(DiseaseVo diseaseVo) {
public List<DiseaseTreatmentPlan> queryPageTreatmentPlanList(@RequestParam(defaultValue = "1") Integer pageNum,
@RequestParam(defaultValue = "1") Integer pageSize,
@RequestParam DiseaseTreatmentPlan diseaseTreatmentPlan) {
return null;

@ -1,7 +1,6 @@
package com.supervision.manage.controller;
import com.supervision.manage.pojo.vo.ConfigTreatmentPlanWrapVo;
import com.supervision.manage.pojo.vo.DiseaseVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@ -10,7 +9,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@Api(tags = "处置计划管理")
@RestController

@ -37,17 +37,14 @@ public class DiseaseAncillary implements Serializable {
@ApiModelProperty("工具ID")
private String itemId;
/**
* -
*/
@ApiModelProperty("是否必查-初步诊断依据(0否1是)")
private Integer requireCheck;
@ApiModelProperty("初步诊断依据(0否1是)")
private Integer isPrimarilyDiagnosisCriteria;
@ApiModelProperty("是否是正式诊断依据(0否1是)")
private Integer basisConfirm;
@ApiModelProperty("是否是证实诊断依据(0否1是)")
private Integer isBasisConfirm;
@ApiModelProperty("是否是鉴别依据(0否1是)")
private Integer basisIdentification;
private Integer isBasisIdentification;
@ApiModelProperty("全面检查")
private Integer isFullCheck;
@ -58,6 +55,10 @@ public class DiseaseAncillary implements Serializable {
@ApiModelProperty("预期诊断结果 0正常 1 不正常")
private Integer expectedDiagnosisResult;
@ApiModelProperty("是否必查(0否1是)")
private Integer requireCheck;
/**
*
*/

@ -28,7 +28,7 @@ public class DiseasePhysical implements Serializable {
/**
* ID
*/
@ApiModelProperty("病历ID")
@ApiModelProperty("疾病id")
private String diseaseId;
/**
* ID
@ -42,20 +42,21 @@ public class DiseasePhysical implements Serializable {
@ApiModelProperty("检查部位ID")
private String locationId;
/**
* -
*/
@ApiModelProperty("是否必查-初步诊断依据(0否1是)")
private Integer requireCheck;
@ApiModelProperty("是否是正式诊断依据(0否1是)")
private Integer basisConfirm;
@ApiModelProperty("初步诊断依据(0否1是)")
private Integer isPrimarilyDiagnosisCriteria;
@ApiModelProperty("是否是证实诊断依据(0否1是)")
private Integer isBasisConfirm;
@ApiModelProperty("是否是鉴别依据(0否1是)")
private Integer basisIdentification;
private Integer isBasisIdentification;
@ApiModelProperty("初步诊断依据")
private Integer isPrimarilyDiagnosisCriteria;
@ApiModelProperty("全面检查 0正常 1 不正常")
private Integer isFullCheck;
@ApiModelProperty("是否必查 (0否1是)")
private Integer requireCheck;
@ApiModelProperty("是否诊断判读 0否1是")
private Integer isDiagnosisAssessment;
@ -63,10 +64,6 @@ public class DiseasePhysical implements Serializable {
@ApiModelProperty("是否预期诊断结果 0正常 1 不正常")
private Integer expectedDiagnosisResult;
@ApiModelProperty("全面检查 0正常 1 不正常")
private Integer isFullCheck;
/**
*
*/

@ -9,8 +9,9 @@
<result property="diseaseId" column="disease_id" jdbcType="VARCHAR"/>
<result property="itemId" column="item_id" jdbcType="VARCHAR"/>
<result property="requireCheck" column="require_check" jdbcType="INTEGER"/>
<result property="basisConfirm" column="basis_confirm" jdbcType="INTEGER"/>
<result property="basisIdentification" column="basis_identification" jdbcType="INTEGER"/>
<result property="isBasisConfirm" column="is_basis_confirm" jdbcType="INTEGER"/>
<result property="isPrimarilyDiagnosisCriteria" column="is_primarily_diagnosis_criteria" jdbcType="INTEGER"/>
<result property="isBasisIdentification" column="is_basis_identification" jdbcType="INTEGER"/>
<result property="isFullCheck" column="is_full_check" jdbcType="INTEGER"/>
<result property="isDiagnosisAssessment" column="is_diagnosis_assessment" jdbcType="INTEGER"/>
<result property="expectedDiagnosisResult" column="expected_diagnosis_result" jdbcType="INTEGER"/>
@ -23,7 +24,7 @@
</resultMap>
<sql id="Base_Column_List">
id,disease_id,item_id,require_check,basis_confirm,basis_identification
id,disease_id,item_id,require_check,is_basis_confirm,is_primarily_diagnosis_criteria,is_basis_identification
,is_full_check,is_diagnosis_assessment,expected_diagnosis_result,
result,description,create_user_id,
create_time,update_user_id,update_time

@ -11,8 +11,8 @@
<result property="locationId" column="location_id" jdbcType="VARCHAR"/>
<result property="requireCheck" column="require_check" jdbcType="INTEGER"/>
<result property="isPrimarilyDiagnosisCriteria" column="is_primarily_diagnosis_criteria" jdbcType="INTEGER"/>
<result property="basisConfirm" column="basis_confirm" jdbcType="INTEGER"/>
<result property="basisIdentification" column="basis_identification" jdbcType="INTEGER"/>
<result property="isBasisConfirm" column="basis_confirm" jdbcType="INTEGER"/>
<result property="isBasisIdentification" column="basis_identification" jdbcType="INTEGER"/>
<result property="isDiagnosisAssessment" column="is_diagnosis_assessment" jdbcType="INTEGER"/>
<result property="expectedDiagnosisResult" column="expected_diagnosis_result" jdbcType="VARCHAR"/>
<result property="isFullCheck" column="is_full_check" jdbcType="INTEGER"/>

Loading…
Cancel
Save