Merge branch '20210512_yw_check' into test

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

@@ -217,6 +217,9 @@ public class MedCheckWorkFacade {
     public IPage<CheckWorkDTO> pageFac(CheckWorkPageVO checkWorkPageVO) {
         checkWorkPageSet(checkWorkPageVO);
         IPage<CheckWorkDTO> res = medCheckInfoFacade.getBaseMapper().getCheckWorkPage(checkWorkPageVO);
+        if (res == null || ListUtil.isEmpty(res.getRecords())) {
+            return res;
+        }
         res.getRecords().forEach(i -> {
             String age = "";
             if (StringUtil.isNotBlank(i.getAgeYear()) && !i.getAgeYear().equals("0")) {

src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -233,6 +233,7 @@
         LEFT JOIN med_check_info mci
         ON mbi.behospital_code = mci.behospital_code
         AND mbi.hospital_id = mci.hospital_id AND mci.is_deleted = 'N'
+        AND mci.check_id is null
         LEFT JOIN med_qcresult_info mqi
         ON mbi.behospital_code = mqi.behospital_code
         AND mbi.hospital_id = mqi.hospital_id AND mqi.is_deleted = 'N'