Merge branch 'dev/scale_preserve20210511' into debug

src/main/java/com/diagbot/facade/KlConceptStaticFacade.java

@@ -22,7 +22,7 @@ import com.diagbot.vo.KlConceptStaticPageVO;
 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 +51,8 @@ public class KlConceptStaticFacade {
     private SysUserFacade sysUserFacade;
     @Autowired
     MrFacade mrFacade;
+    @Autowired
+    private AssembleFacade assembleFacade;
 
 
     /**
@@ -85,8 +87,16 @@ 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);
+            } else {
+                scaleStaticAllVO.setHospitalId(-1L);
             }
+        } else {
+            scaleStaticAllVO.setHospitalId(-1L);
         }
         BeanUtil.copyProperties(staticKnowledgeVO, scaleStaticAllVO);
         RespDTO<StaticKnowledgeDTO> respDTO = cdssCoreClient.getStaticKnowledge(scaleStaticAllVO);