导出结果转换

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

@@ -322,7 +322,8 @@ public class DiagnoseImportFacade {
             DiagnoseDetail diagnose = datas.get(i);
             disName = diagnose.getDisName();
             list.add(new DiagnosticAllExportDTO(getDisType(diagnose.getType()), diagnose.getCode(),
-                    diagnose.getStandard(), "", getRelation(diagnose.getType(), diagnose), diagnose.getResult()));
+                    diagnose.getStandard(), "", getRelation(diagnose.getType(), diagnose),
+                    getResults(diagnose.getType(), diagnose)));
 
         }
         response.setContentType("text/html;charset=UTF-8");
@@ -375,16 +376,29 @@ public class DiagnoseImportFacade {
         String typeName = "";
         String relation = "";
         typeName = DiagnoseFeatureTypeEnum.getName(type);
+        relation = diagnose.getRelation();
         if (typeName == null) {
             relation = diagnose.getFormula();
+        }
+        return relation;
+    }
+
+    /**
+     * 导出结果的转换
+     */
+    public String getResults(Integer type, DiagnoseDetail diagnose){
+        String typeName = "";
+        String results = "";
+        typeName = DiagnoseFeatureTypeEnum.getName(type);
+        if (typeName == null) {
+            results = diagnose.getResult();
         } else {
             if (typeName.equals(DiagnoseFeatureTypeEnum.Lis.getName())) {
-                relation = diagnose.getRelation() + diagnose.getMidResult();
+                results = diagnose.getRelation() + diagnose.getMidResult();
             } else {
-                relation = diagnose.getResult();
+                results = diagnose.getResult();
             }
         }
-        return relation;
+        return results;
     }
-
 }