统一修改

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

@@ -46,7 +46,9 @@ public class CommonFacade {
         wordCrfDTO.setHospitalId(searchData.getHospitalId());
         wordCrfDTO.setAge(searchData.getAge());
         wordCrfDTO.setSex(searchData.getSex());
-        wordCrfDTO.setDiseaseName(searchData.getDiseaseName());
+        if (searchData.getDiseaseName() != null && StringUtils.isNotBlank(searchData.getDiseaseName().getName())) {
+            wordCrfDTO.setDiseaseName(searchData.getDiseaseName());
+        }
         if (ListUtil.isNotEmpty(searchData.getLis())) {
             wordCrfDTO.setLis(searchData.getLis());
         }
@@ -109,8 +111,7 @@ public class CommonFacade {
                 StringUtils.isBlank(x.getUniqueName()))
                 .map(x -> x.getName()).collect(Collectors.toList()));
         //选中的诊断
-        if(wordCrfDTO.getDiseaseName() != null && StringUtils.isBlank(wordCrfDTO.getDiseaseName().getUniqueName())
-                && StringUtils.isNotBlank(wordCrfDTO.getDiseaseName().getName())){
+        if(wordCrfDTO.getDiseaseName() != null && StringUtils.isBlank(wordCrfDTO.getDiseaseName().getUniqueName())){
             diagList.add(wordCrfDTO.getDiseaseName().getName());
         }
         standConvert.setDiaglList(diagList);