ocr 医院ID-->患者ID

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;

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<QuestionOcrVo.OcrRule> queryRules(@Param("hospitalId") Long hospitalId, @Param("code") String code);
+    List<QuestionOcrVo.OcrRule> queryRules(@Param("patientId") Long patientId, @Param("code") String code);
 }

tcm/src/main/java/com/ccsens/tcm/service/OcrService.java

@@ -50,7 +50,7 @@ public class OcrService implements IOcrService {
         long time1 = System.currentTimeMillis();
         List<QuestionOcrVo.GeneralBasic> vos = new ArrayList<>();
         // 类型测评规则
-        List<QuestionOcrVo.OcrRule> rules = questionOcrDao.queryRules(generalBasic.getHospitalId(), generalBasic.getCode());
+        List<QuestionOcrVo.OcrRule> 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());

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
   </select>
 </mapper>

tcm/src/main/resources/mapper_dao/ReportCodeDao.xml

@@ -142,6 +142,7 @@
             <if test="code != null and code != ''">
                 and (c.`code` = #{code})
             </if>
+            and t.recode_time = #{nums}
             and t.rec_status = 0
             and c.rec_status = 0
         ) c1