核酸阳性报告查询与导出

src/main/java/thyyxxk/webserver/dao/lis/CovidExamDao.java

@@ -10,18 +10,19 @@ import thyyxxk.webserver.entity.examinations.covidexam.CovidExamResult;
 public interface CovidExamDao {
 
     @Select("select " +
-            "a.ptnt_name as ptntName, a.id_card as idCard, c.itm_str_value as itmStrValue, " +
-            "a.ptnt_no as ptntNo, b.ordr_date as ordrCreateDate " +
+            "a.ctat_addr,a.phone_num,a.last_updt_date,a.aply_flow_num,a.ptnt_age,b.smpl_num, " +
+            "a.ptnt_name as ptntName,a.id_card as idCard, c.itm_str_value as itmStrValue, " +
+            "a.ptnt_no as ptntNo,b.ordr_date as ordrCreateDate,a.ptnt_sex " +
             "from m_ordr_info(nolock) as a " +
             "inner join m_ordr(nolock) as b on a.ordr_info_id = b.ordr_info_id " +
             "inner join m_ordr_item(nolock) as c on b.ordr_id = c.ordr_id " +
-            "where b.audt_status = 1 " +
-            "and (c.itm_id = 1855) " +
+            "where b.audt_status = 1 and (c.itm_id = 1855) and c.itm_str_value like #{value} " +
             "and (b.audt_time >= #{start} and b.audt_time < #{end}) " +
             "order by audt_time, REPLICATE(0,20-len(b.smpl_num))+b.smpl_num")
     IPage<CovidExamResult> selectHstResult(IPage<CovidExamResult> iPage,
                                            @Param("start") String start,
-                                           @Param("end") String end);
+                                           @Param("end") String end,
+                                           @Param("value") String value);
 
     @Select("select " +
             "a.ptnt_name as ptntName, a.id_card as idCard, c.itm_str_value as itmStrValue, " +

src/main/java/thyyxxk/webserver/entity/examinations/covidexam/CovidExamResult.java

@@ -5,7 +5,7 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
-import java.util.List;
+import java.util.Objects;
 
 @Data
 public class CovidExamResult {
@@ -19,6 +19,16 @@ public class CovidExamResult {
     private Date ordrCreateDate;
 
     private String ordrCreateIns = "长沙泰和医院";
+    private String ctatAddr;
+    private String phoneNum;
+    private String aplyFlowNum;
+    @DateTimeFormat(pattern = "yyyy/MM/dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy/MM/dd HH:mm:ss", shape = JsonFormat.Shape.STRING)
+    private Date lastUpdtDate;
+
+    private String ptntAge;
+    private String ptntSex;
+    private String smplNum;
 
     /**
      * 流调报告
@@ -42,4 +52,8 @@ public class CovidExamResult {
     private String item5;
     private String item6;
     private String symptomsString;
+
+    public String getPtntSex() {
+        return Objects.equals(ptntSex, "1") ? "男" : "女";
+    }
 }

src/main/java/thyyxxk/webserver/service/examinations/CovidExamService.java

@@ -81,7 +81,10 @@ public class CovidExamService {
     private IPage<CovidExamResult> getCovidExamResultPage(QueryCovidExamParam param) {
         IPage<CovidExamResult> iPage = new Page<>(param.getCurrentPage(), param.getPageSize());
         if (param.getType() == 1) {
-            return dao.selectHstResult(iPage, param.getStart(), param.getEnd());
+            return dao.selectHstResult(iPage, param.getStart(), param.getEnd(), "%%");
+        }
+        if (param.getType() == 9) {
+            return dao.selectHstResult(iPage, param.getStart(), param.getEnd(), "阳性");
         }
         return dao.selectKtResult(iPage, param.getStart(), param.getEnd());
     }