1: 田间 根据病历id查询疾病查看配置的体格检查项列表 接口

dev_3.1.0
xueqingkun 10 months ago
parent 07c4a932b6
commit 0040d95c99

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

@ -81,6 +81,12 @@ public class MedicalRecManageController {
return medicalRecManageService.queryDiseasePhysicalByCreat(diseaseId);
}
@Operation(summary = "查看配置的体格检查项")
@GetMapping("queryDiseasePhysical")
public List<DiseasePhysicalResVo> queryDiseasePhysical(@Parameter(name = "medicalRecId", description = "病例id") String medicalRecId){
return medicalRecManageService.queryDiseasePhysical(medicalRecId);
}
@Operation(summary = "创建病历时查看配置的处置计划")
@GetMapping("queryDiseaseTreatmentPlanByCreat")
public List<DiseaseTreatmentPlanResVo> queryDiseaseTreatmentPlanByCreat(String diseaseId){

@ -9,7 +9,7 @@ import java.util.List;
public interface DiseasePhysicalManageService {
List<DiseasePhysicalResVo> queryListByDiseaseId(String diseaseId);
List<DiseasePhysicalResVo> queryListByDiseaseId(String diseaseId,Integer relationType);
DiseasePhysical savePhysical(DiseasePhysical diseasePhysical);

@ -62,4 +62,6 @@ public interface MedicalRecManageService {
Boolean updateMedicalRecAncillary(DiseaseAncillaryReqVo diseaseAncillaryReqVo);
List<DiseaseAncillaryResVo> queryDiseaseAncillary(String medicalId);
List<DiseasePhysicalResVo> queryDiseasePhysical(String medicalRecId);
}

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

@ -150,7 +150,7 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
@Override
public List<DiseasePhysicalResVo> queryDiseasePhysicalByCreat(String diseaseId) {
return diseasePhysicalManageService.queryListByDiseaseId(diseaseId);
return diseasePhysicalManageService.queryListByDiseaseId(diseaseId,0);
}
@Override
@ -245,7 +245,7 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
// 辅助检查
medicalRecInfoVO.setAncillaryList(diseaseAncillaryManageService.queryListByDiseaseId(medicalRec.getDiseaseId(),0));
// 体格检查
medicalRecInfoVO.setPhysicalList(diseasePhysicalManageService.queryListByDiseaseId(medicalRec.getDiseaseId()));
medicalRecInfoVO.setPhysicalList(diseasePhysicalManageService.queryListByDiseaseId(medicalRec.getDiseaseId(),0));
// 处置计划
medicalRecInfoVO.setTreatmentPlanList(diseaseTreatmentPlanManageService.queryListByDiseaseId(medicalRec.getDiseaseId()));
// 问答策略
@ -502,20 +502,35 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
}
@Override
public List<DiseaseAncillaryResVo> queryDiseaseAncillary(String medicalId) {
// 在病历没有保存病历与辅助检查的关联数据时直接通过medicalId不能够查询到数据这个时候用对应疾病的数据
List<DiseaseAncillaryResVo> diseaseAncillaryResVos = diseaseAncillaryManageService.queryListByDiseaseId(medicalId,1);
public List<DiseaseAncillaryResVo> queryDiseaseAncillary(String medicalRecId) {
// 在病历没有保存病历与辅助检查的关联数据时直接通过medicalId不能够查询到数据这个时候使用对应疾病的数据
List<DiseaseAncillaryResVo> diseaseAncillaryResVos = diseaseAncillaryManageService.queryListByDiseaseId(medicalRecId,1);
if (CollUtil.isNotEmpty(diseaseAncillaryResVos)) {
return diseaseAncillaryResVos;
}
log.info("queryDiseaseAncillary:未找到该病历辅助检查数据,使用对应疾病辅助检查数据");
MedicalRec medicalRec = medicalRecService.getById(medicalId);
MedicalRec medicalRec = medicalRecService.getById(medicalRecId);
Assert.notNull(medicalRec, "未找到该病历");
Assert.notEmpty(medicalRec.getDiseaseId(), "未配置疾病信息");
return diseaseAncillaryManageService.queryListByDiseaseId(medicalRec.getDiseaseId(),0);
}
@Override
public List<DiseasePhysicalResVo> queryDiseasePhysical(String medicalRecId) {
// 在病历没有保存病历与体格检查的关联数据时直接通过medicalId不能够查询到数据这个时候使用对应疾病的数据
List<DiseasePhysicalResVo> diseasePhysicalResVos = diseasePhysicalManageService.queryListByDiseaseId(medicalRecId,1);
if (CollUtil.isNotEmpty(diseasePhysicalResVos)) {
return diseasePhysicalResVos;
}
log.info("queryDiseasePhysical:未找到该病历体格检查数据,使用对应疾病体格检查数据");
MedicalRec medicalRec = medicalRecService.getById(medicalRecId);
Assert.notNull(medicalRec, "未找到该病历");
Assert.notEmpty(medicalRec.getDiseaseId(), "未配置疾病信息");
return diseasePhysicalManageService.queryListByDiseaseId(medicalRec.getDiseaseId(),0);
}
private void saveMedicalRecAssert(MedicalRecInfoReVo reqVO){
Assert.notEmpty(reqVO.getId(), "id不能为空");
Assert.notEmpty(reqVO.getPatientId(),"病人id不能为空");

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

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

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

@ -59,6 +59,10 @@
from vp_disease_physical dp
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} order by dp.create_time desc
where dp.disease_id = #{diseaseId}
<if test="relationType != null">
AND dp.relation_type = #{relationType}
</if>
order by dp.create_time desc
</select>
</mapper>

@ -132,7 +132,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
basisIdentificationResultResVO.setIdentificationDiagnosis(medicalRec.getDifferentialDiagnosisCriteria());
// 2.2 获取体格检查
List<PhysicalRecordByResultDTO> physicalRecordList = diagnosisPhysicalRecordService.queryPhysicalResultByProcessId(processId);
List<DiseasePhysicalResVo> diseasePhysicalResVos = diseasePhysicalService.queryListByDiseaseId(medicalRec.getDiseaseId());
List<DiseasePhysicalResVo> diseasePhysicalResVos = diseasePhysicalService.queryListByDiseaseId(medicalRec.getDiseaseId(),0);
List<BasisDiagnosisNodeResVO> nodeList = physicalRecordMergeListsIdentification(physicalRecordList, diseasePhysicalResVos);
@ -152,7 +152,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
basisConfirmResultResVO.setConfirmingDiagnosis(medicalRec.getConfirmDiagnosisCriteria());
// 2.2 获取体格检查的证实诊断依据
List<PhysicalRecordByResultDTO> physicalRecordList = diagnosisPhysicalRecordService.queryPhysicalResultByProcessId(processId);
List<DiseasePhysicalResVo> diseasePhysicalResVos = diseasePhysicalService.queryListByDiseaseId(medicalRec.getDiseaseId());
List<DiseasePhysicalResVo> diseasePhysicalResVos = diseasePhysicalService.queryListByDiseaseId(medicalRec.getDiseaseId(),0);
List<BasisDiagnosisNodeResVO> nodeList = physicalRecordMergeListsConfirm(physicalRecordList, diseasePhysicalResVos);
@ -179,7 +179,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
// 2.2 获取体格检查
List<PhysicalRecordByResultDTO> physicalRecordList = diagnosisPhysicalRecordService.queryPhysicalResultByProcessId(process.getId());
List<DiseasePhysicalResVo> diseasePhysicalResVos = diseasePhysicalService.queryListByDiseaseId(medicalRec.getDiseaseId());
List<DiseasePhysicalResVo> diseasePhysicalResVos = diseasePhysicalService.queryListByDiseaseId(medicalRec.getDiseaseId(),0);
basisDiagnosisNodeResVOS.addAll(physicalRecordMergeListsBasisPrimary(physicalRecordList, diseasePhysicalResVos));

Loading…
Cancel
Save