diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseQuestionManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseQuestionManageController.java
index 4d1b6655..bd033070 100644
--- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseQuestionManageController.java
+++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseQuestionManageController.java
@@ -19,21 +19,20 @@ public class DiseaseQuestionManageController {
private final DiseaseQuestionManageService diseaseQuestionManageService;
- @ApiOperation("保存问题库信息")
+ @ApiOperation("保存疾病问题信息")
@PostMapping("/batchSave")
public boolean batchSaveQuestionList(@RequestBody List<DiseaseQuestion> diseaseQuestionList) {
- diseaseQuestionManageService.batchSaveQuestionList(diseaseQuestionList);
+ diseaseQuestionManageService.batchSaveQuestion(diseaseQuestionList);
return true;
}
- @ApiOperation("删除疾病")
+ @ApiOperation("删除疾病问题")
@DeleteMapping("/delete")
- public String deleteDiseaseQuestion(@RequestParam String id) {
+ public boolean deleteDiseaseQuestion(@RequestParam String id) {
-
- return "id";
+ return diseaseQuestionManageService.deleteDiseaseQuestion(id);
}
diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseTreatmentPlanManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseTreatmentPlanManageController.java
index 7dec204a..21f059e1 100644
--- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseTreatmentPlanManageController.java
+++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseTreatmentPlanManageController.java
@@ -2,8 +2,9 @@ package com.supervision.manage.controller.diseasemanage;
import com.supervision.manage.service.DiseaseTreatmentPlanManageService;
+import com.supervision.model.ConfigTreatmentPlan;
import com.supervision.model.DiseaseTreatmentPlan;
-import com.supervision.vo.manage.TreatmentPlanResVo;
+import com.supervision.vo.manage.DiseaseTreatmentPlanResVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -22,20 +23,38 @@ public class DiseaseTreatmentPlanManageController {
@ApiOperation("保存处置信息")
@PostMapping("/save")
- public String saveTreatmentPlan(DiseaseTreatmentPlan diseaseTreatmentPlan) {
-
- return null;
+ public String saveTreatmentPlan(@RequestBody DiseaseTreatmentPlan diseaseTreatmentPlan) {
+ DiseaseTreatmentPlan result = diseaseTreatmentPlanManageService.saveTreatmentPlan(diseaseTreatmentPlan);
+ return result.getId();
}
+ @ApiOperation("批量保存处置信息")
+ @PostMapping("/batchSave")
+ public boolean batchSaveTreatmentPlan(List<DiseaseTreatmentPlan> diseaseTreatmentPlanList) {
+
+ diseaseTreatmentPlanManageService.batchSaveTreatmentPlan(diseaseTreatmentPlanList);
+ return true;
+ }
+
@ApiOperation("根据疾病id查询疾病处置信息列表")
@GetMapping("/queryListByDiseaseId")
- public List<TreatmentPlanResVo> queryListByDiseaseId(String diseaseId) {
+ public List<DiseaseTreatmentPlanResVo> queryListByDiseaseId(String diseaseId) {
return diseaseTreatmentPlanManageService.queryListByDiseaseId(diseaseId);
}
+ @ApiOperation("删除疾病处置计划")
+ @DeleteMapping("/delete")
+ public boolean deleteDiseaseTreatmentPlan(@RequestParam String id) {
+
+ return diseaseTreatmentPlanManageService.deleteDiseaseTreatmentPlan(id);
+
+ }
+ //todo: 查询处置计划树
+
+
}
diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseQuestionManageService.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseQuestionManageService.java
index a94a5540..416731f4 100644
--- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseQuestionManageService.java
+++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseQuestionManageService.java
@@ -9,5 +9,7 @@ public interface DiseaseQuestionManageService {
List<DiseaseQuestionResVo> queryPageByDiseaseId(String diseaseId);
- void batchSaveQuestionList(List<DiseaseQuestion> diseaseQuestionList);
+ void batchSaveQuestion(List<DiseaseQuestion> diseaseQuestionList);
+
+ boolean deleteDiseaseQuestion(String id);
}
diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseTreatmentPlanManageService.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseTreatmentPlanManageService.java
index ac1e779a..0be52284 100644
--- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseTreatmentPlanManageService.java
+++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseTreatmentPlanManageService.java
@@ -1,11 +1,17 @@
package com.supervision.manage.service;
-import com.supervision.vo.manage.TreatmentPlanResVo;
+import com.supervision.model.DiseaseTreatmentPlan;
+import com.supervision.vo.manage.DiseaseTreatmentPlanResVo;
import java.util.List;
public interface DiseaseTreatmentPlanManageService {
- List<TreatmentPlanResVo> queryListByDiseaseId(String diseaseId);
+ List<DiseaseTreatmentPlanResVo> queryListByDiseaseId(String diseaseId);
+ DiseaseTreatmentPlan saveTreatmentPlan(DiseaseTreatmentPlan diseaseTreatmentPlan);
+
+ void batchSaveTreatmentPlan(List<DiseaseTreatmentPlan> diseaseTreatmentPlanList);
+
+ boolean deleteDiseaseTreatmentPlan(String id);
}
diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseQuestionManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseQuestionManageServiceImpl.java
index a504b4d8..21942ca0 100644
--- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseQuestionManageServiceImpl.java
+++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseQuestionManageServiceImpl.java
@@ -1,11 +1,13 @@
package com.supervision.manage.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.conditions.query.LambdaQueryChainWrapper;
import com.supervision.manage.service.DiseaseQuestionManageService;
-import com.supervision.model.AskTemplateQuestionLibrary;
import com.supervision.model.DiseaseQuestion;
import com.supervision.service.AskTemplateQuestionLibraryService;
+import com.supervision.service.DiseaseQuestionService;
import com.supervision.vo.manage.DiseaseQuestionResVo;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -16,24 +18,48 @@ import java.util.List;
@RequiredArgsConstructor
public class DiseaseQuestionManageServiceImpl implements DiseaseQuestionManageService {
- private final AskTemplateQuestionLibraryService askTemplateQuestionLibraryService;
+ private final DiseaseQuestionService diseaseQuestionService;
@Override
public List<DiseaseQuestionResVo> queryPageByDiseaseId(String diseaseId) {
- return null;
+
+ Assert.notEmpty(diseaseId,"diseaseId 不允许为空");
+
+ return diseaseQuestionService.queryPageByDiseaseId(diseaseId);
+ }
+
+ @Override
+ public void batchSaveQuestion(List<DiseaseQuestion> diseaseQuestionList) {
+
+ Assert.notEmpty(diseaseQuestionList,"数据为空");
+ diseaseQuestionList.forEach(this::assertDiseaseQuestion);
+ Assert.isTrue(CollectionUtil.isEmpty(findListByDiseaseIdAndQuestionIdGroup(diseaseQuestionList)),"数据已存在");
+
+ diseaseQuestionService.saveBatch(diseaseQuestionList);
+
}
@Override
- public void batchSaveQuestionList(List<DiseaseQuestion> diseaseQuestionList) {
+ public boolean deleteDiseaseQuestion(String id) {
+
+ Assert.notEmpty(id,"id不允许为空");
+
+ return diseaseQuestionService.removeById(id);
+ }
+
- /*Assert.notEmpty(diseaseQuestionList,"数据为空");
- diseaseQuestionList.forEach(this::assertDiseaseQuestion);*/
- List<AskTemplateQuestionLibrary> list = askTemplateQuestionLibraryService.lambdaQuery().or(
+ private List<DiseaseQuestion> findListByDiseaseIdAndQuestionIdGroup(List<DiseaseQuestion> diseaseQuestionList){
- (t)->askTemplateQuestionLibraryService.lambdaQuery().eq(AskTemplateQuestionLibrary::getCode,"cod")).list();
+ if (CollectionUtil.isEmpty(diseaseQuestionList)){
+ return CollectionUtil.newArrayList();
+ }
- System.out.println("dd");
+ LambdaQueryChainWrapper<DiseaseQuestion> query = diseaseQuestionService.lambdaQuery();
+ diseaseQuestionList.forEach(diseaseQuestion -> query
+ .or(i -> i.eq(DiseaseQuestion::getQuestionId, diseaseQuestion.getDiseaseId())
+ .and(i1 -> i1.eq(DiseaseQuestion::getDiseaseId, diseaseQuestion.getDiseaseId()))));
+ return query.list();
}
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 4c099fd1..cd57248b 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
@@ -1,7 +1,12 @@
package com.supervision.manage.service.impl;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.StrUtil;
import com.supervision.manage.service.DiseaseTreatmentPlanManageService;
-import com.supervision.vo.manage.TreatmentPlanResVo;
+import com.supervision.model.ConfigTreatmentPlan;
+import com.supervision.model.DiseaseTreatmentPlan;
+import com.supervision.service.DiseaseTreatmentPlanService;
+import com.supervision.vo.manage.DiseaseTreatmentPlanResVo;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -9,8 +14,48 @@ import java.util.List;
@Service
@RequiredArgsConstructor
public class DiseaseTreatmentPlanManageServiceImpl implements DiseaseTreatmentPlanManageService {
+
+ private final DiseaseTreatmentPlanService diseaseTreatmentPlanService;
+ @Override
+ public List<DiseaseTreatmentPlanResVo> queryListByDiseaseId(String diseaseId) {
+
+ Assert.notEmpty(diseaseId,"疾病id不能为空");
+ return diseaseTreatmentPlanService.queryListByDiseaseId(diseaseId);
+ }
+
+ @Override
+ public DiseaseTreatmentPlan saveTreatmentPlan(DiseaseTreatmentPlan diseaseTreatmentPlan) {
+
+ assertDiseaseTreatmentPlan(diseaseTreatmentPlan);
+
+ diseaseTreatmentPlanService.save(diseaseTreatmentPlan);
+
+ return diseaseTreatmentPlan;
+
+ }
+
@Override
- public List<TreatmentPlanResVo> queryListByDiseaseId(String diseaseId) {
- return null;
+ public void batchSaveTreatmentPlan(List<DiseaseTreatmentPlan> diseaseTreatmentPlanList) {
+ Assert.notEmpty(diseaseTreatmentPlanList,"数据不能为空");
+ diseaseTreatmentPlanList.forEach(this::assertDiseaseTreatmentPlan);
+
+ diseaseTreatmentPlanService.saveBatch(diseaseTreatmentPlanList);
+ }
+
+ @Override
+ public boolean deleteDiseaseTreatmentPlan(String id) {
+ Assert.notEmpty(id,"id不能为空");
+
+ return diseaseTreatmentPlanService.removeById(id);
+ }
+
+
+ private void assertDiseaseTreatmentPlan(DiseaseTreatmentPlan diseaseTreatmentPlan){
+
+ Assert.isTrue(StrUtil.isEmpty(diseaseTreatmentPlan.getId()),"id需要为空");
+
+ Assert.notEmpty(diseaseTreatmentPlan.getDiseaseId(),"疾病id不能为空");
+
+ Assert.notEmpty(diseaseTreatmentPlan.getPlanId(),"处置计划id不能为空");
}
}
diff --git a/virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseQuestionMapper.java b/virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseQuestionMapper.java
index bfe65cec..348708fd 100644
--- a/virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseQuestionMapper.java
+++ b/virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseQuestionMapper.java
@@ -2,6 +2,10 @@ package com.supervision.mapper;
import com.supervision.model.DiseaseQuestion;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.supervision.vo.manage.DiseaseQuestionResVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* @author Administrator
@@ -11,6 +15,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface DiseaseQuestionMapper extends BaseMapper<DiseaseQuestion> {
+ List<DiseaseQuestionResVo> queryPageByDiseaseId(@Param("diseaseId") String diseaseId);
+
}
diff --git a/virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseTreatmentPlanMapper.java b/virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseTreatmentPlanMapper.java
index ae6a9850..3bbc71bc 100644
--- a/virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseTreatmentPlanMapper.java
+++ b/virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseTreatmentPlanMapper.java
@@ -1,7 +1,12 @@
package com.supervision.mapper;
+import com.supervision.model.ConfigTreatmentPlan;
import com.supervision.model.DiseaseTreatmentPlan;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.supervision.vo.manage.DiseaseTreatmentPlanResVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* @author Administrator
@@ -11,6 +16,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface DiseaseTreatmentPlanMapper extends BaseMapper<DiseaseTreatmentPlan> {
+ List<DiseaseTreatmentPlanResVo> queryListByDiseaseId(@Param("diseaseId") String diseaseId);
}
diff --git a/virtual-patient-model/src/main/java/com/supervision/service/DiseaseQuestionService.java b/virtual-patient-model/src/main/java/com/supervision/service/DiseaseQuestionService.java
index c1add2c3..92ce0dca 100644
--- a/virtual-patient-model/src/main/java/com/supervision/service/DiseaseQuestionService.java
+++ b/virtual-patient-model/src/main/java/com/supervision/service/DiseaseQuestionService.java
@@ -14,5 +14,6 @@ import java.util.List;
*/
public interface DiseaseQuestionService extends IService<DiseaseQuestion> {
+ List<DiseaseQuestionResVo> queryPageByDiseaseId(String diseaseId);
}
diff --git a/virtual-patient-model/src/main/java/com/supervision/service/DiseaseTreatmentPlanService.java b/virtual-patient-model/src/main/java/com/supervision/service/DiseaseTreatmentPlanService.java
index bf331581..83050e6c 100644
--- a/virtual-patient-model/src/main/java/com/supervision/service/DiseaseTreatmentPlanService.java
+++ b/virtual-patient-model/src/main/java/com/supervision/service/DiseaseTreatmentPlanService.java
@@ -1,7 +1,11 @@
package com.supervision.service;
+import com.supervision.model.ConfigTreatmentPlan;
import com.supervision.model.DiseaseTreatmentPlan;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.supervision.vo.manage.DiseaseTreatmentPlanResVo;
+
+import java.util.List;
/**
* @author Administrator
@@ -10,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface DiseaseTreatmentPlanService extends IService<DiseaseTreatmentPlan> {
+ List<DiseaseTreatmentPlanResVo> queryListByDiseaseId(String diseaseId);
}
diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseQuestionServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseQuestionServiceImpl.java
index daed6c24..7e744a8f 100644
--- a/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseQuestionServiceImpl.java
+++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseQuestionServiceImpl.java
@@ -1,6 +1,5 @@
package com.supervision.service.impl;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.supervision.model.DiseaseQuestion;
import com.supervision.service.DiseaseQuestionService;
@@ -19,6 +18,11 @@ import java.util.List;
public class DiseaseQuestionServiceImpl extends ServiceImpl<DiseaseQuestionMapper, DiseaseQuestion>
implements DiseaseQuestionService {
+ @Override
+ public List<DiseaseQuestionResVo> queryPageByDiseaseId(String diseaseId) {
+
+ return super.getBaseMapper().queryPageByDiseaseId(diseaseId);
+ }
}
diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseTreatmentPlanServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseTreatmentPlanServiceImpl.java
index 742c6e40..2feb40a9 100644
--- a/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseTreatmentPlanServiceImpl.java
+++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseTreatmentPlanServiceImpl.java
@@ -1,11 +1,15 @@
package com.supervision.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.supervision.model.ConfigTreatmentPlan;
import com.supervision.model.DiseaseTreatmentPlan;
import com.supervision.service.DiseaseTreatmentPlanService;
import com.supervision.mapper.DiseaseTreatmentPlanMapper;
+import com.supervision.vo.manage.DiseaseTreatmentPlanResVo;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
* @author Administrator
* @description 针对表【vp_disease_treatmen_relation(疾病处置计划关联表)】的数据库操作Service实现
@@ -14,6 +18,11 @@ import org.springframework.stereotype.Service;
@Service
public class DiseaseTreatmentPlanServiceImpl extends ServiceImpl<DiseaseTreatmentPlanMapper, DiseaseTreatmentPlan>
implements DiseaseTreatmentPlanService {
+ @Override
+ public List<DiseaseTreatmentPlanResVo> queryListByDiseaseId(String diseaseId) {
+
+ return super.getBaseMapper().queryListByDiseaseId(diseaseId);
+ }
}
diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseQuestionResVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseQuestionResVo.java
index 9d04e844..a79f54da 100644
--- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseQuestionResVo.java
+++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseQuestionResVo.java
@@ -12,11 +12,17 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
public class DiseaseQuestionResVo extends DiseaseQuestion {
+ @ApiModelProperty("类目编码")
+ private String itemCode;
+
@ApiModelProperty("类目名称")
- private String item;
+ private String itemName;
@ApiModelProperty("问题列表")
private List<String> questionList;
+ @ApiModelProperty("回答内容")
+ private String answer;
+
}
diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseTreatmentPlanResVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseTreatmentPlanResVo.java
new file mode 100644
index 00000000..552787cc
--- /dev/null
+++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseTreatmentPlanResVo.java
@@ -0,0 +1,18 @@
+package com.supervision.vo.manage;
+
+import com.supervision.model.ConfigTreatmentPlan;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DiseaseTreatmentPlanResVo extends ConfigTreatmentPlan {
+
+
+ @ApiModelProperty("主键")
+ private String id;
+
+
+
+}
diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/TreatmentPlanResVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/TreatmentPlanResVo.java
deleted file mode 100644
index 615e1e7d..00000000
--- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/TreatmentPlanResVo.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.supervision.vo.manage;
-
-import com.supervision.model.ConfigTreatmentPlan;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class TreatmentPlanResVo extends ConfigTreatmentPlan {
-
- @ApiModelProperty("处置计划名称")
- private String disposalPlanName;
-
- @ApiModelProperty("处置计划名称")
- private String firstMeasuresName;
-
- @ApiModelProperty("处置计划名称")
- private String secondMeasuresName;
-
- @ApiModelProperty("处置计划名称")
- private String disposalMethodName;
-
-
-}
diff --git a/virtual-patient-model/src/main/resources/mapper/DiseaseQuestionMapper.xml b/virtual-patient-model/src/main/resources/mapper/DiseaseQuestionMapper.xml
index 155ad104..6c118ab6 100644
--- a/virtual-patient-model/src/main/resources/mapper/DiseaseQuestionMapper.xml
+++ b/virtual-patient-model/src/main/resources/mapper/DiseaseQuestionMapper.xml
@@ -19,4 +19,21 @@
create_user_id,create_time,update_user_id,
update_time
</sql>
+
+
+ <resultMap id="queryPageByDiseaseIdResultMap" type="com.supervision.vo.manage.DiseaseQuestionResVo">
+ <result property="questionList" column="questionList" jdbcType="ARRAY" typeHandler="com.supervision.handler.StringListTypeHandler"/>
+ </resultMap>
+
+ <select id="queryPageByDiseaseId" resultMap="queryPageByDiseaseIdResultMap">
+ select dq.id as id,
+ atql.question as questionList,
+ atql.default_answer as answer,
+ cd.code as itemCode,
+ cd.name_zh_path as itemName
+ from vp_disease_question dq
+ left join vp_ask_template_question_library atql on dq.question_id = atql.id
+ left join vp_common_dic cd on atql.dict_id = cd.id
+ where dq.disease_id = #{diseaseId} order by dq.create_time desc;
+ </select>
</mapper>
diff --git a/virtual-patient-model/src/main/resources/mapper/DiseaseTreatmentPlanMapper.xml b/virtual-patient-model/src/main/resources/mapper/DiseaseTreatmentPlanMapper.xml
index 6afe4200..b6e80f46 100644
--- a/virtual-patient-model/src/main/resources/mapper/DiseaseTreatmentPlanMapper.xml
+++ b/virtual-patient-model/src/main/resources/mapper/DiseaseTreatmentPlanMapper.xml
@@ -19,4 +19,29 @@
,disease_id,plan_id,create_user_id,
create_time,update_user_id,update_time
</sql>
+
+
+ <resultMap id="queryListByDiseaseIdResultMap" type="com.supervision.vo.manage.DiseaseTreatmentPlanResVo">
+ <result property="diseaseId" column="disease_id" jdbcType="VARCHAR"/>
+ <result property="planId" column="planId" jdbcType="VARCHAR"/>
+ <result property="disposalPlan" column="disposalPlan" jdbcType="VARCHAR"/>
+ <result property="disposalMethod" column="disposalMethod" jdbcType="VARCHAR"/>
+ <result property="secondMeasures" column="secondMeasures" jdbcType="VARCHAR"/>
+ <result property="recommendedMedication" column="recommendedMedication" jdbcType="ARRAY" typeHandler="com.supervision.handler.StringListTypeHandler"/>
+ </resultMap>
+
+ <select id="queryListByDiseaseId" resultMap="queryListByDiseaseIdResultMap">
+ select
+ dtp.id as id,
+ dtp.disease_id as diseaseId,
+ ctp.disposal_plan as disposalPlan,
+ ctp.disposal_method as disposalMethod,
+ ctp.first_measures as firstMeasures,
+ ctp.second_measures as secondMeasures,
+ ctp.recommended_medication as recommendedMedication
+
+ from vp_disease_treatment_plan dtp
+ left join vp_config_treatment_plan ctp on dtp.plan_id = ctp.id
+ where dtp.disease_id = #{diseaseId}
+ </select>
</mapper>