feat:修正错误

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

@@ -14,12 +14,17 @@ import javax.validation.constraints.NotNull;
 @Data
 public class OrderListReqDTO extends PageDTO {
 
+    @ApiModelProperty("机构id")
+    @NotNull(message = "机构id不能为空")
+    private String organId;
+
+    @ApiModelProperty("订单类型 1-签约订单 2-值班医生问诊订单")
+    @NotNull(message = "订单类型不能为空")
+    private Integer singStatus = 1;
+
     @ApiModelProperty("搜索参数")
     private String keyWord;
 
-    @ApiModelProperty("医院code")
-    private String appCode;
-
     @ApiModelProperty("订单状态")
     private String orderStatus;
 
@@ -35,6 +40,7 @@ public class OrderListReqDTO extends PageDTO {
     @ApiModelProperty("结束时间")
     private String endTime;
 
-    @ApiModelProperty("订单类型 1-签约订单 2-值班医生问诊订单")
-    private Integer singStatus = 1;
+    @ApiModelProperty("医院code")
+    private String appCode;
+
 }

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

@@ -56,7 +56,7 @@
         </if>
         <if test="singStatus!=null and singStatus!=''">
             <if test="singStatus == 1">
-                and sign_status = 1 or sign_status = 2
+                and (sign_status = 1 or sign_status = 2)
             </if>
             <if test="singStatus == 2">
                 and sign_status = 3