优化代码

src/main/java/com/diagbot/entity/QcresultInfo.java

@@ -47,6 +47,11 @@ public class QcresultInfo implements Serializable {
      */
     private Integer gradeType;
 
+    /**
+     * 页面数据
+     */
+    private String pageData;
+
     /**
      * 最后得分
      */

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

@@ -184,7 +184,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         algorithmVO.setQcResultAlgVOList(qcResultAlgVOList);
         AlgorithmDTO algorithmDTO = algorithmFacade.getAlgorithmRes(algorithmVO);
         //保存
-        qcresultInfoFacade.saveQcResult(algorithmDTO, algorithmVO, analyzeVO);
+        qcresultInfoFacade.saveQcResult(algorithmDTO, algorithmVO, analyzeVO, outputInfo.getPageData().toString());
         return null;
     }
 

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

@@ -68,11 +68,11 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
         AnalyzeVO analyzeVO = new AnalyzeVO();
         analyzeVO.setHospitalId(qcresultVO.getHospitalId());
         analyzeVO.setBehospitalCode(qcresultVO.getBehospitalCode());
-        this.saveQcResult(algorithmDTO, algorithmVO, analyzeVO);
+        this.saveQcResult(algorithmDTO, algorithmVO, analyzeVO,null);
         return true;
     }
 
-    public Boolean saveQcResult(AlgorithmDTO algorithmDTO, AlgorithmVO algorithmVO, AnalyzeVO analyzeVO) {
+    public Boolean saveQcResult(AlgorithmDTO algorithmDTO, AlgorithmVO algorithmVO, AnalyzeVO analyzeVO, String pageData) {
         //更新质控评分结果信息
         Long useId = Long.valueOf(SysUserUtils.getCurrentPrincipleID());
         Date now = DateUtil.now();
@@ -83,20 +83,31 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
                         .eq("hospital_id", analyzeVO.getHospitalId())
                         .eq("behospital_code", analyzeVO.getBehospitalCode()));
-        //逻辑删除记录
-        this.update(new UpdateWrapper<QcresultInfo>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", analyzeVO.getHospitalId())
-                .eq("behospital_code", analyzeVO.getBehospitalCode())
-                .set("is_deleted", IsDeleteEnum.Y.getKey())
-                .set("modifier", useId)
-                .set("gmt_modified", now));
-        //新增记录
-        if (null == qcresultInfo){
+        if (null == qcresultInfo) {
             qcresultInfo = new QcresultInfo();
+        } else {
+            //逻辑删除记录
+            this.update(new UpdateWrapper<QcresultInfo>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("hospital_id", analyzeVO.getHospitalId())
+                    .eq("behospital_code", analyzeVO.getBehospitalCode())
+                    .set("is_deleted", IsDeleteEnum.Y.getKey())
+                    .set("modifier", useId)
+                    .set("gmt_modified", now));
         }
+        //新增记录
+        qcresultInfo.setBehospitalCode(analyzeVO.getBehospitalCode());
+        qcresultInfo.setHospitalId(analyzeVO.getHospitalId());
         qcresultInfo.setScoreRes(algorithmDTO.getScore());
         qcresultInfo.setLevel(algorithmDTO.getLevel());
+        if (algorithmVO.getType().equals(0)) {
+            qcresultInfo.setGradeType(1);
+        } else {
+            qcresultInfo.setGradeType(2);
+        }
+        if (StringUtil.isNotBlank(pageData)){
+            qcresultInfo.setPageData(pageData);
+        }
         qcresultInfo.setGmtCreate(now);
         qcresultInfo.setCreator(useId.toString());
         qcresultInfo.setGmtModified(now);