Merge remote-tracking branch 'origin/master'

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -89,7 +89,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
 
 
     public Map<String, Object> analyze(AnalyzeVO analyzeVO) {
-
+        Map<String, Object> res = new HashMap<>(); // 返回结果
         Long hospitalId = Long.parseLong(SysUserUtils.getCurrentHospitalID());
 //        Long hospitalId = 1L; // 写死
         analyzeVO.setHospitalId(hospitalId);
@@ -195,8 +195,10 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         algorithmVO.setQcResultAlgVOList(qcResultAlgVOList);
         AlgorithmDTO algorithmDTO = algorithmFacade.getAlgorithmRes(algorithmVO);
         //保存
-        qcresultInfoFacade.saveQcResult(algorithmDTO, algorithmVO, analyzeVO, outputInfo.getPageData().toString());
-        return null;
+        String pageData = JSON.toJSONString(outputInfo.getPageData());
+        qcresultInfoFacade.saveQcResult(algorithmDTO, algorithmVO, analyzeVO, pageData);
+        res.put("pageData", pageData);
+        return res;
     }
 
 

src/main/java/com/diagbot/web/BehospitalInfoController.java

@@ -5,7 +5,6 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.BehospitalInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.BehospitalInfoFacade;
-import com.diagbot.facade.QcresultDetailFacade;
 import com.diagbot.facade.QcresultInfoFacade;
 import com.diagbot.vo.AnalyzeVO;
 import com.diagbot.vo.BehospitalPageVO;
@@ -51,7 +50,7 @@ public class BehospitalInfoController {
             notes = "")
     @PostMapping("/analyze")
     @SysLogger("analyze")
-    public RespDTO<IPage<BehospitalInfoDTO>> analyze(@RequestBody AnalyzeVO analyzeVO) {
+    public RespDTO<Map<String, Object>> analyze(@RequestBody AnalyzeVO analyzeVO) {
         Map<String, Object> data = behospitalInfoFacade.analyze(analyzeVO);
         return RespDTO.onSuc(data);
     }