|
|
|
@ -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不能为空");
|
|
|
|
|