|
@@ -23,6 +23,7 @@ import com.diagbot.vo.KlConceptStaticVO;
|
|
|
import com.diagbot.vo.PushJoinVO;
|
|
|
import com.diagbot.vo.ScaleStaticAllVO;
|
|
|
import com.diagbot.vo.ScaleVO;
|
|
|
+import com.diagbot.vo.SearchData;
|
|
|
import com.diagbot.vo.StaticKnowledgeHISVO;
|
|
|
import com.diagbot.vo.StaticKnowledgeIndexPageVO;
|
|
|
import com.diagbot.vo.StaticKnowledgeIndexVO;
|
|
@@ -51,6 +52,8 @@ public class KlConceptStaticFacade {
|
|
|
private SysUserFacade sysUserFacade;
|
|
|
@Autowired
|
|
|
MrFacade mrFacade;
|
|
|
+ @Autowired
|
|
|
+ private AssembleFacade assembleFacade;
|
|
|
|
|
|
|
|
|
/**
|
|
@@ -85,7 +88,11 @@ public class KlConceptStaticFacade {
|
|
|
if (staticKnowledgeVO.getType() == 8) {
|
|
|
PushJoinVO mr = mrFacade.getMr(staticKnowledgeVO.getMrId());
|
|
|
if (null != mr) {
|
|
|
- BeanUtil.copyProperties(mr, scaleStaticAllVO);
|
|
|
+ SearchData searchData = new SearchData();
|
|
|
+ BeanUtil.copyProperties(mr, searchData);
|
|
|
+ //入参映射
|
|
|
+ searchData = assembleFacade.assembleData(searchData);
|
|
|
+ BeanUtil.copyProperties(searchData, scaleStaticAllVO);
|
|
|
}
|
|
|
}
|
|
|
BeanUtil.copyProperties(staticKnowledgeVO, scaleStaticAllVO);
|