zhoutg %!s(int64=3) %!d(string=hai) anos
pai
achega
db65839c84

+ 2 - 1
src/main/java/com/diagbot/facade/CommonFacade.java

@@ -232,7 +232,8 @@ public class CommonFacade {
         // 6、结构化诊断
         // 6、结构化诊断
         CoreUtil.addList(diagList, CoreUtil.filterUniqueList(wordCrfDTO.getDiag()));
         CoreUtil.addList(diagList, CoreUtil.filterUniqueList(wordCrfDTO.getDiag()));
         // 7、选中诊断
         // 7、选中诊断
-        if (wordCrfDTO.getDiseaseName() != null && StringUtils.isBlank(wordCrfDTO.getDiseaseName().getUniqueName())) {
+        if (wordCrfDTO.getDiseaseName() != null && StringUtil.isNotBlank(wordCrfDTO.getDiseaseName().getName())
+                && StringUtils.isBlank(wordCrfDTO.getDiseaseName().getUniqueName())) {
             diagList.add(wordCrfDTO.getDiseaseName().getName());
             diagList.add(wordCrfDTO.getDiseaseName().getName());
         }
         }
         standConvert.setDiaglList(diagList);
         standConvert.setDiaglList(diagList);

+ 3 - 3
src/main/java/com/diagbot/util/CoreUtil.java

@@ -108,12 +108,12 @@ public class CoreUtil {
         return res;
         return res;
     }
     }
 
 
-    public static <T> void setPropertyList(T list, String propertyName, String standName, Map<String, String> map) {
-        if (list == null) {
+    public static <T> void setPropertyList(T t, String propertyName, String standName, Map<String, String> map) {
+        if (t == null) {
             return;
             return;
         }
         }
         try {
         try {
-            setFieldValue(list, propertyName, standName, map);
+            setFieldValue(t, propertyName, standName, map);
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
         }
         }