Browse Source

2期修改

wangfeng 5 years atrás
parent
commit
c63d262463

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

@@ -298,7 +298,7 @@ public class DiagnoseImportFacade {
 			DiagnoseDetail diagnose = datas.get(i);
 			DiagnoseDetail diagnose = datas.get(i);
 			disName = diagnose.getDisName();
 			disName = diagnose.getDisName();
 			list.add(new DiagnosticAllExportDTO(getDisType(diagnose.getType()), diagnose.getCode(),
 			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");
 		response.setContentType("text/html;charset=UTF-8");
@@ -379,5 +379,33 @@ public class DiagnoseImportFacade {
 		}
 		}
 		return relation;
 		return relation;
 	}
 	}
-	
+	/**
+	 * 导出结果处理
+	 */
+	public String getResults(Integer type, DiagnoseDetail diagnose ){
+		String getResult = "";
+		String result = "";
+		if(type == DiagnoseFeatureTypeEnum.Lis.getKey()){
+			String res = diagnose.getResult();
+			if(diagnose.getRelation() != null && !diagnose.getRelation().trim().equals("")){
+				// 分割出所有的数字
+				String[] split = res.split("、");
+				List<String> numberList = new ArrayList<String>();
+				for (int i = 0; i < split.length; i++) {
+					if (!split[i].equals("")) {
+						numberList.add(diagnose.getRelation()+split[i]);
+					}
+				}
+				getResult = numberList.toString();	
+			}else{
+				getResult = "";	
+			}
+			
+		}else {
+			getResult = diagnose.getResult();
+		}
+		
+		
+		return getResult;
+	}
 }
 }