Merge branch 'dev/20220420_v2.5.0个性化版_湘雅人工质控缺陷反馈' into debug

src/main/java/com/diagbot/dto/BehospitalAnalysisDTO.java

@@ -2,6 +2,7 @@ package com.diagbot.dto;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -91,4 +92,7 @@ public class BehospitalAnalysisDTO implements Serializable {
     @Excel(name = "评分时间", exportFormat = "yyyy/MM/dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date gradeTime;
+
+    @ApiModelProperty("是否日间病例,1:是，0:否")
+    private String isDaytime;
 }

src/main/java/com/diagbot/dto/BehospitalCodeDetail.java

@@ -1,6 +1,7 @@
 package com.diagbot.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -69,4 +70,7 @@ public class BehospitalCodeDetail {
     private Date gradeTime;
 
     List<QcResultDetailInfo> qcResultDetailInfos;
+
+    @ApiModelProperty("是否日间病例,1:是，0:否")
+    private String isDaytime;
 }

src/main/java/com/diagbot/facade/DataAnalysisFacade.java

@@ -590,6 +590,7 @@ public class DataAnalysisFacade {
         behospitalInfoDTO.setBehDoctorName(behospitalCodeDetail.getDoctorName());
         behospitalInfoDTO.setBehDeptName(entryDefectImproveInner.getBehDeptName());
         behospitalInfoDTO.setGradeTime(behospitalCodeDetail.getGradeTime());
+        behospitalInfoDTO.setIsDaytime(behospitalCodeDetail.getIsDaytime());
         behospitalInfoDTOS.add(behospitalInfoDTO);
         return behospitalInfoDTOS;
     }

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -5583,7 +5583,7 @@
         t1.mrName,
         t1.chTime,
         t1.mrTime,
-        t1.is_daytime
+        t1.is_daytime as isDaytime
         FROM
         (
         SELECT DISTINCT
@@ -5865,7 +5865,7 @@
         t1.mrName,
         t1.chTime,
         t1.mrTime,
-        t1.is_daytime
+        t1.is_daytime as isDaytime
         FROM
         (
         SELECT DISTINCT
@@ -6117,7 +6117,7 @@
         t1.mrName,
         t1.chTime,
         t1.mrTime,
-        t1.is_daytime
+        t1.is_daytime  as isDaytime
         FROM
         (
         SELECT DISTINCT
@@ -7839,7 +7839,7 @@
         t1.mrTime,
         CONCAT( ifnull(t2.age,'') ,ifnull(t2.age_unit,'') )as age,
         t1.file_code AS fileCode,
-        t1.is_daytime
+        t1.is_daytime  as isDaytime
         FROM
         (
         SELECT be.*,
@@ -12448,7 +12448,7 @@
         t1.mrName,
         t1.chTime,
         t1.mrTime,
-        t1.is_daytime
+        t1.is_daytime  as isDaytime
         FROM
         (SELECT
         be.*,
@@ -12651,7 +12651,7 @@
         t1.mrName,
         t1.chTime,
         t1.mrTime,
-        t1.is_daytime
+        t1.is_daytime  as isDaytime
         FROM
         (SELECT
         be.*,
@@ -13064,7 +13064,7 @@
         t1.mrName,
         t1.chTime,
         t1.mrTime,
-        t1.is_daytime
+        t1.is_daytime  as isDaytime
         FROM
         (SELECT
         be.*,
@@ -13268,7 +13268,7 @@
         t1.mrName,
         t1.chTime,
         t1.mrTime,
-        t1.is_daytime
+        t1.is_daytime  as isDaytime
         FROM
         (SELECT
         be.*,
@@ -16680,7 +16680,7 @@
         t1.checkStatus,
         t1.chName,
         t1.chTime,
-        t1.is_daytime
+        t1.is_daytime  as isDaytime
         FROM
         (
         SELECT
@@ -16925,7 +16925,7 @@
         t1.mrName,
         t1.chTime,
         t1.mrTime,
-        t1.is_daytime
+        t1.is_daytime  as isDaytime
         FROM
         (
         SELECT
@@ -17187,7 +17187,7 @@
         t1.checkStatus,
         t1.chName,
         t1.chTime,
-        t1.is_daytime
+        t1.is_daytime  as isDaytime
         FROM
         (
         SELECT
@@ -17365,7 +17365,7 @@
         t1.mrName,
         t1.chTime,
         t1.mrTime,
-        t1.is_daytime
+        t1.is_daytime  as isDaytime
         FROM
         (
         SELECT

src/main/resources/mapper/MedClickInfoMapper.xml

@@ -70,6 +70,7 @@
             <result column="level" property="level"/>
             <result column="scoreRes" property="scoreRes"/>
             <result column="gradeTime" property="gradeTime"/>
+            <result column="isDaytime" property="isDaytime"/>
             <collection property="qcResultDetailInfos" ofType="com.diagbot.dto.QcResultDetailInfo">
                 <result column="CasesEntryIds" property="CasesEntryIds"/>
             </collection>
@@ -231,7 +232,7 @@
         b.file_code AS fileCode,
         b.behospital_code as behospitalCode,
         b.name,
-        b.is_daytime,
+        b.is_daytime as isDaytime,
         b.behospital_date AS behospitalDate,
         b.leave_hospital_date AS leaveHospitalDate,
         b.doctor_id AS doctorId,