优化查询逻辑

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

@@ -1105,15 +1105,6 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         // 处理公共数据
         QueryVo queryVo = dealCommonData(hospitalId, analyzeVO);
         queryVo.setUseCrfCache(analyzeVO.isUseCrfCache());
-        //已核查抛出以评分
-//        List<MedCheckInfo> medCheckInfos = medCheckInfoFacade.list(new QueryWrapper<MedCheckInfo>()
-//                .eq("is_deleted", IsDeleteEnum.N.getKey())
-//                .eq("hospital_id", analyzeVO.getHospitalId())
-//                .eq("behospital_code", analyzeVO.getBehospitalCode()));
-//        Set<Integer> status = medCheckInfos.stream().map(MedCheckInfo::getStatus).collect(Collectors.toSet());
-//        if (medCheckInfos.size() >= 1 && status.contains(CheckStatusEnum.Enable.getKey()) && analyzeVO.getCheckFlag()) {
-//            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该病例已经核查无需评分！");
-//        }
         //  调用质控接口
         Response<OutputInfo> response = qcServiceClient.extract(queryVo);
         if (response == null || response.getData() == null) {
@@ -1137,10 +1128,6 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         AlgorithmDTO algorithmDTO = (AlgorithmDTO) resMap.get("algorithmDTO");
         Date date = (Date) resMap.get("date");
 
-        // 返回提示信息
-        //        List<MsgDTO> msgDTOList = getMsg(analyzeVO);
-        //        Map<String, List<MsgDTO>> msgMap = EntityUtil.makeEntityListMap(msgDTOList, "modelName");
-
         //返回参数组装
         AnalyzeDTO analyzeDTO = new AnalyzeDTO();
         analyzeDTO.setBehospitalCode(analyzeVO.getBehospitalCode());
@@ -1717,21 +1704,6 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         }
     }
 
-
-    // /**
-    //  * 对出院日期之前3天的未评分的病历进行评分
-    //  */
-    // public void execute2(TaskVO taskVO) {
-    //     List<BehospitalInfo> behospitalInfoList = getNoGrade(taskVO);
-    //     for (BehospitalInfo bean : behospitalInfoList) {
-    //         AnalyzeVO analyzeVO = new AnalyzeVO();
-    //         analyzeVO.setIsTask(true);
-    //         analyzeVO.setHospitalId(bean.getHospitalId());
-    //         analyzeVO.setBehospitalCode(bean.getBehospitalCode());
-    //         authServiceClient.analyze_rpc(analyzeVO);
-    //     }
-    // }
-
     /**
      * 评分api
      *

src/main/java/com/diagbot/web/DataController.java

@@ -217,24 +217,6 @@ public class DataController {
         return RespDTO.onSuc(b);
     }
 
-    /*
-    @ApiOperation(value = "数据引擎-列字段名和注释")
-    @PostMapping("/getColumnZhAndCh")
-    @SysLogger("getColumnZhAndCh")
-    public RespDTO getColumnZhAndCh(){
-        aStrConsultationNoteFacade.getColumnZhAndCh();
-        return RespDTO.onSuc(true);
-    }
-    @Autowired
-    private ColumnFacade columnFacade;
-    @ApiOperation(value = "病历解析")
-    @PostMapping("/analyseRec")
-    @SysLogger("analyseRec")
-    public RespDTO analyseRec(@RequestBody AColumnVO aColumnVO){
-        columnFacade.analyseRec(aColumnVO.getHospitalId(),aColumnVO.getModeId(),aColumnVO.getContent());
-        return RespDTO.onSuc(true);
-    }*/
-
     @ApiOperation(value = "甲级以下病历统计",
             notes = "hospitalId：医院编码<br>" +
                     "behDeptName：住院科室名称<br>" +

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -483,19 +483,19 @@
         d.cases_entry_id,
         d.is_reject,
         d.cases_id
-        ) tt1,
-        qc_cases_entry tt2
-        WHERE
-        tt2.is_deleted = 'N'
-        AND tt1.cases_id = tt2.cases_id
-        AND tt1.cases_entry_id = tt2.id
-        <if test="filterPageVO.name != null and filterPageVO.name != ''">
+        ) tt1,(select tt2.* from qc_cases_entry tt2 ,qc_cases_entry_hospital a
+        	where tt2.is_deleted = 'N' and a.cases_entry_id=tt2.id and a.is_deleted = 'N' and a.is_used=1
+    	 <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
+            AND a.hospital_id = #{filterPageVO.hospitalId}
+        </if>
+         <if test="filterPageVO.name != null and filterPageVO.name != ''">
             AND tt2.name like CONCAT('%', #{filterPageVO.name},'%')
         </if>
         <if test="filterPageVO.casesName != null and filterPageVO.casesName != ''">
             AND tt2.cases_name like CONCAT('%', #{filterPageVO.casesName},'%')
         </if>
-
+        )tt2 WHERE tt1.cases_id = tt2.cases_id
+        AND tt1.cases_entry_id = tt2.id
     </select>
     <!-- 条目缺陷占比缺陷总量（内页） -->
     <select id="entryGroupByEntrySum" resultType="java.lang.Integer">