Merge branch 'dev/20210808_核查bug修复' into innerDevelop

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

@@ -230,28 +230,32 @@ public class AlgorithmFacade {
                 throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "恢复操作条目不能为空！");
             }
             //操作数据
-            if (ListUtil.isNotEmpty(qcResultAlgVOList)) {
-                Boolean hasData = false;
-                Long optId = algorithmVO.getOptResultAlgVO().getId(); // 操作id
-                QcresultDetail qcresultDetail = qcresultDetailFacade.getOne(new QueryWrapper<QcresultDetail>()
-                        .eq("id",optId));
-                if(qcresultDetail!=null)
-                {
-                    QcResultAlgVO qcResultAlgVO = new QcResultAlgVO();
-                    qcResultAlgVO.setScore(qcresultDetail.getScore());
-                    qcResultAlgVO.setId(qcresultDetail.getId());
-                    qcResultAlgVO.setCasesEntryId(qcresultDetail.getCasesEntryId());
-                    qcResultAlgVO.setCasesId(qcresultDetail.getCasesId());
-                    qcResultAlgVO.setMsg(qcresultDetail.getMsg());
-                    qcResultAlgVO.setIsReject(qcresultDetail.getIsReject());
-                    qcResultAlgVO.setCasesScore(qcresultDetail.getCasesScore());
+            Boolean hasData = false;
+            Long optId = algorithmVO.getOptResultAlgVO().getId(); // 操作id
+            QcresultDetail qcresultDetail = qcresultDetailFacade.getOne(new QueryWrapper<QcresultDetail>()
+                    .eq("id",optId));
+            if(qcresultDetail!=null)
+            {
+                QcResultAlgVO qcResultAlgVO = new QcResultAlgVO();
+                qcResultAlgVO.setScore(qcresultDetail.getScore());
+                qcResultAlgVO.setId(qcresultDetail.getId());
+                qcResultAlgVO.setCasesEntryId(qcresultDetail.getCasesEntryId());
+                qcResultAlgVO.setCasesId(qcresultDetail.getCasesId());
+                qcResultAlgVO.setMsg(qcresultDetail.getMsg());
+                qcResultAlgVO.setIsReject(qcresultDetail.getIsReject());
+                qcResultAlgVO.setCasesScore(qcresultDetail.getCasesScore());
+                if (ListUtil.isNotEmpty(qcResultAlgVOList)) {
                     qcResultAlgVOList.add(qcResultAlgVO);
-                    hasData = true;
+                }else{
+                    qcResultAlgVOList = new ArrayList<>();
+                    qcResultAlgVOList.add(qcResultAlgVO);
+                    algorithmVO.setQcResultAlgVOList(qcResultAlgVOList);
                 }
+                hasData = true;
+            }
                 if (!hasData) {
                     throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "恢复的条目不存在！");
                 }
-            }
         }
 
         //修改

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -6573,7 +6573,6 @@
         a.doctor_name
         FROM
         med_behospital_info a,
-        med_behospital_info a,
         med_qcresult_info b,
         med_qcresult_detail c,
         qc_cases_entry d,
@@ -14831,6 +14830,7 @@
         t1.LEVEL AS LEVEL,
         t1.grade_type AS gradeType,
         t1.score_res AS scoreRes,
+        t1.scoreBn,
         t1.NAME AS NAME,
         t1.sex AS sex,
         t1.beh_dept_id AS behDeptId,
@@ -14886,7 +14886,8 @@
         a.diagnose,
         a.placefile_date,
         a.ward_name,
-        c.gmt_create
+        c.gmt_create,
+        d.score_res as scoreBn
         FROM
         med_behospital_info a,
         med_home_page b,