diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java index e3910af..613aece 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/ApiController.java @@ -11,7 +11,6 @@ import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.vo.DictModel; import org.jeecg.common.util.*; -import org.jeecg.modules.ocr.controller.OcrSimulatorController; import org.jeecg.modules.ocr.entity.OcrIdentify; import org.jeecg.modules.ocr.entity.OcrIdentifyDetail; import org.jeecg.modules.ocr.entity.OcrRuleCheck; @@ -24,7 +23,6 @@ import org.jeecg.modules.ocr.utils.FileOUtils; import org.jeecg.modules.ocr.utils.ImageUtils; import org.jeecg.modules.ocr.dto.OcrIdentifyDTO; import org.jeecg.modules.ocr.dto.OcrRuleCheckDTO; -import org.jeecg.modules.ocr.vo.SimulateChecksVO; import org.jeecg.modules.system.service.ISysDictService; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; @@ -36,7 +34,6 @@ import javax.annotation.Resource; import java.awt.*; import java.io.File; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -266,25 +263,4 @@ public class ApiController { } - @ApiOperation(value = "测试病历单") - @PostMapping(value = "/test_bld") - public Result testCodeLogic() { - SimulateChecksVO simulateChecksVO=new SimulateChecksVO(); - simulateChecksVO.setIdentifyId("10086"); - List identifyDetailIds = Arrays.asList("119"); - simulateChecksVO.setIdentifyDetailIdList(identifyDetailIds); - simulateChecksVO.setRuleCheckId("114"); - simulateChecksVO.setPatientName("栾梓涵"); - simulateChecksVO.setMedicalRecordNumber("123456"); - simulateChecksVO.setAdmissionDate("2023-02-02 10:18:23"); - simulateChecksVO.setBornDate("2000-05-06"); - simulateChecksVO.setAge("23"); - //规则检查配置id - String ruleCheckId = simulateChecksVO.getRuleCheckId(); - List identifyDetailIdList = simulateChecksVO.getIdentifyDetailIdList(); - AssertUtils.notEmpty(ruleCheckId, "请选择[规则扫描器]"); - AssertUtils.hasSize(identifyDetailIdList,"请先上传图片"); - return Result.OK(ocrIdentifyService.simulateChecks(simulateChecksVO)); - } - } \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrSimulatorController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrSimulatorController.java index 7bfffef..895b0b9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrSimulatorController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrSimulatorController.java @@ -15,7 +15,6 @@ import org.jeecg.modules.ocr.service.IOcrIdentifyDetailService; import org.jeecg.modules.ocr.service.IOcrIdentifyService; import org.jeecg.modules.ocr.vo.SimulateChecksVO; import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrApiCallStatisticsServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrApiCallStatisticsServiceImpl.java index 0574558..fce8322 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrApiCallStatisticsServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrApiCallStatisticsServiceImpl.java @@ -48,7 +48,6 @@ public class OcrApiCallStatisticsServiceImpl extends ServiceImpl