Merge remote-tracking branch 'origin/dev/20200903_1.4.5' into debug

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

@@ -39,12 +39,12 @@ public class ExamineInfoDTO {
     /**
      * 检查时间
      */
-    private Date cTime;
+    private String cTime;
 
     /**
      * 报告时间
      */
-    private Date rTime;
+    private String rTime;
 
     /**
      * 开单医生

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

@@ -29,12 +29,12 @@ public class ExamineSonInfoDTO {
     /**
      * 检查时间
      */
-    private Date cTime;
+    private String cTime;
 
     /**
      * 报告时间
      */
-    private Date rTime;
+    private String rTime;
 
     /**
      * 开单医生

src/main/resources/mapper/MedLisInfoMapper.xml

@@ -54,10 +54,10 @@
             and t1.rep_name like CONCAT('%',#{examineInfoVO.examineItemName},'%')
         </if>
         <if test="examineInfoVO.jyNewDateStart != null">
-            <![CDATA[ AND t1.check_date >= #{examineInfoVO.jyNewDateStart}]]>
+            <![CDATA[ AND date_format(t1.check_date,'%Y/%m/%d HH:mm:ss') >= #{examineInfoVO.jyNewDateStart}]]>
         </if>
         <if test="examineInfoVO.jyNewDateEnd != null">
-            <![CDATA[ AND t1.check_date <= #{examineInfoVO.jyNewDateEnd}]]>
+            <![CDATA[ AND date_format(t1.check_date,'%Y/%m/%d HH:mm:ss') <= #{examineInfoVO.jyNewDateEnd}]]>
         </if>) b
         where 1=1
         <if test="examineInfoVO.examineType != null and examineInfoVO.examineType == 1">
@@ -124,7 +124,7 @@
         <if test="examineSonInfoVO.hospitalId != null">
             and t1.hospital_id = #{examineSonInfoVO.hospitalId}
         </if>
-        <if test="examineSonInfoVO.hbehospitalCode != null and examineSonInfoVO.hbehospitalCode != ''">
+        <if test="examineSonInfoVO.behospitalCode != null and examineSonInfoVO.behospitalCode != ''">
             and t1.behospital_code = #{examineSonInfoVO.behospitalCode}
         </if>
         <if test="examineSonInfoVO.repNo != null and examineSonInfoVO.repNo != ''">