修改ocr接口1027

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

@@ -213,7 +213,7 @@ public class OcrService implements IOcrService {
         SimpleDateFormat frontTime = new SimpleDateFormat("yy-MM-ddHH:mm");
         String frontReg = "\\d{1,2}-\\d{1,2}-\\d{2,4}:\\d{1,2}";
         Pattern frontPat = Pattern.compile(frontReg);
-        SimpleDateFormat backTime = new SimpleDateFormat("yyyyMMddHH");
+        SimpleDateFormat backTime = new SimpleDateFormat("yyyyMMdd");
         String backReg = "\\d{1,6}:\\d{1,2}";
         Pattern backPat = Pattern.compile(backReg);
         Calendar instance = Calendar.getInstance();
@@ -304,7 +304,8 @@ public class OcrService implements IOcrService {
                                 long endTimestamp = 0L;
                                 if (backMatcher.find()) {
                                     String endTime = backMatcher.group();
-                                    endTimestamp = backTime.parse(year + endTime).getTime();
+                                    String endTimeNew = endTime.replaceAll("[[\\s-:punct:]]", "");
+                                    endTimestamp = backTime.parse(year + endTimeNew).getTime();
                                 }
                                 //将code与答案保存到结果集合
                                 giveCodeAndAnswer(resultList,ocrKeyword.getId(),(byte)0,"",strList.get(i),endTimestamp,timeOfDischarge);
@@ -315,7 +316,8 @@ public class OcrService implements IOcrService {
                                     long endTimestamp = 0L;
                                     if (backMatcher.find()) {
                                         String endTime = backMatcher.group();
-                                        endTimestamp = backTime.parse(year + endTime).getTime();
+                                        String endTimeNew = endTime.replaceAll("[[\\s-:punct:]]", "");
+                                        endTimestamp = backTime.parse(year + endTimeNew).getTime();
                                     }
                                     String startTime = frontMatcher.group();
                                     if (frontTime.parse(startTime).getTime()-time <= Constant.OrcImg.HOVER_48){
@@ -350,7 +352,8 @@ public class OcrService implements IOcrService {
                             long endTimestamp = 0L;
                             if (backMatcher.find()) {
                                 String endTime = backMatcher.group();
-                                endTimestamp = backTime.parse(year + endTime).getTime();
+                                String endTimeNew = endTime.replaceAll("[[\\s-:punct:]]", "");
+                                endTimestamp = backTime.parse(year + endTimeNew).getTime();
                             }
                             //将code与答案保存到结果集合
                             giveCodeAndAnswer(resultList,ocrKeyword.getId(),(byte)0,"无",strList.get(i),endTimestamp,timeOfDischarge);
@@ -389,7 +392,8 @@ public class OcrService implements IOcrService {
                         long endTimestamp = 0L;
                         if (backMatcher.find()) {
                             String endTime = backMatcher.group();
-                            endTimestamp = backTime.parse(year + endTime).getTime();
+                            String endTimeNew = endTime.replaceAll("[[\\s-:punct:]]", "");
+                            endTimestamp = backTime.parse(year + endTimeNew).getTime();
                         }
                         //将code与答案保存到结果集合
                         giveCodeAndAnswer(resultList,ocrKeyword.getId(),(byte)0,"",strList.get(i),endTimestamp,timeOfDischarge);

src/main/resources/mapper_dao/FirstAidRecordDao.xml

@@ -618,6 +618,7 @@
             rec_status = 0
         AND first_aid_id = #{firstAidId}
         AND question_code = 'JBXX-FBSJ'
+        AND answer != '未知'
     </select>