|
|
|
@ -50,21 +50,21 @@ public class ConfigConfigTreatmentPlanServiceImpl extends ServiceImpl<ConfigTrea
|
|
|
|
|
root.getOrDefaultChild().add(disposalPlanNode);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 二级节点 todo:需要新增药物节点
|
|
|
|
|
// 二级节点
|
|
|
|
|
if (StrUtil.isEmpty(firstMeasuresId)){
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 一级措施不为空,且二级措施为空 id采用数据id;
|
|
|
|
|
// 一级措施不为空,且二级措施不为空,id采用一级措施id
|
|
|
|
|
tmpId = StrUtil.isEmpty(secondMeasures) ? id : firstMeasuresId;
|
|
|
|
|
tmpId = id;
|
|
|
|
|
TreatmentPlanTreeNode firstMeasuresNode = disposalPlanNode.findChildById(tmpId);
|
|
|
|
|
if (null == firstMeasuresNode){
|
|
|
|
|
firstMeasuresNode = new TreatmentPlanTreeNode(tmpId,configTreatmentPlan.getFirstMeasures());
|
|
|
|
|
disposalPlanNode.getOrDefaultChild().add(firstMeasuresNode);
|
|
|
|
|
disposalPlanNode.addNode(firstMeasuresNode);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 三级节点
|
|
|
|
|
/*// 三级节点
|
|
|
|
|
if (StrUtil.isEmpty(secondMeasures)){
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
@ -72,7 +72,7 @@ public class ConfigConfigTreatmentPlanServiceImpl extends ServiceImpl<ConfigTrea
|
|
|
|
|
if (null == secondMeasuresNode){
|
|
|
|
|
secondMeasuresNode = new TreatmentPlanTreeNode(id,secondMeasures);
|
|
|
|
|
firstMeasuresNode.getOrDefaultChild().add(secondMeasuresNode);
|
|
|
|
|
}
|
|
|
|
|
}*/
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return root.getChild();
|
|
|
|
|