95:红德堂APP调试

抢单列表修复

fs-doctor-app/src/main/java/com/fs/app/controller/InquiryOrderController.java

@@ -48,10 +48,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static com.fs.his.utils.PhoneUtil.decryptPhone;
 
@@ -94,7 +91,13 @@ public class InquiryOrderController extends  AppBaseController {
     {
         FsDoctor doctor=doctorService.selectFsDoctorByDoctorId(Long.parseLong(getDoctorId()));
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        param.setDoctorId(Long.parseLong(getDoctorId()));
+
+        if (Objects.nonNull(param.getUserId())) {
+            param.setDoctorId(null);
+        } else if (Objects.nonNull(param.getDoctorId())) {
+            param.setDoctorId(Long.parseLong(getDoctorId()));
+        }
+
         param.setIsAccept(doctor.getIsAccept());
         param.setIsSelf(doctor.getIsSelf());
         List<FsInquiryOrderListPDVO> list = inquiryOrderService.selectFsInquiryOrderListPDVO(param);