From 5e9e08203cf70c6768d58de71c8bc8006e92f242 Mon Sep 17 00:00:00 2001
From: ccsens_wu <2377881365@qq.com>
Date: Mon, 22 Nov 2021 20:24:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=20=E6=96=87?=
 =?UTF-8?q?=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ccsens/carbasics/service/FirstAidRecordService.java   | 4 ++--
 src/main/java/com/ccsens/carbasics/util/DefaultCodeError.java | 2 ++
 src/main/resources/mapper_dao/FirstAidDao.xml                 | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ccsens/carbasics/service/FirstAidRecordService.java b/src/main/java/com/ccsens/carbasics/service/FirstAidRecordService.java
index bdcb02a..2158491 100644
--- a/src/main/java/com/ccsens/carbasics/service/FirstAidRecordService.java
+++ b/src/main/java/com/ccsens/carbasics/service/FirstAidRecordService.java
@@ -227,7 +227,7 @@ public class FirstAidRecordService implements IFirstAidRecordService {
             param.getCodeAndAnswerList().forEach(codeAndAnswer -> {
                 if (children.contains(codeAndAnswer.getQuestionCode())) {
                     log.info("{}是急救的code，不能修改", codeAndAnswer.getQuestionCode() );
-                    throw new BaseException(DefaultCodeError.NO_DATA_MODIFY_PRIVILEGE);
+                    throw new BaseException(DefaultCodeError.FIRST_AID_AUDIT);
                 }
             });
         } else if (firstAid.getDataStatus() == Constant.DataStatus.DischargeRefuse.status) {
@@ -250,7 +250,7 @@ public class FirstAidRecordService implements IFirstAidRecordService {
 //            }
         } else {
             // 出院审核通过 申请修改 申请拒绝
-            throw new BaseException(DefaultCodeError.NO_DATA_MODIFY_PRIVILEGE);
+            throw new BaseException(DefaultCodeError.OUT_HOSPITAL_AUDIT);
         }
     }
 
diff --git a/src/main/java/com/ccsens/carbasics/util/DefaultCodeError.java b/src/main/java/com/ccsens/carbasics/util/DefaultCodeError.java
index 7887ab7..b81a75f 100644
--- a/src/main/java/com/ccsens/carbasics/util/DefaultCodeError.java
+++ b/src/main/java/com/ccsens/carbasics/util/DefaultCodeError.java
@@ -51,6 +51,8 @@ public class DefaultCodeError extends CodeError {
      */
     public static final Code REPEAT_CREATE = new Code(505,"已创建患者,请勿重复创建", true);
     public static final Code BUTTON_START_ALREADY = new Code(506,"本次急救已一键启动", true);
+    public static final Code FIRST_AID_AUDIT = new Code(507,"急救审核通过，数据不可修改", true);
+    public static final Code OUT_HOSPITAL_AUDIT = new Code(508,"出院审核通过，数据不可修改", true);
 
 
 
diff --git a/src/main/resources/mapper_dao/FirstAidDao.xml b/src/main/resources/mapper_dao/FirstAidDao.xml
index 5b5eddc..1a590f4 100644
--- a/src/main/resources/mapper_dao/FirstAidDao.xml
+++ b/src/main/resources/mapper_dao/FirstAidDao.xml
@@ -256,7 +256,7 @@
         AND op.rec_status = 0
         AND f.rec_status = 0
         <if test="startTime != null and startTime != ''">
-        AND  f.created_at > #{startTime}
+        AND  f.created_at > FROM_UNIXTIME(#{startTime}/1000,'%Y-%m-%d %H:%i:%s')
         </if>
         ORDER BY f.created_at DESC
     </select>