Merge branch 'dev/diagbotcloud20190808_diagnose' into dev/diagbotcloud20190924_diagnose2

knowledgeman-service/src/main/java/com/diagbot/facade/DiagnoseImportFacade.java

@@ -115,7 +115,8 @@ public class DiagnoseImportFacade {
 									 * StringUtil.isEmpty(name)) { continue; }
 									 */
 
-									if (count == 1 && name.equals("类型")) {
+									if (count == 1 && !name.equals("类型")) {
+										messages.add("第" + count + "第一行不是类型！");
 										continue;
 									}
 
@@ -125,7 +126,7 @@ public class DiagnoseImportFacade {
 									}
 									FeatureDTO feature = new FeatureDTO();
 									EquationDTO equation = new EquationDTO();
-									if (code.equals("")) {
+									if (code.trim().equals("")) {
 										equation.setType(name);
 										equation.setAssociated(associatedWord);
 										equationList.add(equation);