问题修正

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

@@ -482,7 +482,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         List<QcModeDTO> qcModeDTOList = qcModeFacade.getMenu(pageMap);
         String menuData = JSON.toJSONString(qcModeDTOList);
 
-        Date date = qcresultInfoFacade.saveQcResult(algorithmDTO, algorithmVO, analyzeVO, pageData, menuData, analyzeVO.getIsTask());
+        Date date = qcresultInfoFacade.saveQcResult(algorithmDTO, algorithmVO, analyzeVO, pageData, menuData, analyzeVO.getIsTask(), null);
 
         // 返回提示信息
         //        List<MsgDTO> msgDTOList = getMsg(analyzeVO);

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

@@ -79,13 +79,13 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该医院下该病历号不存在！");
         }
         //验证是否评估过
-        Integer cnt
-                = this.count(
+        QcresultInfo qcresultInfo
+                = this.getOne(
                 new QueryWrapper<QcresultInfo>()
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
                         .eq("hospital_id", hospitalId)
-                        .eq("behospital_code", qcresultVO.getBehospitalCode()));
-        if (cnt < 1) {
+                        .eq("behospital_code", qcresultVO.getBehospitalCode()), false);
+        if (null == qcresultInfo) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该病历尚未评分，请先评分！");
         }
         //查询质控评分明细信息
@@ -111,7 +111,7 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
         AnalyzeVO analyzeVO = new AnalyzeVO();
         analyzeVO.setHospitalId(hospitalId);
         analyzeVO.setBehospitalCode(qcresultVO.getBehospitalCode());
-        Date date = this.saveQcResult(algorithmDTO, algorithmVO, analyzeVO, null, null, false);
+        Date date = this.saveQcResult(algorithmDTO, algorithmVO, analyzeVO, null, null, false, qcresultInfo);
         //返回参数组装
         AnalyzeDTO analyzeDTO = new AnalyzeDTO();
         analyzeDTO.setBehospitalCode(qcresultVO.getBehospitalCode());
@@ -136,7 +136,7 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
      * @return 评分的时间
      */
     public Date saveQcResult(AlgorithmDTO algorithmDTO, AlgorithmVO algorithmVO, AnalyzeVO analyzeVO,
-                             String pageData, String menuData, Boolean isTask) {
+                             String pageData, String menuData, Boolean isTask, QcresultInfo qcresultInfoOld) {
         //更新质控评分结果信息
         Long useId = 0L;
         if (!isTask) {
@@ -153,6 +153,9 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
                 .set("gmt_modified", now));
         //新增记录
         QcresultInfo qcresultInfo = new QcresultInfo();
+        if (qcresultInfoOld != null) {
+            BeanUtil.copyProperties(qcresultInfoOld, qcresultInfo);
+        }
         qcresultInfo.setBehospitalCode(analyzeVO.getBehospitalCode());
         qcresultInfo.setHospitalId(analyzeVO.getHospitalId());
         qcresultInfo.setScoreRes(algorithmDTO.getScore());