Merge branch 'develop' into dev/ruleNew20210727

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

@@ -833,7 +833,7 @@ public class CommonFacade {
 
         try {
             for (T item : list) {
-                String name = item.getClass().getMethod("getName").invoke(item).toString();
+                String name = ReflectUtil.getProperty(item, "name");
                 if (StringUtil.isBlank(name)) {
                     retList.add(item);
                     continue;
@@ -841,7 +841,7 @@ public class CommonFacade {
 
 //                String uniqueName = item.getClass().getMethod("getUniqueName").invoke(item).toString();
 
-                String uniqueName = item.getClass().getMethod("get"+propertyName).invoke(item).toString();
+                String uniqueName = ReflectUtil.getProperty(item, "uniqueName");
                 if (StringUtil.isNotBlank(uniqueName) && !"StandName".equals(propertyName)) {
                     retList.add(item);
                     continue;
@@ -849,7 +849,7 @@ public class CommonFacade {
 
                 String hisDetailName = "";
                 if(type.equals(ConceptTypeEnum.LisPack.getKey())) {
-                    hisDetailName = item.getClass().getMethod("getDetailName").invoke(item).toString();
+                    hisDetailName = ReflectUtil.getProperty(item, "detailName");
                     if (StringUtil.isBlank(hisDetailName)) {
                         hisDetailName = "";
                     }