核查bug修复

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

@@ -197,7 +197,11 @@ public class AlgorithmFacade {
                 }
                 qcResultAlgVOList.add(algorithmVO.getOptResultAlgVO());
             }
-
+            if(ListUtil.isEmpty(qcResultAlgVOList)){
+                qcResultAlgVOList = new ArrayList<>();
+                qcResultAlgVOList.add(algorithmVO.getOptResultAlgVO());
+                algorithmVO.setQcResultAlgVOList(qcResultAlgVOList);
+            }
         }
         //删除
         else if (algorithmVO.getType().equals(2)||(algorithmVO.getType().equals(4)&&0==algorithmVO.getDelStatus())) {

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -14851,21 +14851,15 @@
         CONCAT( ifnull(t2.age,'') ,ifnull(t2.age_unit,'') )as age,
         t1.file_code AS fileCode,
         t1.checkStatus,
-        t1.mrStatus,
         t1.chName,
-        t1.mrName,
-        t1.chTime,
-        t1.mrTime
+        t1.chTime
         FROM
         (
         SELECT
         be.*,
         ifnull( mci.STATUS, 0 ) AS checkStatus,
-        ifnull( hm_mci.STATUS, 0 ) AS mrStatus,
         mci.check_name AS chName,
-        hm_mci.check_name AS mrName,
-        mci.gmt_create AS chTime,
-        hm_mci.gmt_create AS mrTime
+        mci.gmt_create AS chTime
         FROM
         (
         SELECT DISTINCT
@@ -15020,13 +15014,9 @@
         </if>
         ) be
         LEFT JOIN med_check_info mci ON mci.is_deleted = 'N'
-        AND mci.check_type = 0
+        AND mci.check_type in(0,2)
         AND be.hospital_id = mci.hospital_id
         AND be.behospital_code = mci.behospital_code
-        LEFT JOIN med_check_info hm_mci ON hm_mci.is_deleted = 'N'
-        AND hm_mci.check_type = 1
-        AND be.hospital_id = hm_mci.hospital_id
-        AND be.behospital_code = hm_mci.behospital_code
         ) t1
         LEFT JOIN med_home_page t2 ON t1.hospital_id = t2.hospital_id
         AND t1.behospital_code = t2.behospital_code
@@ -15351,22 +15341,16 @@
         CONCAT( ifnull(t2.age,'') ,ifnull(t2.age_unit,'') )as age,
         t1.file_code AS fileCode,
         t1.checkStatus,
-        t1.mrStatus,
         t1.chName,
-        t1.mrName,
-        t1.chTime,
-        t1.mrTime
+        t1.chTime
         FROM
         (
         SELECT
         be.*,
         ifnull( mci.STATUS, 0 ) AS checkStatus,
-        ifnull( hm_mci.STATUS, 0 ) AS mrStatus,
         mci.check_name AS chName,
         e.score_res as scoreBn,
-        hm_mci.check_name AS mrName,
-        mci.gmt_create AS chTime,
-        hm_mci.gmt_create AS mrTime
+        mci.gmt_create AS chTime
         FROM
         (
         SELECT DISTINCT
@@ -15452,13 +15436,9 @@
         </if>
         ) be
         LEFT JOIN med_check_info mci ON mci.is_deleted = 'N'
-        AND mci.check_type = 0
+        AND mci.check_type in(0,2)
         AND be.hospital_id = mci.hospital_id
         AND be.behospital_code = mci.behospital_code
-        LEFT JOIN med_check_info hm_mci ON hm_mci.is_deleted = 'N'
-        AND hm_mci.check_type = 1
-        AND be.hospital_id = hm_mci.hospital_id
-        AND be.behospital_code = hm_mci.behospital_code
         LEFT JOIN med_qcresult_cases e
         on  be.behospital_code = e.behospital_code
         and be.hospital_id = e.hospital_id