|
|
|
@ -155,7 +155,7 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public List<DiseaseTreatmentPlanResVo> queryDiseaseTreatmentPlanByCreat(String diseaseId) {
|
|
|
|
|
return diseaseTreatmentPlanManageService.queryListByDiseaseId(diseaseId);
|
|
|
|
|
return diseaseTreatmentPlanManageService.queryListByDiseaseId(diseaseId,0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@ -247,7 +247,7 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
|
|
|
|
|
// 体格检查
|
|
|
|
|
medicalRecInfoVO.setPhysicalList(diseasePhysicalManageService.queryListByDiseaseId(medicalRec.getDiseaseId(),0));
|
|
|
|
|
// 处置计划
|
|
|
|
|
medicalRecInfoVO.setTreatmentPlanList(diseaseTreatmentPlanManageService.queryListByDiseaseId(medicalRec.getDiseaseId()));
|
|
|
|
|
medicalRecInfoVO.setTreatmentPlanList(diseaseTreatmentPlanManageService.queryListByDiseaseId(medicalRec.getDiseaseId(),0));
|
|
|
|
|
// 问答策略
|
|
|
|
|
List<MedicalRecQaVO> medicalRecQaVOS = queryMedicalRecQaInfo(id);
|
|
|
|
|
Map<Integer, List<MedicalRecQaVO>> qaListMap = medicalRecQaVOS.stream().collect(Collectors.groupingBy(MedicalRecQaVO::getAnswerType));
|
|
|
|
@ -545,6 +545,29 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public List<DiseaseTreatmentPlanResVo> queryListByDiseaseId(String medicalRecId) {
|
|
|
|
|
// 在病历没有保存病历与处置计划的关联数据时,直接通过medicalId不能够查询到数据,这个时候使用对应疾病的数据
|
|
|
|
|
List<DiseaseTreatmentPlanResVo> diseaseTreatmentPlanResVos = diseaseTreatmentPlanManageService.queryListByDiseaseId(medicalRecId, 1);
|
|
|
|
|
if (CollUtil.isNotEmpty(diseaseTreatmentPlanResVos)) {
|
|
|
|
|
return diseaseTreatmentPlanResVos;
|
|
|
|
|
}
|
|
|
|
|
log.info("queryDiseasePhysical:未找到该病历处置计划数据,使用对应疾病体格检查数据");
|
|
|
|
|
MedicalRec medicalRec = medicalRecService.getById(medicalRecId);
|
|
|
|
|
Assert.notNull(medicalRec, "未找到该病历");
|
|
|
|
|
Assert.notEmpty(medicalRec.getDiseaseId(), "未配置疾病信息");
|
|
|
|
|
|
|
|
|
|
return diseaseTreatmentPlanManageService.queryListByDiseaseId(medicalRec.getDiseaseId(),0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public boolean updateDiseaseTreatmentPlan(DiseaseTreatmentPlanReqVo diseaseTreatmentPlan) {
|
|
|
|
|
|
|
|
|
|
Assert.notEmpty(diseaseTreatmentPlan.getId(), "id不能为空");
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private void saveMedicalRecAssert(MedicalRecInfoReVo reqVO){
|
|
|
|
|
Assert.notEmpty(reqVO.getId(), "id不能为空");
|
|
|
|
|
Assert.notEmpty(reqVO.getPatientId(),"病人id不能为空");
|
|
|
|
|