Yaxin
/
virtual-patient
31
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1: 恢复表vp_disease_ancillary、vp_disease_physical、vp_disease_treatment_plan中的类型字段

Browse Source
dev_3.1.0
xueqingkun 10 months ago
parent a169445647
commit 45a8d91721
27 changed files with 138 additions and 105 deletions
Show Stats Download Patch File Download Diff File

97
docker/v3.1.0/step1.sql
Unescape Escape View File

@ -4,14 +4,6 @@ alter table vp_medical_rec
alter table vp_ask_template_question_library
add type int default 1 null comment '问题类型 1标准问 2自定义问题' after standard_question
-- 在诊断关联表中添加关系类型字段
alter table vp_disease_ancillary
add relation_type integer default 0 null comment '关系类型 0:关联疾病 1:关联病历 当类型为1是 disease_id代表的是vp_medical_rec表中的id' after require_check_flag;
alter table vp_disease_physical
add relation_type integer default 0 null comment '关系类型 0:关联疾病 1:关联病历 当类型为1是 disease_id代表的是vp_medical_rec表中的id' after require_check_flag;
alter table vp_disease_treatment_plan
add relation_type integer default 0 null comment '关系类型 0:关联疾病 1:关联病历 当类型为1是 disease_id代表的是vp_medical_rec表中的id' after treatment_plan_id;
-- 病历扩展项
create table vp_medical_extend_item
(
@ -31,4 +23,91 @@ create table vp_medical_extend_item
alter table vp_medical_rec
add medical_type integer null comment '病历类型 0：普通型 1:学习型 3：考核型' after no;
alter table vp_medical_rec
add disposal_diagnosis varchar(1024) null comment '处置诊断' after differential_diagnosis_criteria;
add disposal_diagnosis varchar(1024) null comment '处置诊断' after differential_diagnosis_criteria;
-- 病历体格检查
create table vp_medical_rec_physical
(
id varchar(64) not null comment '主键'
primary key,
medical_rec_id varchar(64) null comment '病历id',
tool_id varchar(64) null comment '工具ID',
location_id varchar(64) null comment '检查部位ID',
result text null comment '结果',
normal_result varchar(1024) null comment '正常结果',
trait varchar(255) null comment '表征 默认诊断结果（诊断结果）',
primarily_diagnosis_criteria_flag int default 0 null comment '是否初步诊断依据(0否1是)',
basis_confirm_flag int default 0 null comment '是否是证实诊断依据(0否1是)',
basis_identification_flag int default 0 null comment '是否是鉴别依据(0否1是)',
full_check_flag int null comment '全面检查 0正常 1 不正常',
diagnosis_assessment_flag int null comment '是否诊断判读(0不需要 1需要)',
expected_diagnosis_result int null comment '预期诊断结果 0正常 1 不正常',
location_diagnosis_flag int null comment '部位诊断结果标识 0正常 1 不正常',
require_check_flag int null comment '是否必查-初步诊断依据(0否1是)',
create_user_id varchar(64) null comment '创建人ID',
create_time datetime default CURRENT_TIMESTAMP null comment '创建时间',
update_user_id varchar(64) null comment '更新人',
update_time datetime null on update CURRENT_TIMESTAMP comment '更新时间'
)
comment '病历体格检查' charset = utf8
row_format = DYNAMIC;
-- 病历辅助检查
create table vp_medical_rec_ancillary
(
id varchar(64) not null comment '主键'
primary key,
medical_rec_id varchar(64) null comment '病历id',
item_id varchar(64) null comment '工具ID',
result text null comment '结果',
normal_result varchar(1024) null comment '正常结果',
description varchar(255) null comment '说明',
primarily_diagnosis_criteria_flag int default 0 null comment '是否是初步检查(0否1是)',
basis_confirm_flag int default 0 null comment '是否是证实诊断依据(0否1是)',
basis_identification_flag int default 0 null comment '是否是鉴别依据(0否1是)',
full_check_flag int null comment '是否全面检查(0否1是)',
diagnosis_assessment_flag int null comment '是否诊断判读 0不需要 1需要',
expected_diagnosis_result int null comment '预期诊断结果 0正常 1 不正常',
require_check_flag int null comment '是否必查-初步诊断依据 0否1是',
create_user_id varchar(64) null comment '创建人ID',
create_time datetime default CURRENT_TIMESTAMP null comment '创建时间',
update_user_id varchar(64) null comment '更新人',
update_time datetime null on update CURRENT_TIMESTAMP comment '更新时间'
)
comment '病历辅助检查' charset = utf8
row_format = DYNAMIC;
-- 病历处置计划关联表
create table vp_medical_rec_treatment_plan
(
id varchar(64) not null comment '主键'
primary key,
medical_rec_id varchar(32) not null comment '病历id',
treatment_plan_id varchar(32) not null comment '处置计划id',
create_user_id varchar(64) null comment '创建人ID',
create_time datetime null comment '创建时间',
update_user_id varchar(64) null comment '更新人',
update_time datetime null comment '更新时间'
)
comment '病历处置计划关联表' collate = utf8mb4_bin
row_format = DYNAMIC;
-- 病历处置计划药物关联表
create table vp_medical_rec_treatment_plan_drug
(
id varchar(64) not null comment '主键id'
primary key,
medical_rec_id varchar(64) not null comment '病历id',
treatment_plan_id varchar(64) not null comment '处置计划id',
disease_treatment_plan_id varchar(64) null comment '疾病处置计划id;初始设计的时候是希望 diseaseId 和 treatmentPlanId 关联 vp_medical_rec_treatment_plan表中的 diseaseId,treatmentPlanId, 后面由于疾病没有使用到treatmentPlanId(统一设置为20)，所以只根据diseaseId，treatmentPlanId无法区分出某一种处置计划对应的药物',
drug_id varchar(64) not null comment '药品id',
create_user_id varchar(64) null comment '创建人id',
create_time datetime default CURRENT_TIMESTAMP null comment '创建时间',
update_user_id varchar(64) null comment '更新人',
update_time datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP comment '更新时间'
)
comment '病历处置计划药物关联表' collate = utf8mb4_bin
row_format = DYNAMIC;

2
virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseAncillaryManageController.java
Unescape Escape View File

@ -55,7 +55,7 @@ public class DiseaseAncillaryManageController {
@GetMapping("/queryListByDiseaseId")
public List<DiseaseAncillaryResVo> queryListByDiseaseId(@RequestParam("diseaseId") String diseaseId) {
return diseaseAncillaryManageService.queryListByDiseaseId(diseaseId,0);
return diseaseAncillaryManageService.queryListByDiseaseId(diseaseId);
}

2
virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseasePhysicalManageController.java
Unescape Escape View File

@ -52,7 +52,7 @@ public class DiseasePhysicalManageController {
@GetMapping("/queryListByDiseaseId")
public List<DiseasePhysicalResVo> queryListByDiseaseId(@RequestParam("diseaseId") String diseaseId) {
return diseasePhysicalManageService.queryListByDiseaseId(diseaseId,0);
return diseasePhysicalManageService.queryListByDiseaseId(diseaseId);
}

2
virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseTreatmentPlanManageController.java
Unescape Escape View File

@ -46,7 +46,7 @@ public class DiseaseTreatmentPlanManageController {
@GetMapping("/queryListByDiseaseId")
public List<DiseaseTreatmentPlanResVo> queryListByDiseaseId(String diseaseId) {
List<DiseaseTreatmentPlanResVo> diseaseTreatmentPlanResVos = diseaseTreatmentPlanManageService.queryListByDiseaseId(diseaseId,0);
List<DiseaseTreatmentPlanResVo> diseaseTreatmentPlanResVos = diseaseTreatmentPlanManageService.queryListByDiseaseId(diseaseId);
// 前端大哥强烈要求把treatmentPlanId 转换为 firstMeasuresId
diseaseTreatmentPlanResVos.forEach(vo -> {
if (CollUtil.isEmpty(vo.getDrugIds())) {

2
virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseAncillaryManageService.java
Unescape Escape View File

@ -9,7 +9,7 @@ import java.util.List;
public interface DiseaseAncillaryManageService {
List<DiseaseAncillaryResVo> queryListByDiseaseId(String diseaseId,Integer relationType);
List<DiseaseAncillaryResVo> queryListByDiseaseId(String diseaseId);
DiseaseAncillary saveAncillary(DiseaseAncillary diseaseAncillary);

3
virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseasePhysicalManageService.java
Unescape Escape View File

@ -3,13 +3,12 @@ package com.supervision.manage.service;
import com.supervision.model.DiseasePhysical;
import com.supervision.vo.manage.DiseasePhysicalLocationNodeVo;
import com.supervision.vo.manage.DiseasePhysicalResVo;
import com.supervision.vo.manage.PhysicalLocationNode;
import java.util.List;
public interface DiseasePhysicalManageService {
List<DiseasePhysicalResVo> queryListByDiseaseId(String diseaseId,Integer relationType);
List<DiseasePhysicalResVo> queryListByDiseaseId(String diseaseId);
DiseasePhysical savePhysical(DiseasePhysical diseasePhysical);

2
virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseTreatmentPlanManageService.java
Unescape Escape View File

@ -9,7 +9,7 @@ import java.util.List;
public interface DiseaseTreatmentPlanManageService {
List<DiseaseTreatmentPlanResVo> queryListByDiseaseId(String diseaseId,Integer relationType);
List<DiseaseTreatmentPlanResVo> queryListByDiseaseId(String diseaseId);
DiseaseTreatmentPlan saveTreatmentPlan(DiseaseTreatmentPlanReqVo diseaseTreatmentPlan);

10
virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseAncillaryManageServiceImpl.java
Unescape Escape View File

@ -29,11 +29,10 @@ public class DiseaseAncillaryManageServiceImpl implements DiseaseAncillaryManage
private final ConfigAncillaryItemService configAncillaryItemService;
@Override
public List<DiseaseAncillaryResVo> queryListByDiseaseId(String diseaseId,Integer relationType) {
public List<DiseaseAncillaryResVo> queryListByDiseaseId(String diseaseId) {
Assert.isTrue(StrUtil.isNotEmpty(diseaseId),"diseaseId不能为空");
relationType = Objects.isNull(relationType) ? 0 : relationType;
List<DiseaseAncillaryResVo> diseaseAncillaryResVos = diseaseAncillaryService.queryListByDiseaseId(diseaseId,relationType);
List<DiseaseAncillaryResVo> diseaseAncillaryResVos = diseaseAncillaryService.queryListByDiseaseId(diseaseId);
diseaseAncillaryResVos.forEach(DiseaseAncillaryResVo::populateOther);
return diseaseAncillaryResVos;
@ -46,9 +45,6 @@ public class DiseaseAncillaryManageServiceImpl implements DiseaseAncillaryManage
Assert.isFalse(checkIfPresent(diseaseAncillary),"数据已存在！");
if (Objects.isNull(diseaseAncillary.getRelationType())){
diseaseAncillary.setRelationType(0);
}
diseaseAncillaryService.save(diseaseAncillary);
return diseaseAncillary;
@ -84,7 +80,7 @@ public class DiseaseAncillaryManageServiceImpl implements DiseaseAncillaryManage
return configAncillaryItemResVOS;
}
List<DiseaseAncillaryResVo> diseaseAncillaryResVos = diseaseAncillaryService.queryListByDiseaseId(ancillaryItemReqVo.getDiseaseId(),0);
List<DiseaseAncillaryResVo> diseaseAncillaryResVos = diseaseAncillaryService.queryListByDiseaseId(ancillaryItemReqVo.getDiseaseId());
if (CollUtil.isEmpty(diseaseAncillaryResVos)){
return configAncillaryItemResVOS;
}

10
virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseasePhysicalManageServiceImpl.java
Unescape Escape View File

@ -37,11 +37,10 @@ public class DiseasePhysicalManageServiceImpl implements DiseasePhysicalManageSe
@Override
public List<DiseasePhysicalResVo> queryListByDiseaseId(String diseaseId,Integer relationType) {
public List<DiseasePhysicalResVo> queryListByDiseaseId(String diseaseId) {
Assert.isTrue(StrUtil.isNotEmpty(diseaseId),"id不能为空");
relationType = Objects.isNull(relationType) ? 0 : relationType;
List<DiseasePhysicalResVo> diseasePhysicalResVos = diseasePhysicalService.queryListByDiseaseId(diseaseId,relationType);
List<DiseasePhysicalResVo> diseasePhysicalResVos = diseasePhysicalService.queryListByDiseaseId(diseaseId);
diseasePhysicalResVos.forEach(DiseasePhysicalResVo::populateOther);
return diseasePhysicalResVos;
@ -51,9 +50,6 @@ public class DiseasePhysicalManageServiceImpl implements DiseasePhysicalManageSe
public DiseasePhysical savePhysical(DiseasePhysical diseasePhysical) {
assertDiseasePhysical(diseasePhysical);
if (Objects.isNull(diseasePhysical.getRelationType())){
diseasePhysical.setRelationType(0);
}
diseasePhysicalService.save(diseasePhysical);
return diseasePhysical;
@ -108,7 +104,7 @@ public class DiseasePhysicalManageServiceImpl implements DiseasePhysicalManageSe
}
// 2. 根据疾病id查询疾病体格检查项
List<DiseasePhysicalResVo> diseasePhysicalResVos = diseasePhysicalService.queryListByDiseaseId(diseaseId,0);
List<DiseasePhysicalResVo> diseasePhysicalResVos = diseasePhysicalService.queryListByDiseaseId(diseaseId);
List<String> locationIds = diseasePhysicalResVos.stream().filter(vo->toolId.equals(vo.getToolId()))
.map(DiseasePhysical::getLocationId).filter(Objects::nonNull).distinct().collect(Collectors.toList());

7
virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java
Unescape Escape View File

@ -44,11 +44,10 @@ public class DiseaseTreatmentPlanManageServiceImpl implements DiseaseTreatmentPl
private final CommonDicService commonDicService;
@Override
public List<DiseaseTreatmentPlanResVo> queryListByDiseaseId(String diseaseId,Integer relationType) {
public List<DiseaseTreatmentPlanResVo> queryListByDiseaseId(String diseaseId) {
Assert.notEmpty(diseaseId,"疾病id不能为空");
relationType = Objects.isNull(relationType) ? 0 : relationType;
List<DiseaseTreatmentPlanResVo> diseaseTreatmentPlanResVos = diseaseTreatmentPlanService.queryListByDiseaseId(diseaseId,relationType);
List<DiseaseTreatmentPlanResVo> diseaseTreatmentPlanResVos = diseaseTreatmentPlanService.queryListByDiseaseId(diseaseId);
if (CollUtil.isEmpty(diseaseTreatmentPlanResVos)){
return diseaseTreatmentPlanResVos;
@ -182,7 +181,7 @@ public class DiseaseTreatmentPlanManageServiceImpl implements DiseaseTreatmentPl
DiseaseTreatmentPlanTreeNode rootNode = new DiseaseTreatmentPlanTreeNode(treatmentPlanTreeNode);
// 2.根据疾病id查询疾病处置计划信息
List<DiseaseTreatmentPlanResVo> diseaseTreatmentPlanResVos = this.queryListByDiseaseId(diseaseId,0);
List<DiseaseTreatmentPlanResVo> diseaseTreatmentPlanResVos = this.queryListByDiseaseId(diseaseId);
// 3. 初始化flag
if (CollUtil.isNotEmpty(diseaseTreatmentPlanResVos)){

31
virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java
Unescape Escape View File

@ -145,17 +145,17 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
@Override
public List<DiseaseAncillaryResVo> queryDiseaseAncillaryByCreat(String diseaseId) {
// 辅助检查
return diseaseAncillaryManageService.queryListByDiseaseId(diseaseId,0);
return diseaseAncillaryManageService.queryListByDiseaseId(diseaseId);
}
@Override
public List<DiseasePhysicalResVo> queryDiseasePhysicalByCreat(String diseaseId) {
return diseasePhysicalManageService.queryListByDiseaseId(diseaseId,0);
return diseasePhysicalManageService.queryListByDiseaseId(diseaseId);
}
@Override
public List<DiseaseTreatmentPlanResVo> queryDiseaseTreatmentPlanByCreat(String diseaseId) {
return diseaseTreatmentPlanManageService.queryListByDiseaseId(diseaseId,0);
return diseaseTreatmentPlanManageService.queryListByDiseaseId(diseaseId);
}
@Override
@ -243,11 +243,11 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
MedicalRecInfoVO medicalRecInfoVO = BeanUtil.toBean(medicalRec, MedicalRecInfoVO.class);
medicalRecInfoVO.setDiseaseName(diseaseService.getById(medicalRec.getDiseaseId()).getDiseaseName());
// 辅助检查
medicalRecInfoVO.setAncillaryList(diseaseAncillaryManageService.queryListByDiseaseId(medicalRec.getDiseaseId(),0));
medicalRecInfoVO.setAncillaryList(diseaseAncillaryManageService.queryListByDiseaseId(medicalRec.getDiseaseId()));
// 体格检查
medicalRecInfoVO.setPhysicalList(diseasePhysicalManageService.queryListByDiseaseId(medicalRec.getDiseaseId(),0));
medicalRecInfoVO.setPhysicalList(diseasePhysicalManageService.queryListByDiseaseId(medicalRec.getDiseaseId()));
// 处置计划
medicalRecInfoVO.setTreatmentPlanList(diseaseTreatmentPlanManageService.queryListByDiseaseId(medicalRec.getDiseaseId(),0));
medicalRecInfoVO.setTreatmentPlanList(diseaseTreatmentPlanManageService.queryListByDiseaseId(medicalRec.getDiseaseId()));
// 问答策略
List<MedicalRecQaVO> medicalRecQaVOS = queryMedicalRecQaInfo(id);
Map<Integer, List<MedicalRecQaVO>> qaListMap = medicalRecQaVOS.stream().collect(Collectors.groupingBy(MedicalRecQaVO::getAnswerType));
@ -472,24 +472,18 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
@Override
public DiseasePhysical saveMedicalRecPhysical(DiseasePhysicalReqVo diseasePhysicalReqVo) {
diseasePhysicalReqVo.setDiseaseId(diseasePhysicalReqVo.getMedicalId());
diseasePhysicalReqVo.setRelationType(1);
return diseasePhysicalManageService.savePhysical(diseasePhysicalReqVo);
}
@Override
public DiseaseAncillary saveMedicalRecAncillary(DiseaseAncillaryReqVo diseaseAncillaryReqVo) {
diseaseAncillaryReqVo.setDiseaseId(diseaseAncillaryReqVo.getMedicalId());
diseaseAncillaryReqVo.setRelationType(1);
return diseaseAncillaryManageService.saveAncillary(diseaseAncillaryReqVo);
}
@Override
public Boolean updateMedicalRecPhysical(DiseasePhysicalReqVo diseasePhysicalReqVo) {
diseasePhysicalReqVo.setDiseaseId(diseasePhysicalReqVo.getMedicalId());
return diseasePhysicalManageService.updatePhysical(diseasePhysicalReqVo);
}
@ -497,14 +491,13 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
@Override
public Boolean updateMedicalRecAncillary(DiseaseAncillaryReqVo diseaseAncillaryReqVo) {
diseaseAncillaryReqVo.setDiseaseId(diseaseAncillaryReqVo.getMedicalId());
return diseaseAncillaryManageService.updateAncillary(diseaseAncillaryReqVo);
}
@Override
public List<DiseaseAncillaryResVo> queryDiseaseAncillary(String medicalRecId) {
// 在病历没有保存病历与辅助检查的关联数据时，直接通过medicalId不能够查询到数据，这个时候使用对应疾病的数据
List<DiseaseAncillaryResVo> diseaseAncillaryResVos = diseaseAncillaryManageService.queryListByDiseaseId(medicalRecId,1);
List<DiseaseAncillaryResVo> diseaseAncillaryResVos = diseaseAncillaryManageService.queryListByDiseaseId(medicalRecId);
if (CollUtil.isNotEmpty(diseaseAncillaryResVos)) {
return diseaseAncillaryResVos;
}
@ -513,13 +506,13 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
Assert.notNull(medicalRec, "未找到该病历");
Assert.notEmpty(medicalRec.getDiseaseId(), "未配置疾病信息");
return diseaseAncillaryManageService.queryListByDiseaseId(medicalRec.getDiseaseId(),0);
return diseaseAncillaryManageService.queryListByDiseaseId(medicalRec.getDiseaseId());
}
@Override
public List<DiseasePhysicalResVo> queryDiseasePhysical(String medicalRecId) {
// 在病历没有保存病历与体格检查的关联数据时，直接通过medicalId不能够查询到数据，这个时候使用对应疾病的数据
List<DiseasePhysicalResVo> diseasePhysicalResVos = diseasePhysicalManageService.queryListByDiseaseId(medicalRecId,1);
List<DiseasePhysicalResVo> diseasePhysicalResVos = diseasePhysicalManageService.queryListByDiseaseId(medicalRecId);
if (CollUtil.isNotEmpty(diseasePhysicalResVos)) {
return diseasePhysicalResVos;
}
@ -528,7 +521,7 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
Assert.notNull(medicalRec, "未找到该病历");
Assert.notEmpty(medicalRec.getDiseaseId(), "未配置疾病信息");
return diseasePhysicalManageService.queryListByDiseaseId(medicalRec.getDiseaseId(),0);
return diseasePhysicalManageService.queryListByDiseaseId(medicalRec.getDiseaseId());
}
@Override
@ -548,7 +541,7 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
@Override
public List<DiseaseTreatmentPlanResVo> queryListByDiseaseId(String medicalRecId) {
// 在病历没有保存病历与处置计划的关联数据时，直接通过medicalId不能够查询到数据，这个时候使用对应疾病的数据
List<DiseaseTreatmentPlanResVo> diseaseTreatmentPlanResVos = diseaseTreatmentPlanManageService.queryListByDiseaseId(medicalRecId, 1);
List<DiseaseTreatmentPlanResVo> diseaseTreatmentPlanResVos = diseaseTreatmentPlanManageService.queryListByDiseaseId(medicalRecId);
if (CollUtil.isNotEmpty(diseaseTreatmentPlanResVos)) {
return diseaseTreatmentPlanResVos;
}
@ -557,7 +550,7 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
Assert.notNull(medicalRec, "未找到该病历");
Assert.notEmpty(medicalRec.getDiseaseId(), "未配置疾病信息");
return diseaseTreatmentPlanManageService.queryListByDiseaseId(medicalRec.getDiseaseId(),0);
return diseaseTreatmentPlanManageService.queryListByDiseaseId(medicalRec.getDiseaseId());
}
@Override

2
virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseAncillaryMapper.java
Unescape Escape View File

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

2
virtual-patient-model/src/main/java/com/supervision/mapper/DiseasePhysicalMapper.java
Unescape Escape View File

@ -15,7 +15,7 @@ import java.util.List;
*/
public interface DiseasePhysicalMapper extends BaseMapper<DiseasePhysical> {
List<DiseasePhysicalResVo> queryListByDiseaseId(@Param("diseaseId") String diseaseId,@Param("relationType")Integer relationType);
List<DiseasePhysicalResVo> queryListByDiseaseId(@Param("diseaseId") String diseaseId);
}

2
virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseTreatmentPlanMapper.java
Unescape Escape View File

@ -15,7 +15,7 @@ import java.util.List;
*/
public interface DiseaseTreatmentPlanMapper extends BaseMapper<DiseaseTreatmentPlan> {
List<DiseaseTreatmentPlanResVo> queryListByDiseaseId(@Param("diseaseId") String diseaseId,@Param("relationType") Integer relationType);
List<DiseaseTreatmentPlanResVo> queryListByDiseaseId(@Param("diseaseId") String diseaseId);
}

8
virtual-patient-model/src/main/java/com/supervision/model/DiseaseAncillary.java
Unescape Escape View File

@ -30,10 +30,6 @@ public class DiseaseAncillary implements Serializable {
@Schema(description = "疾病id")
private String diseaseId;
@TableField(exist = false)
@Schema(description = "病历id 与diseaseId的值相对")
private String medicalId;
/**
* 工具ID
*/
@ -84,10 +80,6 @@ public class DiseaseAncillary implements Serializable {
@Schema(description = "说明")
private String description;
@Schema(description = "关系类型 0:关联疾病 1:关联病历")
private Integer relationType;
/**
* 创建人ID
*/

6
virtual-patient-model/src/main/java/com/supervision/model/DiseasePhysical.java
Unescape Escape View File

@ -30,9 +30,6 @@ public class DiseasePhysical implements Serializable {
@Schema(description = "疾病id")
private String diseaseId;
@TableField(exist = false)
@Schema(description = "病历id 与diseaseId的值相对")
private String medicalId;
/**
* 工具ID
*/
@ -90,9 +87,6 @@ public class DiseasePhysical implements Serializable {
@Schema(description = "表征 默认诊断结果")
private String trait;
@Schema(description = "关系类型 0:关联疾病 1:关联病历")
private Integer relationType;
/**
* 创建人ID
*/

3
virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentPlan.java
Unescape Escape View File

@ -39,9 +39,6 @@ public class DiseaseTreatmentPlan implements Serializable {
*/
private String treatmentPlanId;
@Schema(description = "关系类型 0:关联疾病 1:关联病历")
private Integer relationType;
/**
* 创建人ID
*/

2
virtual-patient-model/src/main/java/com/supervision/service/DiseaseAncillaryService.java
Unescape Escape View File

@ -20,7 +20,7 @@ public interface DiseaseAncillaryService extends IService<DiseaseAncillary> {
DiseaseAncillaryDto queryDiseaseAncillaryDtoOne(DiseaseAncillary diseaseAncillary, Supplier<DiseaseAncillaryDto> other);
List<DiseaseAncillaryResVo> queryListByDiseaseId(String diseaseId,Integer relationType);
List<DiseaseAncillaryResVo> queryListByDiseaseId(String diseaseId);
}

2
virtual-patient-model/src/main/java/com/supervision/service/DiseasePhysicalService.java
Unescape Escape View File

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

2
virtual-patient-model/src/main/java/com/supervision/service/DiseaseTreatmentPlanService.java
Unescape Escape View File

@ -14,5 +14,5 @@ import java.util.List;
*/
public interface DiseaseTreatmentPlanService extends IService<DiseaseTreatmentPlan> {
List<DiseaseTreatmentPlanResVo> queryListByDiseaseId(String diseaseId,Integer relationType);
List<DiseaseTreatmentPlanResVo> queryListByDiseaseId(String diseaseId);
}

4
virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseAncillaryServiceImpl.java
Unescape Escape View File

@ -44,8 +44,8 @@ public class DiseaseAncillaryServiceImpl extends ServiceImpl<DiseaseAncillaryMap
}
@Override
public List<DiseaseAncillaryResVo> queryListByDiseaseId(String diseaseId,Integer relationType) {
return super.getBaseMapper().queryListByDiseaseId(diseaseId,relationType);
public List<DiseaseAncillaryResVo> queryListByDiseaseId(String diseaseId) {
return super.getBaseMapper().queryListByDiseaseId(diseaseId);
}

4
virtual-patient-model/src/main/java/com/supervision/service/impl/DiseasePhysicalServiceImpl.java
Unescape Escape View File

@ -19,9 +19,9 @@ public class DiseasePhysicalServiceImpl extends ServiceImpl<DiseasePhysicalMappe
implements DiseasePhysicalService{
@Override
public List<DiseasePhysicalResVo> queryListByDiseaseId(String diseaseId,Integer relationType) {
public List<DiseasePhysicalResVo> queryListByDiseaseId(String diseaseId) {
return super.getBaseMapper().queryListByDiseaseId(diseaseId,relationType);
return super.getBaseMapper().queryListByDiseaseId(diseaseId);
}
}

4
virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseTreatmentPlanServiceImpl.java
Unescape Escape View File

@ -19,9 +19,9 @@ import java.util.List;
public class DiseaseTreatmentPlanServiceImpl extends ServiceImpl<DiseaseTreatmentPlanMapper, DiseaseTreatmentPlan>
implements DiseaseTreatmentPlanService {
@Override
public List<DiseaseTreatmentPlanResVo> queryListByDiseaseId(String diseaseId,Integer relationType) {
public List<DiseaseTreatmentPlanResVo> queryListByDiseaseId(String diseaseId) {
return super.getBaseMapper().queryListByDiseaseId(diseaseId,relationType);
return super.getBaseMapper().queryListByDiseaseId(diseaseId);
}
}

6
virtual-patient-model/src/main/resources/mapper/DiseaseAncillaryMapper.xml
Unescape Escape View File

@ -19,7 +19,6 @@
<result property="result" column="result" jdbcType="VARCHAR"/>
<result property="normalResult" column="normal_result" jdbcType="VARCHAR"/>
<result property="description" column="description" jdbcType="VARCHAR"/>
<result property="relationType" column="relation_type" jdbcType="INTEGER"/>
<result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
@ -30,7 +29,7 @@
id
,disease_id,item_id,require_check_flag,basis_confirm_flag,primarily_diagnosis_criteria_flag,basis_identification_flag
,full_check_flag,diagnosis_assessment_flag,expected_diagnosis_result,
result,normal_result,symptom_image_file_ids,description,relation_type,create_user_id,
result,normal_result,symptom_image_file_ids,description,create_user_id,
create_time,update_user_id,update_time
</sql>
@ -81,9 +80,6 @@
from vp_disease_ancillary da
left join vp_config_ancillary_item cai on da.item_id = cai.id
where da.disease_id = #{diseaseId}
<if test="relationType != null">
AND da.relation_type = #{relationType}
</if>
order by da.create_time desc
</select>

6
virtual-patient-model/src/main/resources/mapper/DiseasePhysicalMapper.xml
Unescape Escape View File

@ -20,7 +20,6 @@
<result property="result" column="result" jdbcType="VARCHAR"/>
<result property="normalResult" column="normal_result" jdbcType="VARCHAR"/>
<result property="trait" column="trait" jdbcType="VARCHAR"/>
<result property="relationType" column="relation_type" jdbcType="INTEGER"/>
<result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
@ -31,7 +30,7 @@
id,tool_id,location_id,disease_id,
require_check_flag,primarily_diagnosis_criteria_flag,basis_confirm_flag,
diagnosis_assessment_flag,expected_diagnosis_result,full_check_flag,
basis_identification_flag,result,normal_result,trait,relation_type,
basis_identification_flag,result,normal_result,trait,
create_user_id,create_time,update_user_id,
update_time
</sql>
@ -60,9 +59,6 @@
left join vp_config_physical_tool cpt on dp.tool_id = cpt.id
left join vp_config_physical_location cpl on dp.location_id = cpl.id
where dp.disease_id = #{diseaseId}
<if test="relationType != null">
AND dp.relation_type = #{relationType}
</if>
order by dp.create_time desc
</select>
</mapper>

6
virtual-patient-model/src/main/resources/mapper/DiseaseTreatmentPlanMapper.xml
Unescape Escape View File

@ -8,7 +8,6 @@
<id property="id" column="id" jdbcType="VARCHAR"/>
<result property="diseaseId" column="disease_id" jdbcType="VARCHAR"/>
<result property="treatmentPlanId" column="treatment_plan_id" jdbcType="VARCHAR"/>
<result property="relationType" column="relation_type" jdbcType="INTEGER"/>
<result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
@ -17,7 +16,7 @@
<sql id="Base_Column_List">
id
,disease_id,treatment_plan_id,relation_type,create_user_id,
,disease_id,treatment_plan_id,create_user_id,
create_time,update_user_id,update_time
</sql>
@ -37,8 +36,5 @@
from vp_disease_treatment_plan dtp
left join vp_config_treatment_plan ctp on dtp.treatment_plan_id = ctp.id
where dtp.disease_id = #{diseaseId}
<if test="disposalMethod != null">
and dtp.relation_type = #{relationType}
</if>
</select>
</mapper>

16
virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java
Unescape Escape View File

@ -96,7 +96,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
}
// 2. 查询出疾病处置计划(疾病配置的处置计划)
List<DiseaseTreatmentPlanResVo> diseaseTreatmentPlanResVos = diseaseTreatmentPlanService.queryListByDiseaseId(diseaseId,0);
List<DiseaseTreatmentPlanResVo> diseaseTreatmentPlanResVos = diseaseTreatmentPlanService.queryListByDiseaseId(diseaseId);
List<String> treatmentPlanId = diseaseTreatmentPlanResVos.stream().map(DiseaseTreatmentPlanResVo::getTreatmentPlanId).distinct().collect(Collectors.toList());
// 3. 查出疾病处置计划用药(疾病配置的用药计划)
@ -132,13 +132,13 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
basisIdentificationResultResVO.setIdentificationDiagnosis(medicalRec.getDifferentialDiagnosisCriteria());
// 2.2 获取体格检查
List<PhysicalRecordByResultDTO> physicalRecordList = diagnosisPhysicalRecordService.queryPhysicalResultByProcessId(processId);
List<DiseasePhysicalResVo> diseasePhysicalResVos = diseasePhysicalService.queryListByDiseaseId(medicalRec.getDiseaseId(),0);
List<DiseasePhysicalResVo> diseasePhysicalResVos = diseasePhysicalService.queryListByDiseaseId(medicalRec.getDiseaseId());
List<BasisDiagnosisNodeResVO> nodeList = physicalRecordMergeListsIdentification(physicalRecordList, diseasePhysicalResVos);
// 2.3 获取辅助检查
List<AncillaryRecordByResultDTO> ancillaryRecordList = diagnosisAncillaryRecordService.queryAncillaryResultByProcessId(processId);
List<DiseaseAncillaryResVo> diseaseAncillaryResVos = diseaseAncillaryService.queryListByDiseaseId(medicalRec.getDiseaseId(),0);
List<DiseaseAncillaryResVo> diseaseAncillaryResVos = diseaseAncillaryService.queryListByDiseaseId(medicalRec.getDiseaseId());
nodeList.addAll(ancillaryRecordMergeListsIdentification(ancillaryRecordList, diseaseAncillaryResVos));
@ -152,13 +152,13 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
basisConfirmResultResVO.setConfirmingDiagnosis(medicalRec.getConfirmDiagnosisCriteria());
// 2.2 获取体格检查的证实诊断依据
List<PhysicalRecordByResultDTO> physicalRecordList = diagnosisPhysicalRecordService.queryPhysicalResultByProcessId(processId);
List<DiseasePhysicalResVo> diseasePhysicalResVos = diseasePhysicalService.queryListByDiseaseId(medicalRec.getDiseaseId(),0);
List<DiseasePhysicalResVo> diseasePhysicalResVos = diseasePhysicalService.queryListByDiseaseId(medicalRec.getDiseaseId());
List<BasisDiagnosisNodeResVO> nodeList = physicalRecordMergeListsConfirm(physicalRecordList, diseasePhysicalResVos);
// 2.3 获取辅助检查
List<AncillaryRecordByResultDTO> ancillaryRecordList = diagnosisAncillaryRecordService.queryAncillaryResultByProcessId(processId);
List<DiseaseAncillaryResVo> diseaseAncillaryResVos = diseaseAncillaryService.queryListByDiseaseId(medicalRec.getDiseaseId(),0);
List<DiseaseAncillaryResVo> diseaseAncillaryResVos = diseaseAncillaryService.queryListByDiseaseId(medicalRec.getDiseaseId());
nodeList.addAll(ancillaryRecordMergeListsConfirm(ancillaryRecordList, diseaseAncillaryResVos));
basisConfirmResultResVO.setNodeList(nodeList);
@ -179,13 +179,13 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
// 2.2 获取体格检查
List<PhysicalRecordByResultDTO> physicalRecordList = diagnosisPhysicalRecordService.queryPhysicalResultByProcessId(process.getId());
List<DiseasePhysicalResVo> diseasePhysicalResVos = diseasePhysicalService.queryListByDiseaseId(medicalRec.getDiseaseId(),0);
List<DiseasePhysicalResVo> diseasePhysicalResVos = diseasePhysicalService.queryListByDiseaseId(medicalRec.getDiseaseId());
basisDiagnosisNodeResVOS.addAll(physicalRecordMergeListsBasisPrimary(physicalRecordList, diseasePhysicalResVos));
// 2.3 获取辅助检查
List<AncillaryRecordByResultDTO> ancillaryRecordList = diagnosisAncillaryRecordService.queryAncillaryResultByProcessId(process.getId());
List<DiseaseAncillaryResVo> diseaseAncillaryResVos = diseaseAncillaryService.queryListByDiseaseId(medicalRec.getDiseaseId(),0);
List<DiseaseAncillaryResVo> diseaseAncillaryResVos = diseaseAncillaryService.queryListByDiseaseId(medicalRec.getDiseaseId());
basisDiagnosisNodeResVOS.addAll(ancillaryRecordMergeListsBasisPrimary(ancillaryRecordList, diseaseAncillaryResVos));
@ -455,7 +455,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
int userTreatmentPlanCount = userTreatmentPlanRecordList.size();
// 2. 查询出疾病处置计划(疾病配置的处置计划)
List<DiseaseTreatmentPlanResVo> diseaseTreatmentPlanResVos = diseaseTreatmentPlanService.queryListByDiseaseId(process.getDiseaseId(),0);
List<DiseaseTreatmentPlanResVo> diseaseTreatmentPlanResVos = diseaseTreatmentPlanService.queryListByDiseaseId(process.getDiseaseId());
Set<String> treatmentPlanIdSet = diseaseTreatmentPlanResVos.stream().map(DiseaseTreatmentPlanResVo::getTreatmentPlanId).collect(Collectors.toSet());
// 3. 查出疾病处置计划用药(疾病配置的用药计划)

Write Preview
Loading…
Cancel
Save