diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/dto/QuestionOcrDto.java b/tcm/src/main/java/com/ccsens/tcm/bean/dto/QuestionOcrDto.java index 83f7711f..b7d300d9 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/dto/QuestionOcrDto.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/dto/QuestionOcrDto.java @@ -16,8 +16,8 @@ public class QuestionOcrDto { @ApiModel("报告单图片文字通用识别-请求") @Data public static class GeneralBasic{ - @ApiModelProperty("医院ID") - private Long hospitalId; + @ApiModelProperty("患者ID") + private Long patientId; @ApiModelProperty("报告单类型") @NotBlank private String code; diff --git a/tcm/src/main/java/com/ccsens/tcm/persist/dao/QuestionOcrDao.java b/tcm/src/main/java/com/ccsens/tcm/persist/dao/QuestionOcrDao.java index d7982196..1024e9d2 100644 --- a/tcm/src/main/java/com/ccsens/tcm/persist/dao/QuestionOcrDao.java +++ b/tcm/src/main/java/com/ccsens/tcm/persist/dao/QuestionOcrDao.java @@ -12,9 +12,9 @@ import java.util.List; public interface QuestionOcrDao extends QuestionOcrMapper { /** * 查询识别规则 - * @param hospitalId 医院ID + * @param patientId 患者ID * @param code 类型 * @return 规则 */ - List queryRules(@Param("hospitalId") Long hospitalId, @Param("code") String code); + List queryRules(@Param("patientId") Long patientId, @Param("code") String code); } diff --git a/tcm/src/main/java/com/ccsens/tcm/service/OcrService.java b/tcm/src/main/java/com/ccsens/tcm/service/OcrService.java index 6db98029..3cfedc88 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/OcrService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/OcrService.java @@ -50,7 +50,7 @@ public class OcrService implements IOcrService { long time1 = System.currentTimeMillis(); List vos = new ArrayList<>(); // 类型测评规则 - List rules = questionOcrDao.queryRules(generalBasic.getHospitalId(), generalBasic.getCode()); + List rules = questionOcrDao.queryRules(generalBasic.getPatientId(), generalBasic.getCode()); log.info("规则:{}", rules); if (CollectionUtil.isEmpty(rules)) { return vos; @@ -89,7 +89,7 @@ public class OcrService implements IOcrService { int curCode = 200; if (code != curCode) { CodeEnum thirdError = CodeEnum.THIRD_ERROR; - thirdError.setMsg(response.getEx().getMessage()); + thirdError.setMsg(response.getMessage()); throw new BaseException(thirdError); } String result = new String(response.getBody()); diff --git a/tcm/src/main/resources/mapper_dao/QuestionOcrDao.xml b/tcm/src/main/resources/mapper_dao/QuestionOcrDao.xml index 2560349c..7d21aa95 100644 --- a/tcm/src/main/resources/mapper_dao/QuestionOcrDao.xml +++ b/tcm/src/main/resources/mapper_dao/QuestionOcrDao.xml @@ -13,13 +13,16 @@ o.END FROM t_question_ocr o, - t_question q + t_question q, + t_patient_information p WHERE o.CODE = q.CODE AND o.sort = q.sort + AND o.hospital_id = p.hospital_id + AND p.id = #{patientId} AND o.CODE = #{code} - AND o.hospital_id = #{hospitalId} AND o.rec_status = 0 AND q.rec_status = 0 + AND p.rec_status = 0 \ No newline at end of file diff --git a/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml b/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml index a7693bd5..299d9f35 100644 --- a/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml +++ b/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml @@ -142,6 +142,7 @@ and (c.`code` = #{code}) + and t.recode_time = #{nums} and t.rec_status = 0 and c.rec_status = 0 ) c1