Merge branch 'dev/20210808_核查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())) {
@@ -226,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);
+                }else{
+                    qcResultAlgVOList = new ArrayList<>();
                     qcResultAlgVOList.add(qcResultAlgVO);
-                    hasData = true;
+                    algorithmVO.setQcResultAlgVOList(qcResultAlgVOList);
                 }
+                hasData = true;
+            }
                 if (!hasData) {
                     throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "恢复的条目不存在！");
                 }
-            }
         }
 
         //修改

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

@@ -463,7 +463,7 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
                     allCheckDept.getDeptcheckUsers().add(deptCheckUserDTO);
                 }
                 allCheckDept.getDeptcheckUsers().forEach(oneDeptCheckUser -> {
-                    if(!deptId.equals(oneDeptCheckUser.getDeptId())&&!userId.equals(oneDeptCheckUser.getDoctorId()))
+                    if(!userId.equals(oneDeptCheckUser.getDoctorId()))
                     {
                         hasFlag.set(true);
                     }

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,
@@ -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
@@ -14892,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,
@@ -15020,13 +15015,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 +15342,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 +15437,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
@@ -15689,24 +15670,21 @@
         SELECT
         f1.behDeptId,
         f1.behDeptName,
-        f1.doctorName,
         f1.patName,
         f1.behospitalCode,
         f1.hospitalId,
         f1.behospitalDate,
         f1.leaveHospitalDate,
         f1.score,
+        f1.scoreBn,
         f2.avgScore,
         <if test="qcResultShortPageVO.radioCheck !=null and qcResultShortPageVO.radioCheck == 1">
         f1.msg,
         f1.caseName,
         </if>
         f1.checkStatus,
-        f1.mrStatus,
         f1.chName,
-        f1.mrName,
-        f1.chTime,
-        f1.mrTime
+        f1.chTime
         FROM
         (SELECT
         t.doctorName AS behDoctorName,
@@ -15715,6 +15693,7 @@
         t.behospitalDate AS behospitalDate,
         t.leaveHospitalDate AS leaveHospitalDate,
         qi.score_res AS score,
+        t.scoreBn,
         <if test="qcResultShortPageVO.radioCheck !=null and qcResultShortPageVO.radioCheck == 1">
         qd.msg AS msg,
         qc.NAME AS caseName,
@@ -15723,11 +15702,8 @@
         t.behDeptName,
         t.hospitalId,
         t.checkStatus,
-        t.mrStatus,
         t.chName,
-        t.mrName,
-        t.chTime,
-        t.mrTime
+        t.chTime
         FROM
         (
         SELECT DISTINCT
@@ -15737,6 +15713,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,
@@ -15757,21 +15734,15 @@
         t2.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
@@ -15798,7 +15769,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,
@@ -15926,13 +15898,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
@@ -16007,21 +15975,15 @@
         t2.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
@@ -16176,13 +16138,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
@@ -16810,11 +16768,8 @@
         f1.caseName,
         </if>
         f1.checkStatus,
-        f1.mrStatus,
         f1.chName,
-        f1.mrName,
-        f1.chTime,
-        f1.mrTime
+        f1.chTime
         FROM
         (SELECT
         t.doctorName,
@@ -16832,11 +16787,8 @@
         t.behDeptName,
         t.hospitalId,
         t.checkStatus,
-        t.mrStatus,
         t.chName,
-        t.mrName,
-        t.chTime,
-        t.mrTime
+        t.chTime
         FROM
         (
         SELECT DISTINCT
@@ -16867,22 +16819,16 @@
         t2.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
@@ -16969,13 +16915,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
@@ -17055,21 +16997,15 @@
         t2.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
@@ -17156,13 +17092,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