Merge branch 'master' of dd.tall.wiki:ccsens_wiki/carbasics

src/main/java/com/ccsens/carbasics/api/OcrController.java

@@ -67,9 +67,9 @@ public class OcrController {
     @MustLogin
     @ApiOperation(value = "图片文字识别",notes = "")
     @RequestMapping(value="/general/basic",method = RequestMethod.POST,produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<List<QuestionOcrVo.CodeAndAnswer>> queryInpatient(QueryDto<List<MultipartFile>> params, Long firstAidId) throws Exception {
+    public JsonResponse<List<QuestionOcrVo.CodeAndAnswer>> queryInpatient(QueryDto<List<MultipartFile>> params, Long projectId) throws Exception {
         log.info("图片文字识别请求：{}", params);
-        List<QuestionOcrVo.CodeAndAnswer> words = ocrService.discernWords(params.getParam(), params.getUserId(),firstAidId);
+        List<QuestionOcrVo.CodeAndAnswer> words = ocrService.discernWords(params.getParam(), params.getUserId(),projectId);
         log.info("图片文字识别结束：{}", words);
         return JsonResponse.newInstance().ok(words);
     }

src/main/java/com/ccsens/carbasics/persist/dao/FirstAidDao.java

@@ -49,4 +49,10 @@ public interface FirstAidDao extends FirstAidMapper {
      */
     List<PatientVo.QueryPatientList> querySelf(@Param("param") PatientDto.QueryPatient param, @Param("userId") Long userId);
 
+    /**
+     * 根据项目id查询急救信息
+     * @param projectId 项目id
+     * @return 急救信息
+     */
+    FirstAid queryByProjectId(@Param("projectId") Long projectId);
 }

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

@@ -197,8 +197,9 @@ public class OcrService implements IOcrService {
 
 
     @Override
-    public List<QuestionOcrVo.CodeAndAnswer> discernWords(List<MultipartFile> param, Long userId,Long firstAidId) throws IOException, ParseException {
-        FirstAid firstAidInfo = firstAidDao.selectByPrimaryKey(firstAidId);
+    public List<QuestionOcrVo.CodeAndAnswer> discernWords(List<MultipartFile> param, Long userId,Long projectId) throws IOException, ParseException {
+//        FirstAid firstAidInfo = firstAidDao.selectByPrimaryKey(firstAidId);
+        FirstAid firstAidInfo = firstAidDao.queryByProjectId(projectId);
         if (ObjectUtil.isNull(firstAidInfo)) {
             throw new BaseException("急救信息错误");
         }
@@ -219,7 +220,7 @@ public class OcrService implements IOcrService {
         int year = instance.get(Calendar.YEAR);
 
         //查询发病时间
-        Long time = firstAidRecordDao.queryDiseaseTime(firstAidId);
+        Long time = firstAidRecordDao.queryDiseaseTime(firstAidInfo.getId());
 
         //识别图片,放入文字集合
         List<String> strList = new ArrayList<>();
@@ -240,7 +241,7 @@ public class OcrService implements IOcrService {
             String extName = FileUtil.extName(file.getOriginalFilename());
             String dir = PropUtil.path + File.separator + Constant.OrcImg.FILE_DIR;
             String extraPath = DateUtil.format(new Date(), "yyyyMMdd");
-            String path = extraPath + File.separator+firstAidId+firstAidInfo.getName()+File.separator+ IdUtil.simpleUUID() + "." + extName;
+            String path = extraPath + File.separator+firstAidInfo.getId()+firstAidInfo.getName()+File.separator+ IdUtil.simpleUUID() + "." + extName;
             //转成file
             File saveFile = new File(dir + extraPath);
             if (!saveFile.exists()) {

src/main/resources/mapper_dao/FirstAidDao.xml

@@ -183,4 +183,27 @@
         GROUP BY t.firstAidId
         ORDER BY t.updated_at DESC
     </select>
+
+    <select id="queryByProjectId" resultType="com.ccsens.carbasics.bean.po.FirstAid">
+        SELECT
+            id,
+            `name`,
+            gender,
+            age,
+            nation,
+            idcard,
+            phone,
+            type,
+            value_type,
+            save_type,
+            data_status,
+            project_id,
+            hospital_id,
+            operator
+        FROM
+            t_qcp_first_aid
+        WHERE
+            project_id = #{projectId}
+        AND rec_status = 0
+    </select>
 </mapper>