wangfeng 5 лет назад
Родитель
Сommit
03a732a688

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

@@ -242,10 +242,8 @@ public class DiagnoseImportFacade {
         List<DiagnosticBasisExportDTO> list = new ArrayList<>();
         for (int i = 0; i < datas.size(); i++) {
             DiagnoseQuestion diagnose = datas.get(i);
-            list.add(new DiagnosticBasisExportDTO(diagnose.getDisName(),
-                    diagnose.getQuestionName(),
-                    getType(diagnose.getType(), diagnose.getQuestionType()),
-                    diagnose.getQuestionName(), "", "通用", "0",
+            list.add(new DiagnosticBasisExportDTO(diagnose.getDisName(), diagnose.getQuestionName(),
+                    getType(diagnose.getType(), diagnose.getQuestionType()), diagnose.getQuestionName(), "", "通用", "0",
                     "200"));
 
         }
@@ -256,15 +254,16 @@ public class DiagnoseImportFacade {
     }
 
     /**
+     *
      * @param diaAllExportVO
      * @param response
      */
     public void exportDiagnosticAll(DiagnosticAllExportVO diaAllExportVO, HttpServletResponse response) {
         QueryWrapper<DiagnoseDetail> diaQuery = new QueryWrapper<>();
-        diaQuery.eq("diagnose_id", diaAllExportVO.getDiagnoseId())
-                .eq("is_deleted", IsDeleteEnum.N.getKey());
+        diaQuery.eq("diagnose_id", diaAllExportVO.getDiagnoseId()).eq("is_deleted", IsDeleteEnum.N.getKey());
         List<DiagnoseDetail> datas = diagnoseDetailService.list(diaQuery);
 
+        GsonUtil.toJson(datas);
         System.out.println(GsonUtil.toJson(datas));
         List<String> listName = new ArrayList<>();
 
@@ -284,14 +283,13 @@ public class DiagnoseImportFacade {
         listId.add("result");
 
 
-        String disName = (datas.size() > 0) ? datas.get(0).getDisName() : " ";
+        String disName =(datas.size()>0)?datas.get(0).getDisName():" ";
         List<DiagnosticAllExportDTO> list = new ArrayList<>();
         for (int i = 0; i < datas.size(); i++) {
             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), diagnose.getResult()));
 
         }
         response.setContentType("text/html;charset=UTF-8");
@@ -345,30 +343,30 @@ public class DiagnoseImportFacade {
         }
         return typeName;
     }
-
     /**
      * 导出公式类型转换
+     *
      */
     public String getDisType(Integer type) {
         String typeName = "";
 
         typeName = DiagnoseFeatureTypeEnum.getName(type);
-        if (typeName == null) {
+        if(typeName == null){
             typeName = DiagnoseTypeEnum.getName(type);
         }
         return typeName;
     }
-
     /**
      * 导出公式和标准词切换
+     *
      */
-    public String getRelation(Integer type, DiagnoseDetail diagnose) {
+    public String getRelation(Integer type, DiagnoseDetail diagnose ) {
         String typeName = "";
         String relation = "";
         typeName = DiagnoseFeatureTypeEnum.getName(type);
-        relation = diagnose.getRelation();
-        if (typeName == null) {
-            relation = diagnose.getFormula();
+        relation =  diagnose.getRelation();
+        if(typeName == null ){
+            relation =  diagnose.getFormula();
         }
         return relation;
     }