From 136ad2bff80859488bd7616d799b8142d4ca1595 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Wed, 1 Sep 2021 13:14:10 +0800
Subject: [PATCH] 20210901v1.1

---
 .../com/ccsens/carbasics/api/PatientController.java   | 10 ++++++++++
 .../java/com/ccsens/carbasics/bean/vo/PatientVo.java  |  7 ++++---
 .../com/ccsens/carbasics/service/FirstAidService.java |  2 +-
 src/main/resources/mapper_dao/FirstAidDao.xml         | 11 ++++++-----
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ccsens/carbasics/api/PatientController.java b/src/main/java/com/ccsens/carbasics/api/PatientController.java
index fa88426..97a9bf6 100644
--- a/src/main/java/com/ccsens/carbasics/api/PatientController.java
+++ b/src/main/java/com/ccsens/carbasics/api/PatientController.java
@@ -94,4 +94,14 @@ public class PatientController {
     }
 
 
+    @MustLogin
+    @ApiOperation(value = "秘书修改审核状态", notes = "zy")
+    @RequestMapping(value = "/updateBySecretary", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<PageInfo<PatientVo.PatientListByQuality>> updateStatusBySecretary(@ApiParam @Validated @RequestBody QueryDto<PatientDto.QueryListByQuality> params) throws Exception{
+        log.info("秘书修改审核状态：{}", params);
+        firstAidService.queryPatientListBySecretary(params.getParam(), params.getUserId());
+        log.info("秘书修改审核状态成功");
+        return JsonResponse.newInstance().ok();
+    }
+
 }
diff --git a/src/main/java/com/ccsens/carbasics/bean/vo/PatientVo.java b/src/main/java/com/ccsens/carbasics/bean/vo/PatientVo.java
index 3d1017a..b922553 100644
--- a/src/main/java/com/ccsens/carbasics/bean/vo/PatientVo.java
+++ b/src/main/java/com/ccsens/carbasics/bean/vo/PatientVo.java
@@ -1,5 +1,6 @@
 package com.ccsens.carbasics.bean.vo;
 
+import com.ccsens.carbasics.util.Constant;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -144,13 +145,13 @@ public class PatientVo {
         private int times;
 
         public int getDataStatus() {
-            if(dataStatus == 1 && times >= 1){
+            if(dataStatus == Constant.DataStatus.FirstAidPass.status && times >= 1){
                 return 100;
             }
-            if(dataStatus == 3 && times >= 1){
+            if(dataStatus == Constant.DataStatus.DischargePass.status && times >= 1){
                 return 100;
             }
-            if(dataStatus == 6 && times >= 1){
+            if(dataStatus == Constant.DataStatus.ApplyForRefuse.status && times >= 1){
                 return 101;
             }
             return dataStatus;
diff --git a/src/main/java/com/ccsens/carbasics/service/FirstAidService.java b/src/main/java/com/ccsens/carbasics/service/FirstAidService.java
index c17d6ab..a9a4392 100644
--- a/src/main/java/com/ccsens/carbasics/service/FirstAidService.java
+++ b/src/main/java/com/ccsens/carbasics/service/FirstAidService.java
@@ -121,7 +121,7 @@ public class FirstAidService implements IFirstAidService{
         firstAid.setGender(param.getGender());
         firstAid.setNation(param.getNation());
         if(StrUtil.isNotEmpty(param.getIdcard())){
-            if(IdcardUtil.isValidCard(param.getIdcard())){
+            if(!IdcardUtil.isValidCard(param.getIdcard())){
                 throw new BaseException(DefaultCodeError.IDCARD_ERROR);
             }
             firstAid.setIdcard(param.getIdcard());
diff --git a/src/main/resources/mapper_dao/FirstAidDao.xml b/src/main/resources/mapper_dao/FirstAidDao.xml
index 83d2f23..dc349ff 100644
--- a/src/main/resources/mapper_dao/FirstAidDao.xml
+++ b/src/main/resources/mapper_dao/FirstAidDao.xml
@@ -124,16 +124,18 @@
         FROM
         (
             SELECT
-            id,
-            NAME,
+            id as firstAidId,
+            `name`,
             gender,
             age,
-            type,
+            `type`,
+            nation,
+            idcard,
             data_status AS dataStatus
             FROM
             t_qcp_first_aid
             WHERE
-            data_status = #{param.dataStatus}
+            data_status in (1,3,5,6)
             <if test="param.name!=null and param.name!=''">
                 AND `name` LIKE concat('%',#{param.name},'%')
             </if>
@@ -145,7 +147,6 @@
             <foreach collection="hospitalList" open="(" close=")" separator="," item="hospitalId">
                 #{hospitalId}
             </foreach>
-            AND data_status in (1,3,5,6)
         ) t
         LEFT JOIN t_qcp_first_aid_record t1 ON t.id = t1.first_aid_id
         AND t1.question_code = 'JBXX-ZYH'