医嘱时间格式精确到秒

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

@@ -84,7 +84,7 @@ public class DoctorAdviceDTO {
     /**
      * 医嘱开始时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date daStartDate;
 
     /**
@@ -100,7 +100,7 @@ public class DoctorAdviceDTO {
     /**
      * 医嘱结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date daStopDate;
 
 //    /**

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -6418,32 +6418,58 @@
         AND f1.behDeptName = f2.behDeptName
     </select>
 
+    <resultMap id="MedicalCheckMap" type="com.diagbot.dto.MedicalCheckDTO">
+                <result column="deptName" property="deptName"/>
+                <result column="deptId" property="deptId"/>
+                <result column="doctorName" property="doctorName"/>
+                <result column="ryjlw_24" property="ryjlw_24"/>
+                <result column="scbcjlw_8h" property="scbcjlw_8h"/>
+                <result column="zrsccfw_72h" property="zrsccfw_72h"/>
+                <result column="ryhljbcw_3d" property="ryhljbcw_3d"/>
+                <result column="zrcfw_2w" property="zrcfw_2w"/>
+                <result column="zzcfw_3w" property="zzcfw_3w"/>
+                <result column="qjjlw_6h" property="qjjlw_6h"/>
+                <result column="hzjlw_24h" property="hzjlw_24h"/>
+                <result column="sqtlxjw" property="sqtlxjw"/>
+                <result column="sxjlsw_24h" property="sxjlsw_24h"/>
+                <result column="xhscw_30m" property="xhscw_30m"/>
+                <result column="shzdcfw_24h" property="shzdcfw_24h"/>
+                <result column="shjbcw_3d" property="shjbcw_3d"/>
+                <result column="zkjbcw_3d" property="zkjbcw_3d"/>
+                <result column="zkjlw_24" property="zkjlw_24"/>
+                <result column="bwzhjlbcw_md" property="bwzhjlbcw_md"/>
+                <result column="SXHWJL" property="sxhwjl"/>
+                <result column="SXPJW_24" property="sxpjw_24"/>
+                <result column="sxhwjl" property="wjzwjl"/>
+                <result column="wywwcxj" property="wywwcxj"/>
+    </resultMap>
+
     <!--    病历稽查表最新sql-->
-    <select id="getMedicalCheck" resultType="com.diagbot.dto.MedicalCheckDTO">
+    <select id="getMedicalCheck" resultMap="MedicalCheckMap">
         SELECT
         a.beh_dept_id AS deptId,
         a.beh_dept_name AS deptName,
         a.doctor_name as doctorName,
-        sum(c.cases_entry_id = 2658) as RYJLW_24,
-        sum(c.cases_entry_id = 2686) as SCBCJLW_8H,
-        sum(c.cases_entry_id = 2657) as ZRSCCFW_72H,
-        sum(c.cases_entry_id = 3010) as RYHLJBCW_3D,
-        sum(c.cases_entry_id = 2655) as ZRCFW_2W,
-        sum(c.cases_entry_id = 2654) as ZZCFW_3W,
-        sum(c.cases_entry_id = 2852) as QJJLW_6H,
-        sum(c.cases_entry_id = 2287) as HZJLW_24H,
-        sum(c.cases_entry_id = 3025) as SQTLXJW,
-        sum(c.cases_entry_id = 2170) as SXJLSW_24H,
-        sum(c.cases_entry_id = 2930) as XHSCW_30M,
-        sum(c.cases_entry_id = 2900) as SHZDCFW_24H,
-        sum(c.cases_entry_id = 2229) as SHJBCW_3D,
-        sum(c.cases_entry_id = 2217) as ZKJBCW_3D,
-        sum(c.cases_entry_id = 2218) as ZKJLW_24,
-        sum(c.cases_entry_id = 2220) as BWZHJLBCW_MD,
-        sum(c.cases_entry_id = 2486) as SXHWJL,
-        sum(c.cases_entry_id = 3063) as SXPJW_24,
-        sum(c.cases_entry_id = 3062) as WJZWJL,
-        sum(c.cases_entry_id = 2495) as WYWWCXJ
+        sum(c.cases_entry_id = 2658) as ryjlw_24,
+        sum(c.cases_entry_id = 2686) as scbcjlw_8h,
+        sum(c.cases_entry_id = 2657) as zrsccfw_72h,
+        sum(c.cases_entry_id = 3010) as ryhljbcw_3d,
+        sum(c.cases_entry_id = 2655) as zrcfw_2w,
+        sum(c.cases_entry_id = 2654) as zzcfw_3w,
+        sum(c.cases_entry_id = 2852) as qjjlw_6h,
+        sum(c.cases_entry_id = 2287) as hzjlw_24h,
+        sum(c.cases_entry_id = 3025) as sqtlxjw,
+        sum(c.cases_entry_id = 2170) as sxjlsw_24h,
+        sum(c.cases_entry_id = 2930) as xhscw_30m,
+        sum(c.cases_entry_id = 2900) as shzdcfw_24h,
+        sum(c.cases_entry_id = 2229) as shjbcw_3d,
+        sum(c.cases_entry_id = 2217) as zkjbcw_3d,
+        sum(c.cases_entry_id = 2218) as zkjlw_24,
+        sum(c.cases_entry_id = 2220) as bwzhjlbcw_md,
+        sum(c.cases_entry_id = 2486) as sxhwjl,
+        sum(c.cases_entry_id = 3063) as sxpjw_24,
+        sum(c.cases_entry_id = 3062) as wjzwjl,
+        sum(c.cases_entry_id = 2495) as wywwcxj
         FROM
         med_behospital_info a,
         med_qcresult_info b,