From 13e186d1debb3315821f3380349ce0bdb282fc1b Mon Sep 17 00:00:00 2001
From: zhizhi wu <2377881365@qq.com>
Date: Wed, 1 Sep 2021 10:59:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=97=85=E4=BE=8B=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ccsens/carbasics/api/DebugController.java | 46 +++++++++----------
 .../ccsens/carbasics/bean/vo/PatientVo.java   |  9 +++-
 src/main/resources/mapper_dao/FirstAidDao.xml | 22 +++++----
 3 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/src/main/java/com/ccsens/carbasics/api/DebugController.java b/src/main/java/com/ccsens/carbasics/api/DebugController.java
index 67170b3..75556db 100644
--- a/src/main/java/com/ccsens/carbasics/api/DebugController.java
+++ b/src/main/java/com/ccsens/carbasics/api/DebugController.java
@@ -23,8 +23,9 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.io.FileInputStream;
-import java.io.InputStream;
+import java.io.*;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 @Api(tags = "DEBUG" , description = "DebugController | ")
 @RestController
@@ -40,30 +41,27 @@ public class DebugController {
     })
     @RequestMapping(value="",method = {RequestMethod.GET, RequestMethod.POST},produces = {"application/json;charset=UTF-8"})
     public JsonResponse debug() throws Exception {
-        String sql = "insert into t_qcp_car_record(id,car_id, type, car_value, time) values(1, 2, 1, {}, {})";
-        String format = StrFormatter.format(sql, 1, 1);
-        String fullPath = "";
-        InputStream is = new FileInputStream(fullPath);
-        Workbook workbook;
-        if (fullPath.endsWith(Constant.XLS)) {
-            workbook = new HSSFWorkbook(is);
-        } else {
-            workbook = new XSSFWorkbook(is);
-        }
-        //获取sheet
-        Sheet sheet = workbook.getSheetAt(0);
-        //循环读取每一行
+        return JsonResponse.newInstance().ok("测试");
+    }
 
-        for (int i = 1; i <= sheet.getLastRowNum(); i++) {
-            //获取当前行
-            Row row = sheet.getRow(i);
-            if (ObjectUtil.isNull(row)) {
-                continue;
+
+    public void sql() throws Exception{
+        String sql = "insert into t_qcp_car_record(id,car_id, type, car_value, time) values({}, 2, 1, {}, {});";
+        BufferedReader reader = new BufferedReader(new FileReader("D:\\data.txt"));
+        BufferedWriter writer = new BufferedWriter(new FileWriter("D:\\sql.txt", true));
+        try{
+            String line;
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+            while ((line=reader.readLine()) != null) {
+                String[] arr = line.split(",");
+                Date date = sdf.parse(arr[0]);
+                String format = StrFormatter.format(sql, snowflake.nextId(), arr[1], date.getTime());
+                writer.write(format);
+                writer.newLine();
             }
-            //获取题目信息
-            String questionName = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(row.getCell(1)));
+        } finally {
+            reader.close();
+            writer.close();
         }
-            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 470dc1c..d261491 100644
--- a/src/main/java/com/ccsens/carbasics/bean/vo/PatientVo.java
+++ b/src/main/java/com/ccsens/carbasics/bean/vo/PatientVo.java
@@ -30,12 +30,17 @@ public class PatientVo {
         private byte demonstrate;
         @ApiModelProperty("病例状态 0:创建 1:急救审核通过  2:急救审核拒绝 3出院审核通过 4出院审核拒绝 5:申请修改 6:申请拒绝")
         private byte dataStatus;
-        @ApiModelProperty("模板类型 0：神内 1：神外")
-        private byte type;
         @ApiModelProperty("急救:发病时间 转归：出院时间")
         private String record1;
         @ApiModelProperty("急救:到院时间 转归:离院方式")
         private String record2;
+        @ApiModelProperty("项目ID")
+        private Long projectId;
+        @ApiModelProperty("疑似病例")
+        private String probableCase;
+        @ApiModelProperty("录入人ID")
+        private Long recordUserId;
+
         @ApiModelProperty("参与者")
         private List<FirstAidLogVo.Member> doctors;
     }
diff --git a/src/main/resources/mapper_dao/FirstAidDao.xml b/src/main/resources/mapper_dao/FirstAidDao.xml
index 26e542b..1255263 100644
--- a/src/main/resources/mapper_dao/FirstAidDao.xml
+++ b/src/main/resources/mapper_dao/FirstAidDao.xml
@@ -4,19 +4,12 @@
 
     <select id="querySelf" resultType="com.ccsens.carbasics.bean.vo.PatientVo$QueryPatientList">
         select a.id as firstAidId, a.name, a.gender, a.age, a.data_status as dataStatus,
-        a.value_type as demonstrate, a.type as type, r1.answer as record1, r2.answer as record2
+        a.value_type as demonstrate, a.type as type, r1.answer as record1, r2.answer as record2,
+        a.project_id as projectId, m.record_user_id as recordUserId, r3.answer as probableCase
         from
-            t_qcp_first_aid a
+            (select a.* from t_qcp_first_aid a, t_organization_project o where a.hospital_id = o.organization_id and o.project_id = #{param.projectId} and a.rec_status = 0 and o.rec_status = 0 )a
             left join t_qcp_first_aid_member m
             on a.id = m.first_aid_id and m.rec_status = 0
-            <choose>
-                <when test="param.type == 0">
-                    and m.create_user_id = #{userId}
-                </when>
-                <when test="param.type == 1">
-                    and m.record_user_id in (1000, 0)
-                </when>
-            </choose>
             left join t_qcp_first_aid_record r
             on a.id  = r.first_aid_id
             and r.question_code = 'CYQK-CYSJ' and r.rec_status = 0
@@ -30,6 +23,7 @@
                 <when test="param.firstAidType == 0">and r2.question_code='JBXX-DYSJ'</when>
                 <when test="param.firstAidType == 1">and r2.question_code='CYQK-LYFS'</when>
             </choose>
+            left join t_qcp_first_aid_record r3 on a.id = r3.first_aid_id and r3.question_code='CJBL-YSBL' and r3.rec_status = 0
         where
             <choose>
                 <when test="param.firstAidType == 0">r.id is null</when>
@@ -39,5 +33,13 @@
             <if test="param.name != null and param.name != ''">
               and a.name like concat('%', #{param.name}, '%')
             </if>
+            <choose>
+                <when test="param.type == 0">
+                    and m.create_user_id = #{userId}
+                </when>
+                <when test="param.type == 1">
+                    and m.record_user_id in (#{userId}, 0)
+                </when>
+            </choose>
     </select>
 </mapper>