Merge remote-tracking branch 'origin/dev/20220228_v3.0.1通用版_渠道管理第一期' into dev/20220228_v3.0.1通用版_渠道管理第一期

daqe-center/src/main/java/com/lantone/daqe/facade/BlockLossManagementFacade.java

@@ -592,7 +592,7 @@ public class BlockLossManagementFacade {
                 medicalRecords.stream().forEach(medicalRecord -> {
                     //病案首页不存在操作记录
                     if (StringUtil.isNotEmpty(medicalRecord.getHomePageId()) && !homepageLogs.contains(medicalRecord.getHomePageId())) {
-                        if (auditedResultDatas == null || !auditedResultDatas.contains(medicalRecord.getRecId())) {
+                        if (auditedResultDatas == null || !auditedResultDatas.contains(medicalRecord.getHomePageId())) {
                             BlocklossResult blocklossResult = new BlocklossResult();
                             blocklossResult.setBehospitalCode(medicalRecord.getBehospitalCode());
                             blocklossResult.setRecId(medicalRecord.getHomePageId());

daqe-center/src/main/java/com/lantone/daqe/facade/RegularManagementFacade.java

@@ -183,4 +183,20 @@ public class RegularManagementFacade {
         }
         return regularMappingIdList;
     }
+
+    /**
+     *  判断该正则式是否关联
+     *
+     * @param upRegularByIdVO
+     * @Return java.lang.Boolean
+     */
+    public Boolean isRelation(UpRegularByIdVO upRegularByIdVO) {
+        int count = regularMappingFacade.count(new QueryWrapper<RegularMapping>()
+                .eq("is_deleted",IsDeleteEnum.N.getKey())
+                .eq("regular_id",upRegularByIdVO.getId()));
+        if(count>0){
+            return true;
+        }
+        return false;
+    }
 }

daqe-center/src/main/java/com/lantone/daqe/web/RegularManagementController.java

@@ -39,6 +39,13 @@ public class RegularManagementController {
         return CommonResult.success(regularManagementFacade.getRegularPage(getRegularPageVO));
     }
 
+    @ApiOperation(value = "判断该正则式是否关联 [by:songxl]", notes = "判断该正则式是否关联")
+    @PostMapping("/isRelation")
+    @Transactional
+    public CommonResult<Boolean> isRelation(@RequestBody @Valid UpRegularByIdVO upRegularByIdVO) {
+        return CommonResult.success(regularManagementFacade.isRelation(upRegularByIdVO));
+    }
+
     @ApiOperation(value = "新增正则式 [by:songxl]", notes = "新增正则式")
     @PostMapping("/addRegular")
     @Transactional