|
|
@@ -32,6 +32,7 @@ import com.diagbot.dto.RespDTO;
|
|
|
import com.diagbot.entity.DiagnoseDetail;
|
|
|
import com.diagbot.entity.DiagnoseQuestion;
|
|
|
import com.diagbot.enums.DiagnoseFeatureTypeEnum;
|
|
|
+import com.diagbot.enums.DiagnoseTypeEnum;
|
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
|
import com.diagbot.enums.TermEnum;
|
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
|
@@ -295,8 +296,8 @@ public class DiagnoseImportFacade {
|
|
|
for (int i = 0; i < datas.size(); i++) {
|
|
|
DiagnoseDetail diagnose = datas.get(i);
|
|
|
disName = diagnose.getDisName();
|
|
|
- list.add(new DiagnosticAllExportDTO(DiagnoseFeatureTypeEnum.getName(diagnose.getType()), diagnose.getCode(),
|
|
|
- diagnose.getStandard(), "", diagnose.getRelation(), diagnose.getResult()));
|
|
|
+ list.add(new DiagnosticAllExportDTO(getDisType(diagnose.getType()), diagnose.getCode(),
|
|
|
+ diagnose.getStandard(), "", getRelation(diagnose.getType(),diagnose), diagnose.getResult()));
|
|
|
|
|
|
}
|
|
|
response.setContentType("text/html;charset=UTF-8");
|
|
|
@@ -348,8 +349,34 @@ public class DiagnoseImportFacade {
|
|
|
} else if (type == DiagnoseFeatureTypeEnum.Other.getKey()) {
|
|
|
typeName = TermEnum.getName(10);
|
|
|
}
|
|
|
-
|
|
|
return typeName;
|
|
|
}
|
|
|
-
|
|
|
+ /**
|
|
|
+ * 导出公式类型转换
|
|
|
+ *
|
|
|
+ */
|
|
|
+ public String getDisType(Integer type) {
|
|
|
+ String typeName = "";
|
|
|
+
|
|
|
+ typeName = DiagnoseFeatureTypeEnum.getName(type);
|
|
|
+ if(typeName.isEmpty()){
|
|
|
+ typeName = DiagnoseTypeEnum.getName(type);
|
|
|
+ }
|
|
|
+ return typeName;
|
|
|
+ }
|
|
|
+ /**
|
|
|
+ * 导出公式和标准词切换
|
|
|
+ *
|
|
|
+ */
|
|
|
+ public String getRelation(Integer type, DiagnoseDetail diagnose ) {
|
|
|
+ String typeName = "";
|
|
|
+ String relation = "";
|
|
|
+ typeName = DiagnoseFeatureTypeEnum.getName(type);
|
|
|
+ relation = diagnose.getRelation();
|
|
|
+ if(typeName.isEmpty()){
|
|
|
+ relation = diagnose.getFormula();
|
|
|
+ }
|
|
|
+ return relation;
|
|
|
+ }
|
|
|
+
|
|
|
}
|
wangfeng