From 41f2a9282dad1843b47f6729d10cf607a7bfccb8 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Thu, 23 Nov 2023 15:03:36 +0800 Subject: [PATCH] =?UTF-8?q?manage=EF=BC=9A=E4=BB=A3=E7=A0=81=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/controller/DiseaseController.java | 36 ++++++++++--------- .../controller/TreatmentPlanController.java | 2 -- .../supervision/model/DiseaseAncillary.java | 17 ++++----- .../supervision/model/DiseasePhysical.java | 27 +++++++------- .../mapper/DiseaseAncillaryMapper.xml | 7 ++-- .../mapper/DiseasePhysicalMapper.xml | 4 +-- 6 files changed, 47 insertions(+), 46 deletions(-) diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseController.java index 663bfe4b..2063219d 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseController.java @@ -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 queryPagePhysicalList(DiseaseVo diseaseVo) { + public List 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 saveAncillary(DiseaseVo diseaseVo) { + public String saveAncillary(DiseaseAncillary diseaseAncillary) { return null; @@ -69,7 +67,9 @@ public class DiseaseController { @ApiOperation("分页查询疾病辅助检查列表信息") @GetMapping("/queryPageAncillaryList") - public List queryPageAncillaryList(DiseaseVo diseaseVo) { + public List 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 saveQuestionList(DiseaseVo diseaseVo) { + public String saveQuestionList(DiseaseQuestionRelation diseaseQuestionRelation) { return null; @@ -85,7 +85,9 @@ public class DiseaseController { @ApiOperation("分页查询疾病问题库信息") @GetMapping("/queryPageQuestionList") - public List queryPageQuestionList(DiseaseVo diseaseVo) { + public List 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 saveTreatmentPlan(DiseaseVo diseaseVo) { + public String saveTreatmentPlan(DiseaseTreatmentPlan diseaseTreatmentPlan) { return null; @@ -102,7 +104,9 @@ public class DiseaseController { @ApiOperation("分页查询疾病处置信息") @GetMapping("/queryPageTreatmentPlanList") - public List queryPageTreatmentPlanList(DiseaseVo diseaseVo) { + public List queryPageTreatmentPlanList(@RequestParam(defaultValue = "1") Integer pageNum, + @RequestParam(defaultValue = "1") Integer pageSize, + @RequestParam DiseaseTreatmentPlan diseaseTreatmentPlan) { return null; diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/TreatmentPlanController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/TreatmentPlanController.java index 26f74162..2cf5350f 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/TreatmentPlanController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/TreatmentPlanController.java @@ -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 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 da82418e..657b3751 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 @@ -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; + /** * 结果 */ 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 d7eb492c..77b11555 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 @@ -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; - /** * 结果 */ diff --git a/virtual-patient-model/src/main/resources/mapper/DiseaseAncillaryMapper.xml b/virtual-patient-model/src/main/resources/mapper/DiseaseAncillaryMapper.xml index ff7df21a..0dc28222 100644 --- a/virtual-patient-model/src/main/resources/mapper/DiseaseAncillaryMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/DiseaseAncillaryMapper.xml @@ -9,8 +9,9 @@ - - + + + @@ -23,7 +24,7 @@ - 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 diff --git a/virtual-patient-model/src/main/resources/mapper/DiseasePhysicalMapper.xml b/virtual-patient-model/src/main/resources/mapper/DiseasePhysicalMapper.xml index a9c6c1fb..d91d9f94 100644 --- a/virtual-patient-model/src/main/resources/mapper/DiseasePhysicalMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/DiseasePhysicalMapper.xml @@ -11,8 +11,8 @@ - - + +