Prechádzať zdrojové kódy

益寿缘总后台的处方管理增加开方时长筛选

cgp 5 dní pred
rodič
commit
95e330242c

+ 2 - 0
fs-service/src/main/java/com/fs/his/mapper/FsPrescribeMapper.java

@@ -86,6 +86,8 @@ public interface FsPrescribeMapper
             "        <if test=\"orderCode != null \"> and fso.order_code = #{orderCode}</if>\n" +
             "        <if test=\"orderStatus != null \"> and fso.`status` = #{orderStatus}</if>\n" +
             "        <if test=\"storeId != null \"> and so.store_id = #{storeId}</if>\n" +
+            "        <if test=\"minOperateSeconds  != null \">  AND so.operate_second &gt;= #{minOperateSeconds}</if>\n" +
+            "        <if test=\"maxOperateSeconds  != null \">  AND so.operate_second &lt;= #{maxOperateSeconds}</if>\n" +
             "    </where>\n" +
             "    order by prescribe_id desc"+
             "</script>"})

+ 3 - 0
fs-service/src/main/java/com/fs/his/param/FsPrescribeParam.java

@@ -139,4 +139,7 @@ public class FsPrescribeParam {
 
     // 医生是否确认 0未确认 1已确认 -1其他模块
     private Integer doctorConfirm;
+
+    private Integer minOperateSeconds; // 最小耗时(秒),例如 0
+    private Integer maxOperateSeconds; // 最大耗时(秒),例如 60(表示 ≤60秒)
 }

+ 2 - 2
fs-service/src/main/java/com/fs/his/param/PrescribeStatParam.java

@@ -11,10 +11,10 @@ public class PrescribeStatParam {
     private String doctorName;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date startTime;
+    private Date startOperateTime;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date endTime;
+    private Date endOperateTime;
 
     // 科室id
     private Long deptId;

+ 2 - 2
fs-service/src/main/java/com/fs/his/vo/FsPrescribeListVO.java

@@ -169,6 +169,6 @@ public class FsPrescribeListVO {
      */
     private Integer doctorConfirm;
 
-    //操作时间
-    private String operateTime;
+    //操作秒数
+    private String operateSecond;
 }

+ 4 - 4
fs-service/src/main/resources/mapper/his/FsPrescribeMapper.xml

@@ -354,11 +354,11 @@
         <if test="hospitalId != null and hospitalId != ''">
             AND ho.hospital_id = #{hospitalId}
         </if>
-        <if test="startTime != null">
-            AND fp.end_operate_time &gt;= #{startTime}
+        <if test="startOperateTime != null">
+             AND fp.start_operate_time &gt;= #{startOperateTime}
         </if>
-        <if test="endTime != null">
-            AND fp.end_operate_time &lt;= #{endTime}
+        <if test="endOperateTime != null">
+             AND fp.end_operate_time &lt;= #{endOperateTime}
         </if>
 
         GROUP BY