diff --git a/jeecg-module-system/jeecg-system-biz/pom.xml b/jeecg-module-system/jeecg-system-biz/pom.xml index 4e61cc0..112773e 100644 --- a/jeecg-module-system/jeecg-system-biz/pom.xml +++ b/jeecg-module-system/jeecg-system-biz/pom.xml @@ -53,11 +53,17 @@ similarity 1.1.6 - + + org.testng + testng + RELEASE + compile + + 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 613aece..e3910af 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,6 +11,7 @@ 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; @@ -23,6 +24,7 @@ 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; @@ -34,6 +36,7 @@ import javax.annotation.Resource; import java.awt.*; import java.io.File; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -263,4 +266,25 @@ 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 895b0b9..7bfffef 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,6 +15,7 @@ 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 fce8322..0574558 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,6 +48,7 @@ public class OcrApiCallStatisticsServiceImpl extends ServiceImpl