feat:修正错误

family-doctor-common/src/main/java/com/ebaiyihui/family/doctor/common/dto/OrderListReqDTO.java

@@ -28,8 +28,8 @@ public class OrderListReqDTO extends PageDTO {
     @ApiModelProperty("订单状态")
     private String orderStatus;
 
-    @ApiModelProperty("科室名称")
-    private String deptName;
+//    @ApiModelProperty("科室名称")
+//    private String deptName;
 
     @ApiModelProperty("科室id")
     private Long deptId;

family-doctor-server/src/main/resources/mapper/PatientSignMapper.xml

@@ -40,21 +40,21 @@
         <if test="appCode!=null and appCode!=''">
             and app_code = #{appCode}
         </if>
+        <if test="organId!=null and organId!=''">
+            and organId = #{organId}
+        </if>
         <if test="orderStatus!=null and orderStatus!=''">
             and status = #{orderStatus}
         </if>
-        <if test="deptName!=null and deptName!=''">
-            and dept_name like concat('%',#{deptName},'%')
-        </if>
         <if test="deptId!=null and deptId!=''">
             and dept_id = #{deptId}
         </if>
         <if test="timeType!=null and timeType!=''">
             <if test="timeType == 1">
-                and create_time BETWEEN #{startTime} AND #{endTime}
+                and create_time BETWEEN #{beginTime} AND #{endTime}
             </if>
             <if test="timeType == 2">
-                and sign_end_time BETWEEN #{startTime} AND #{endTime}
+                and sign_end_time BETWEEN #{beginTime} AND #{endTime}
             </if>
         </if>
         <if test="singStatus!=null and singStatus!=''">