Merge branch 'master' of D:\cdss-core with conflicts.

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

@@ -105,13 +105,13 @@ public class CommonFacade {
         diagList.addAll(wordCrfDTO.getDiagOrder().stream().filter(x -> StringUtils.isBlank(x.getUniqueName()))
                 .map(x -> x.getName()).collect(Collectors.toList()));
         //传的诊断
-        diagList.addAll(wordCrfDTO.getDiag().stream().filter(x -> StringUtils.isBlank(x.getUniqueName()))
+        diagList.addAll(wordCrfDTO.getDiag().stream().filter(x ->
+                StringUtils.isBlank(x.getUniqueName()))
                 .map(x -> x.getName()).collect(Collectors.toList()));
         //选中的诊断
-        if(wordCrfDTO.getDiseaseName() != null && StringUtils.isBlank(wordCrfDTO.getDiseaseName().getUniqueName())){
-            if(StringUtils.isNotBlank(wordCrfDTO.getDiseaseName().getName())){
-                diagList.add(wordCrfDTO.getDiseaseName().getName());
-            }
+        if(wordCrfDTO.getDiseaseName() != null && StringUtils.isBlank(wordCrfDTO.getDiseaseName().getUniqueName())
+                && StringUtils.isNotBlank(wordCrfDTO.getDiseaseName().getName())){
+            diagList.add(wordCrfDTO.getDiseaseName().getName());
         }
         standConvert.setDiaglList(diagList);