瀏覽代碼

时间优化

wangfeng 5 年之前
父節點
當前提交
05e7ea23dc

+ 5 - 0
mrman-service/src/main/java/com/diagbot/facade/StdBehospitalInfoFacade.java

@@ -52,6 +52,11 @@ public class StdBehospitalInfoFacade extends StdBehospitalInfoServiceImpl {
     BehospitalInfoHystrixClient behospitalInfoHystrixClient;
 
     public IPage<SthospitalInfoPageDTO> getSthospitalInfoPages(SthospitalInfoPageVO sthospitalInfoPageVO) {
+       Date startDate = sthospitalInfoPageVO.getLeaveHosDateStart();
+        Date endDate = sthospitalInfoPageVO.getLeaveHosDateEnd();
+        if (endDate.getTime() < startDate.getTime()) {
+            throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
+        }
         return stdBehospitalInfoService.getStdPage(sthospitalInfoPageVO);
     }
 

+ 2 - 2
mrman-service/src/main/java/com/diagbot/vo/SthospitalInfoPageVO.java

@@ -37,10 +37,10 @@ public class SthospitalInfoPageVO extends Page {
     /**
      * 出院开始时间
      */
-    private String leaveHosDateStart;
+    private Date leaveHosDateStart;
 
     /**
      * 出院结束时间
      */
-    private String leaveHosDateEnd;
+    private Date leaveHosDateEnd;
 }

+ 5 - 3
mrman-service/src/main/resources/mapper/StdBehospitalInfoMapper.xml

@@ -68,9 +68,11 @@
         <if test="name != null and name!= ''">
             AND a.name LIKE CONCAT('%', #{name}, '%')
         </if>
-        <if test="leaveHosDateStart!=null and leaveHosDateEnd != null and leaveHosDateStart!=''and leaveHosDateEnd !='' ">
-            AND a.leave_hospital_date BETWEEN #{leaveHosDateStart}
-            AND #{leaveHosDateEnd}
+        <if test="leaveHosDateStart != null and leaveHosDateStart!=''">
+            <![CDATA[ and a.leave_hospital_date >= #{leaveHosDateStart}]]>
+        </if>
+        <if test="leaveHosDateEnd != nulland leaveHosDateEnd!=''">
+            <![CDATA[ and a.leave_hospital_date < #{leaveHosDateEnd}]]>
         </if>
         ORDER BY gmtModified DESC
     </select>