Merge remote-tracking branch 'origin/dev/diagbotcloud20190918_vital' into dev/diagbotcloud20190918_vital

aipt-service/src/main/java/com/diagbot/facade/ClinicalFacade.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.diagbot.client.AIServiceClient;
 import com.diagbot.client.NLPServiceClient;
 import com.diagbot.client.bean.CalculateData;
-import com.diagbot.client.bean.GdbResponse;
 import com.diagbot.client.bean.Response;
 import com.diagbot.client.bean.ResponseData;
 import com.diagbot.dto.Lexeme;
@@ -17,23 +16,13 @@ import com.diagbot.service.ScaleContentService;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.SearchVo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -80,12 +69,12 @@ public class ClinicalFacade {
         //            addStandWord(resp.getData(), standWord, sData);
         //        }
 
-        sData.setLisArr(processLis(sData.getLisArr()));
+        // sData.setLisArr(processLis(sData.getLisArr()));
 
-        if (ListUtil.isNotEmpty(sData.getLisArr())) {
+        /*if (ListUtil.isNotEmpty(sData.getLisArr())) {
             List<String> otherVal = sData.getLisArr().stream().map(lisArr -> lisArr.getOtherValue()).collect(Collectors.toList());
             sData.setLis(String.join(",", otherVal));
-        }
+        }*/
 
         Response<ResponseData> res = aiServiceClient.bayesPageData(sData);
         if (res == null || res.getData() == null) {

knowledgeman-service/src/main/java/com/diagbot/web/DiagnoseExportImportController.java

@@ -1,10 +1,13 @@
 package com.diagbot.web;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.diagbot.annotation.SysLoggerExport;
+import com.diagbot.facade.DiagnoseImportFacade;
+import com.diagbot.util.GsonUtil;
+import com.diagbot.vo.DiagnosticAllExportVO;
+import com.diagbot.vo.DiagnosticBasisExportVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -12,19 +15,12 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-
-import com.diagbot.annotation.SysLoggerExport;
-import com.diagbot.facade.DiagnoseImportFacade;
-import com.diagbot.util.GsonUtil;
-import com.diagbot.vo.DiagnosticAllExportVO;
-import com.diagbot.vo.DiagnosticBasisExportVO;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2019年8月8日 下午1:26:22
@@ -35,33 +31,32 @@ import springfox.documentation.annotations.ApiIgnore;
 @SuppressWarnings("unchecked")
 public class DiagnoseExportImportController {
 
-	@Autowired
-	DiagnoseImportFacade diagnoseImportFacade;
+    @Autowired
+    DiagnoseImportFacade diagnoseImportFacade;
 
     @ApiOperation(value = "导入诊断依据数据:[by:wangfeng]", notes = "导入诊断依据数据")
-    @PostMapping(value = "/importDiagnosticBasis", produces="text/html;charset=utf-8")
+    @PostMapping(value = "/importDiagnosticBasis", produces = "text/html;charset=utf-8")
     @ApiIgnore
-    public String importDiagnosticBasis(@RequestParam("uploadfile") MultipartFile file,HttpServletRequest request) {
+    public String importDiagnosticBasis(@RequestParam("uploadfile") MultipartFile file,
+                                        HttpServletRequest request) {
         return GsonUtil.toJson(diagnoseImportFacade.importDiagnosticBasisAll(file, request));
     }
-    
+
     @ApiOperation(value = "导出诊断依据问题:[by:wangfeng]", notes = "导出诊断依据问题")
     @PostMapping("/exportDiagnosticBasis")
     @SysLoggerExport("exportDiagnosticBasis")
     @ResponseBody
-    public  void exportDiagnosticBasis(@RequestBody DiagnosticBasisExportVO diaExportVO,HttpServletRequest request,HttpServletResponse response)
-            throws Exception {
-    	diagnoseImportFacade.exportDiagnosticBasis(diaExportVO, response);
-        
+    public void exportDiagnosticBasis(@RequestBody DiagnosticBasisExportVO diaExportVO,
+                                      HttpServletRequest request, HttpServletResponse response) throws Exception {
+        diagnoseImportFacade.exportDiagnosticBasis(diaExportVO, response);
     }
-    
+
     @ApiOperation(value = "导出诊断依据:[by:wangfeng]", notes = "导出诊断依据")
     @PostMapping("/exportDiagnosticAll")
     @SysLoggerExport("exportDiagnosticAll")
     @ResponseBody
-    public  void exportDiagnosticAll(@RequestBody DiagnosticAllExportVO diaAllExportVO,HttpServletRequest request,HttpServletResponse response)
-            throws Exception {
-    	diagnoseImportFacade.exportDiagnosticAll(diaAllExportVO, response);
-        
+    public void exportDiagnosticAll(@RequestBody DiagnosticAllExportVO diaAllExportVO,
+                                    HttpServletRequest request, HttpServletResponse response) throws Exception {
+        diagnoseImportFacade.exportDiagnosticAll(diaAllExportVO, response);
     }
 }