manage：代码结构调整

virtual-patient-manage/src/main/java/com/supervision/manage/controller/AskQuestionLibraryManageController.java

@@ -0,0 +1,33 @@
+package com.supervision.manage.controller;
+
+
+import com.supervision.manage.service.AskQuestionLibraryManageService;
+import com.supervision.model.DiseaseAncillary;
+import com.supervision.vo.manage.AskQuestionLibraryReqVo;
+import com.supervision.vo.manage.AskQuestionLibraryResVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Api(tags = "问题库管理")
+@RestController
+@RequestMapping("aqLibrary")
+@RequiredArgsConstructor
+public class AskQuestionLibraryManageController {
+
+    private final AskQuestionLibraryManageService askQuestionLibraryManageService;
+    @ApiOperation("查询问题库列表")
+    @PostMapping("/queryList")
+    public List<AskQuestionLibraryResVo> queryList(AskQuestionLibraryReqVo askQuestionLibraryReqVo) {
+
+        return askQuestionLibraryManageService.queryList(askQuestionLibraryReqVo);
+
+    }
+
+}

virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseAncillaryManageController.java

@@ -20,16 +20,16 @@ public class DiseaseAncillaryManageController {
    private final DiseaseAncillaryManageService diseaseAncillaryManageService;
 
     @ApiOperation("新增辅助检查信息")
-    @GetMapping("/save")
-    public String saveAncillary(DiseaseAncillary diseaseAncillary) {
+    @PostMapping("/save")
+    public String saveAncillary(@RequestBody DiseaseAncillary diseaseAncillary) {
 
         DiseaseAncillary result = diseaseAncillaryManageService.saveAncillary(diseaseAncillary);
-        return result.getDiseaseId();
+        return result.getId();
 
     }
 
 
-    @ApiOperation("删除疾病")
+    @ApiOperation("删除疾病辅助检查信息")
     @DeleteMapping("/delete")
     public boolean deleteDiseaseAncillary(String id) {
 
@@ -40,7 +40,7 @@ public class DiseaseAncillaryManageController {
 
     @ApiOperation("修改辅助检查信息")
     @PutMapping("/update")
-    public boolean updateAncillary(DiseaseAncillary diseaseAncillary) {
+    public boolean updateAncillary(@RequestBody DiseaseAncillary diseaseAncillary) {
 
         return diseaseAncillaryManageService.updateAncillary(diseaseAncillary);
 

virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseasePhysicalManageController.java

@@ -2,7 +2,6 @@ package com.supervision.manage.controller;
 
 
 import com.supervision.manage.service.DiseasePhysicalManageService;
-import com.supervision.service.DiseasePhysicalService;
 import com.supervision.vo.manage.DiseasePhysicalResVo;
 import com.supervision.model.DiseasePhysical;
 import io.swagger.annotations.Api;
@@ -21,28 +20,27 @@ public class DiseasePhysicalManageController {
 
     private final DiseasePhysicalManageService diseasePhysicalManageService;
 
-    @ApiOperation("保存体格检查信息")
+    @ApiOperation("新增体格检查信息")
     @PostMapping("/save")
-    public String savePhysical(DiseasePhysical diseasePhysical) {
-
-        return null;
+    public String savePhysical(@RequestBody DiseasePhysical diseasePhysical) {
 
+        DiseasePhysical result = diseasePhysicalManageService.savePhysical(diseasePhysical);
+        return result.getId();
     }
 
     @ApiOperation("删除体格检查")
     @DeleteMapping("/delete")
-    public String deletePhysical(@RequestParam String id) {
-
+    public boolean deletePhysical(@RequestParam String id) {
 
-        return "id";
+        return diseasePhysicalManageService.deletePhysical(id);
 
     }
 
-    @ApiOperation("修改辅助检查信息")
+    @ApiOperation("修改体格检查信息")
     @PutMapping("/update")
-    public String updatePhysical(DiseasePhysical diseasePhysical) {
+    public boolean updatePhysical(@RequestBody DiseasePhysical diseasePhysical) {
 
-        return null;
+        return diseasePhysicalManageService.updatePhysical(diseasePhysical);
 
     }
 

virtual-patient-manage/src/main/java/com/supervision/manage/service/AskQuestionLibraryManageService.java

@@ -0,0 +1,10 @@
+package com.supervision.manage.service;
+
+import com.supervision.vo.manage.AskQuestionLibraryReqVo;
+import com.supervision.vo.manage.AskQuestionLibraryResVo;
+
+import java.util.List;
+
+public interface AskQuestionLibraryManageService {
+    List<AskQuestionLibraryResVo> queryList(AskQuestionLibraryReqVo askQuestionLibraryReqVo);
+}

virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseasePhysicalManageService.java

@@ -1,5 +1,6 @@
 package com.supervision.manage.service;
 
+import com.supervision.model.DiseasePhysical;
 import com.supervision.vo.manage.DiseasePhysicalResVo;
 
 import java.util.List;
@@ -7,4 +8,10 @@ import java.util.List;
 public interface DiseasePhysicalManageService {
 
     List<DiseasePhysicalResVo> queryListByDiseaseId(String diseaseId);
+
+    DiseasePhysical savePhysical(DiseasePhysical diseasePhysical);
+
+    boolean deletePhysical(String id);
+
+    boolean updatePhysical(DiseasePhysical diseasePhysical);
 }

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AskQuestionLibraryManageServiceImpl.java

@@ -0,0 +1,23 @@
+package com.supervision.manage.service.impl;
+
+import com.supervision.manage.service.AskQuestionLibraryManageService;
+import com.supervision.service.AskTemplateQuestionLibraryService;
+import com.supervision.vo.manage.AskQuestionLibraryReqVo;
+import com.supervision.vo.manage.AskQuestionLibraryResVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class AskQuestionLibraryManageServiceImpl implements AskQuestionLibraryManageService {
+
+    private final AskTemplateQuestionLibraryService askTemplateQuestionLibraryService;
+    @Override
+    public List<AskQuestionLibraryResVo> queryList(AskQuestionLibraryReqVo askQuestionLibraryReqVo) {
+
+
+        return askTemplateQuestionLibraryService.queryList(askQuestionLibraryReqVo);
+    }
+}

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseAncillaryManageServiceImpl.java

@@ -14,13 +14,13 @@ import java.util.List;
 @RequiredArgsConstructor
 public class DiseaseAncillaryManageServiceImpl implements DiseaseAncillaryManageService {
 
-    private DiseaseAncillaryService diseaseAncillaryService;
+    private final DiseaseAncillaryService diseaseAncillaryService;
 
     @Override
     public List<DiseaseAncillaryResVo> queryListByDiseaseId(String diseaseId) {
 
-        /*diseaseAncillaryService.getBaseMapper().queryListByDiseaseId();*/
-        return null;
+        Assert.isTrue(StrUtil.isNotEmpty(diseaseId),"diseaseId不能为空");
+        return diseaseAncillaryService.queryListByDiseaseId(diseaseId);
     }
 
     @Override
@@ -36,7 +36,7 @@ public class DiseaseAncillaryManageServiceImpl implements DiseaseAncillaryManage
     @Override
     public boolean deleteDiseaseAncillary(String id) {
 
-        Assert.isTrue(StrUtil.isEmpty(id),"id 不允许为空");
+        Assert.isTrue(StrUtil.isNotEmpty(id),"id 不允许为空");
 
         return diseaseAncillaryService.removeById(id);
     }
@@ -44,7 +44,7 @@ public class DiseaseAncillaryManageServiceImpl implements DiseaseAncillaryManage
     @Override
     public boolean updateAncillary(DiseaseAncillary diseaseAncillary) {
 
-        Assert.isTrue(StrUtil.isEmpty(diseaseAncillary.getId()),"id 不允许为空");
+        Assert.isTrue(StrUtil.isNotEmpty(diseaseAncillary.getId()),"id 不允许为空");
 
         return diseaseAncillaryService.updateById(diseaseAncillary);
     }
@@ -54,21 +54,21 @@ public class DiseaseAncillaryManageServiceImpl implements DiseaseAncillaryManage
 
         Assert.isTrue(StrUtil.isNotEmpty(diseaseAncillary.getDiseaseId()),"疾病id不能为空");
 
-        Assert.isNull(diseaseAncillary.getPrimarilyDiagnosisCriteriaFlag(),"初步诊断依据不能为空");
+        Assert.notNull(diseaseAncillary.getPrimarilyDiagnosisCriteriaFlag(),"初步诊断依据不能为空");
 
-        Assert.isNull(diseaseAncillary.getBasisConfirmFlag(),"证实诊断依据不能为空");
+        Assert.notNull(diseaseAncillary.getBasisConfirmFlag(),"证实诊断依据不能为空");
 
-        Assert.isNull(diseaseAncillary.getBasisIdentificationFlag(),"鉴别诊断依据不能为空");
+        Assert.notNull(diseaseAncillary.getBasisIdentificationFlag(),"鉴别诊断依据不能为空");
 
-        Assert.isNull(diseaseAncillary.getFullCheckFlag(),"全面诊断不能为空");
+        Assert.notNull(diseaseAncillary.getFullCheckFlag(),"全面诊断不能为空");
 
-        Assert.isNull(diseaseAncillary.getDiagnosisAssessmentFlag(),"判断不能为空");
+        Assert.notNull(diseaseAncillary.getDiagnosisAssessmentFlag(),"判断不能为空");
 
-        Assert.isNull(diseaseAncillary.getRequireCheckFlag(),"是否必查不能为空");
+        Assert.notNull(diseaseAncillary.getRequireCheckFlag(),"是否必查不能为空");
 
-        Assert.isNull(diseaseAncillary.getDiagnosisAssessmentFlag(),"判断不能为空");
+        Assert.notNull(diseaseAncillary.getDiagnosisAssessmentFlag(),"判断不能为空");
 
-        Assert.isNull(diseaseAncillary.getExpectedDiagnosisResult(),"预期诊断结果不能为空");
+        Assert.notNull(diseaseAncillary.getExpectedDiagnosisResult(),"预期诊断结果不能为空");
 
     }
 }

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseasePhysicalManageServiceImpl.java

@@ -1,6 +1,11 @@
 package com.supervision.manage.service.impl;
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.StrUtil;
 import com.supervision.manage.service.DiseasePhysicalManageService;
+import com.supervision.model.DiseaseAncillary;
+import com.supervision.model.DiseasePhysical;
+import com.supervision.service.DiseasePhysicalService;
 import com.supervision.vo.manage.DiseasePhysicalResVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -10,11 +15,62 @@ import java.util.List;
 @RequiredArgsConstructor
 public class DiseasePhysicalManageServiceImpl implements DiseasePhysicalManageService {
 
+    private final DiseasePhysicalService diseasePhysicalService;
 
 
     @Override
     public List<DiseasePhysicalResVo> queryListByDiseaseId(String diseaseId) {
-        return null;
+
+        Assert.isTrue(StrUtil.isNotEmpty(diseaseId),"id不能为空");
+
+        return diseasePhysicalService.queryListByDiseaseId(diseaseId);
+    }
+
+    @Override
+    public DiseasePhysical savePhysical(DiseasePhysical diseasePhysical) {
+
+        assertDiseasePhysical(diseasePhysical);
+
+        diseasePhysicalService.save(diseasePhysical);
+
+        return diseasePhysical;
+    }
+
+    @Override
+    public boolean deletePhysical(String id) {
+        Assert.isTrue(StrUtil.isNotEmpty(id),"id不能为空");
+
+        return diseasePhysicalService.removeById(id);
+    }
+
+    @Override
+    public boolean updatePhysical(DiseasePhysical diseasePhysical) {
+        Assert.isTrue(StrUtil.isNotEmpty(diseasePhysical.getDiseaseId()),"疾病id不能为空");
+
+        return diseasePhysicalService.updateById(diseasePhysical);
+    }
+
+
+    private void assertDiseasePhysical(DiseasePhysical diseasePhysical){
+
+        Assert.isTrue(StrUtil.isNotEmpty(diseasePhysical.getDiseaseId()),"疾病id不能为空");
+
+        Assert.notNull(diseasePhysical.getPrimarilyDiagnosisCriteriaFlag(),"初步诊断依据不能为空");
+
+        Assert.notNull(diseasePhysical.getBasisConfirmFlag(),"证实诊断依据不能为空");
+
+        Assert.notNull(diseasePhysical.getBasisIdentificationFlag(),"鉴别诊断依据不能为空");
+
+        Assert.notNull(diseasePhysical.getFullCheckFlag(),"全面诊断不能为空");
+
+        Assert.notNull(diseasePhysical.getDiagnosisAssessmentFlag(),"判断不能为空");
+
+        Assert.notNull(diseasePhysical.getRequireCheckFlag(),"是否必查不能为空");
+
+        Assert.notNull(diseasePhysical.getDiagnosisAssessmentFlag(),"判断不能为空");
+
+        Assert.notNull(diseasePhysical.getExpectedDiagnosisResult(),"预期诊断结果不能为空");
+
     }
 
 }

virtual-patient-model/src/main/java/com/supervision/mapper/AskTemplateQuestionLibraryMapper.java

@@ -2,6 +2,11 @@ package com.supervision.mapper;
 
 import com.supervision.model.AskTemplateQuestionLibrary;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.supervision.vo.manage.AskQuestionLibraryReqVo;
+import com.supervision.vo.manage.AskQuestionLibraryResVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
 * @author flevance
@@ -11,6 +16,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface AskTemplateQuestionLibraryMapper extends BaseMapper<AskTemplateQuestionLibrary> {
 
+    List<AskQuestionLibraryResVo> queryList(@Param("askQuestionLibrary")AskQuestionLibraryReqVo askQuestionLibraryReqVo);
 }
 
 

virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseAncillaryMapper.java

@@ -19,7 +19,7 @@ public interface DiseaseAncillaryMapper extends BaseMapper<DiseaseAncillary> {
     List<DiseaseAncillaryDto> queryDiseaseAncillaryDtoList(@Param("diseaseAncillary")DiseaseAncillary diseaseAncillary);
 
 
-    List<DiseaseAncillaryResVo> queryListByDiseaseId(String diseaseId);
+    List<DiseaseAncillaryResVo> queryListByDiseaseId(@Param("diseaseId")String diseaseId);
 
 }
 

virtual-patient-model/src/main/java/com/supervision/mapper/DiseasePhysicalMapper.java

@@ -2,6 +2,10 @@ package com.supervision.mapper;
 
 import com.supervision.model.DiseasePhysical;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.supervision.vo.manage.DiseasePhysicalResVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
 * @author flevance
@@ -11,6 +15,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface DiseasePhysicalMapper extends BaseMapper<DiseasePhysical> {
 
+    List<DiseasePhysicalResVo> queryListByDiseaseId(@Param("diseaseId") String diseaseId);
+
 }
 
 

virtual-patient-model/src/main/java/com/supervision/model/DiseaseAncillary.java

@@ -46,7 +46,7 @@ public class DiseaseAncillary implements Serializable {
     @ApiModelProperty("是否是鉴别依据(0否1是)")
     private Integer basisIdentificationFlag;
 
-    @ApiModelProperty("全面检查")
+    @ApiModelProperty("全面检查 0否1是")
     private Integer fullCheckFlag;
 
     @ApiModelProperty("是否诊断判读 0否1是")

virtual-patient-model/src/main/java/com/supervision/service/AskTemplateQuestionLibraryService.java

@@ -2,6 +2,10 @@ package com.supervision.service;
 
 import com.supervision.model.AskTemplateQuestionLibrary;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.supervision.vo.manage.AskQuestionLibraryReqVo;
+import com.supervision.vo.manage.AskQuestionLibraryResVo;
+
+import java.util.List;
 
 /**
 * @author flevance
@@ -10,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface AskTemplateQuestionLibraryService extends IService<AskTemplateQuestionLibrary> {
 
+    List<AskQuestionLibraryResVo> queryList(AskQuestionLibraryReqVo askQuestionLibraryReqVo);
 }

virtual-patient-model/src/main/java/com/supervision/service/DiseaseAncillaryService.java

@@ -1,8 +1,6 @@
 package com.supervision.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.supervision.dto.DiseaseAncillaryDto;
-import com.supervision.model.Disease;
 import com.supervision.model.DiseaseAncillary;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.supervision.vo.manage.DiseaseAncillaryResVo;
@@ -22,4 +20,7 @@ public interface DiseaseAncillaryService extends IService<DiseaseAncillary> {
 
     DiseaseAncillaryDto queryDiseaseAncillaryDtoOne(DiseaseAncillary diseaseAncillary, Supplier<DiseaseAncillaryDto> other);
 
+    List<DiseaseAncillaryResVo> queryListByDiseaseId(String diseaseId);
+
+
 }

virtual-patient-model/src/main/java/com/supervision/service/DiseasePhysicalService.java

@@ -15,4 +15,5 @@ import java.util.List;
 */
 public interface DiseasePhysicalService extends IService<DiseasePhysical> {
 
+    List<DiseasePhysicalResVo> queryListByDiseaseId(String diseaseId);
 }

virtual-patient-model/src/main/java/com/supervision/service/impl/AskTemplateQuestionLibraryServiceImpl.java

@@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.supervision.model.AskTemplateQuestionLibrary;
 import com.supervision.service.AskTemplateQuestionLibraryService;
 import com.supervision.mapper.AskTemplateQuestionLibraryMapper;
+import com.supervision.vo.manage.AskQuestionLibraryReqVo;
+import com.supervision.vo.manage.AskQuestionLibraryResVo;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
 * @author flevance
 * @description 针对表【vp_ask_template_question_library(诊断问询意图问题库)】的数据库操作Service实现
@@ -15,6 +19,11 @@ import org.springframework.stereotype.Service;
 public class AskTemplateQuestionLibraryServiceImpl extends ServiceImpl<AskTemplateQuestionLibraryMapper, AskTemplateQuestionLibrary>
     implements AskTemplateQuestionLibraryService{
 
+    @Override
+    public List<AskQuestionLibraryResVo> queryList(AskQuestionLibraryReqVo askQuestionLibraryReqVo) {
+
+        return super.getBaseMapper().queryList(askQuestionLibraryReqVo);
+    }
 }
 
 

virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseAncillaryServiceImpl.java

@@ -48,6 +48,10 @@ public class DiseaseAncillaryServiceImpl extends ServiceImpl<DiseaseAncillaryMap
         return diseaseAncillaryDtos.get(0);
     }
 
+    @Override
+    public List<DiseaseAncillaryResVo> queryListByDiseaseId(String diseaseId) {
+        return super.getBaseMapper().queryListByDiseaseId(diseaseId);
+    }
 
 
 }

virtual-patient-model/src/main/java/com/supervision/service/impl/DiseasePhysicalServiceImpl.java

@@ -20,6 +20,11 @@ import java.util.List;
 public class DiseasePhysicalServiceImpl extends ServiceImpl<DiseasePhysicalMapper, DiseasePhysical>
     implements DiseasePhysicalService{
 
+    @Override
+    public List<DiseasePhysicalResVo> queryListByDiseaseId(String diseaseId) {
+
+        return super.getBaseMapper().queryListByDiseaseId(diseaseId);
+    }
 }
 
 

virtual-patient-model/src/main/java/com/supervision/vo/manage/AskQuestionLibraryReqVo.java

@@ -0,0 +1,12 @@
+package com.supervision.vo.manage;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AskQuestionLibraryReqVo {
+
+    @ApiModelProperty("编码")
+    private String code;
+
+}

virtual-patient-model/src/main/java/com/supervision/vo/manage/AskQuestionLibraryResVo.java

@@ -0,0 +1,25 @@
+package com.supervision.vo.manage;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AskQuestionLibraryResVo {
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("编码")
+    private String code;
+
+    @ApiModelProperty("问题类目id")
+    private String dictId;
+
+    @ApiModelProperty("问题")
+    private List<String> question;
+
+    @ApiModelProperty("问题类目名")
+    private String nameZhPath;
+}

virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseAncillaryResVo.java

@@ -2,7 +2,11 @@ package com.supervision.vo.manage;
 
 import com.supervision.model.DiseaseAncillary;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class DiseaseAncillaryResVo extends DiseaseAncillary {
 
     @ApiModelProperty("项目名称")

virtual-patient-model/src/main/resources/mapper/AskTemplateQuestionLibraryMapper.xml

@@ -24,4 +24,28 @@
         question,default_answer,create_user_id,
         create_time,update_user_id,update_time
     </sql>
+
+
+    <resultMap id="askQuestionLibraryResultMap" type="com.supervision.vo.manage.AskQuestionLibraryResVo">
+        <id property="id" column="id" />
+        <result property="code" column="code" />
+        <result property="dictId" column="dictId" />
+        <result property="question" column="question" typeHandler="com.supervision.handler.StringListTypeHandler" />
+        <result property="nameZhPath" column="nameZhPath" />
+    </resultMap>
+
+    <select id="queryList" resultMap="askQuestionLibraryResultMap" parameterType="com.supervision.vo.manage.AskQuestionLibraryReqVo">
+        select atql.id as id,
+               atql.code as code,
+               atql.dict_id as dictId,
+               atql.question as question,
+               cd.name_zh_path as nameZhPath
+        from vp_ask_template_question_library atql
+                left join vp_common_dic cd on atql.dict_id = cd.id
+        <where>
+            <if test="askQuestionLibrary.code != null and askQuestionLibrary.code !=  '' ">
+                AND cd.code = #{askQuestionLibrary.code}
+            </if>
+        </where>
+    </select>
 </mapper>

virtual-patient-model/src/main/resources/mapper/DiseaseAncillaryMapper.xml

@@ -57,7 +57,22 @@
     </select>
 
     <select id="queryListByDiseaseId" resultType="com.supervision.vo.manage.DiseaseAncillaryResVo">
-
+        select da.id,
+               da.disease_id                        as diseaseId,
+               da.item_id                           as itemId,
+               cai.item_name                        as itemName,
+               da.primarily_diagnosis_criteria_flag as primarilyDiagnosisCriteriaFlag,
+               da.basis_confirm_flag                as basisConfirmFlag,
+               da.basis_identification_flag         as basisIdentificationFlag,
+               da.full_check_flag                   as fullCheckFlag,
+               da.diagnosis_assessment_flag         as diagnosisAssessmentFlag,
+               da.expected_diagnosis_result         as expectedDiagnosisResult,
+               da.require_check_flag                   asrequireCheckFlag,
+               da.result                            as result,
+               da.description                       as description
+        from vp_disease_ancillary da
+                 left join vp_config_ancillary_item cai on da.item_id = cai.id
+        where da.disease_id = #{diseaseId} order by da.create_time desc
     </select>
 
 </mapper>

virtual-patient-model/src/main/resources/mapper/DiseasePhysicalMapper.xml

@@ -32,4 +32,24 @@
         create_user_id,create_time,update_user_id,
         update_time
     </sql>
+
+    <select id="queryListByDiseaseId" resultType="com.supervision.vo.manage.DiseasePhysicalResVo">
+        select dp.id,
+               dp.disease_id                        as diseaseId,
+               dp.tool_id                           as itemId,
+               dp.location_id                       as locationId,
+               cpt.tool_name                        as toolName,
+               dp.primarily_diagnosis_criteria_flag as primarilyDiagnosisCriteriaFlag,
+               dp.basis_confirm_flag                as basisConfirmFlag,
+               dp.basis_identification_flag         as basisIdentificationFlag,
+               dp.full_check_flag                   as fullCheckFlag,
+               dp.diagnosis_assessment_flag         as diagnosisAssessmentFlag,
+               dp.expected_diagnosis_result         as expectedDiagnosisResult,
+               dp.require_check_flag                as asrequireCheckFlag,
+               dp.result                            as result,
+               dp.trait                             as trait
+        from vp_disease_physical dp
+                 left join vp_config_physical_tool cpt on dp.tool_id = cpt.id
+        where dp.disease_id = #{diseaseId} order by dp.create_time desc
+    </select>
 </mapper>