导出名称修改

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

@@ -28,7 +28,7 @@ public class EntryNumGroupDTO {
     /**
      * 模块名称
      */
-    @Excel(name = "所属模块", width = 20, orderNum = "1")
+    @Excel(name = "模块名称", width = 20, orderNum = "1")
     private String casesName;
     /**
      * 条目缺陷总数

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

@@ -19,7 +19,7 @@ public class HomePageNumDTO {
     /**
      * 科室名称
      */
-    @Excel(name = "科室名称", width = 30, orderNum = "1")
+    @Excel(name = "科室", width = 30, orderNum = "1")
     private String deptName;
     /**
      * 主管医生id

src/main/resources/mapper/MedLisInfoMapper.xml

@@ -82,8 +82,10 @@
             </if>
         </if>
         <if test="examineInfoVO.isPlacefile != null and examineInfoVO.isPlacefile == 0">
-            <if test="examineInfoVO.leaveHospitalDate != null and examineInfoVO.behospitalDate != null">
+            <if test="examineInfoVO.leaveHospitalDate != null">
                 <![CDATA[ AND date_format (t1.check_date,'%Y-%m-%d %H:%i:%s') <= #{examineInfoVO.leaveHospitalDate}]]>
+            </if>
+            <if test="examineInfoVO.behospitalDate != null">
                 <![CDATA[ AND date_format (t1.check_date,'%Y-%m-%d %H:%i:%s') >= #{examineInfoVO.behospitalDate}]]>
             </if>
         </if>

src/main/resources/mapper/MedPacsInfoMapper.xml

@@ -84,8 +84,10 @@
             </if>
         </if>
         <if test="checkInfoVO.isPlacefile != null and checkInfoVO.isPlacefile == 0">
-            <if test="checkInfoVO.leaveHospitalDate != null and checkInfoVO.behospitalDate != null">
+            <if test="checkInfoVO.leaveHospitalDate != null">
                 <![CDATA[ AND date_format (t1.check_date,'%Y-%m-%d %H:%i:%s') <= #{checkInfoVO.leaveHospitalDate}]]>
+            </if>
+            <if test="checkInfoVO.behospitalDate != null">
                 <![CDATA[ AND date_format (t1.check_date,'%Y-%m-%d %H:%i:%s') >= #{checkInfoVO.behospitalDate}]]>
             </if>
         </if>