Merge remote-tracking branch 'origin/dev/icss' into debug

icss-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -179,8 +179,12 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         QueryWrapper<InquiryInfo> queryWrapper = new QueryWrapper<InquiryInfo>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         queryWrapper.eq("hospital_id", hisInquirysVO.getHospitalId());
-        queryWrapper.eq("hospital_dept_id", hisInquirysVO.getHospitalDeptId());
-        queryWrapper.eq("doctor_id", hisInquirysVO.getDoctorId());
+        if(hisInquirysVO.getHospitalDeptId()!=null){
+        	queryWrapper.eq("hospital_dept_id", hisInquirysVO.getHospitalDeptId());
+        }
+        if(hisInquirysVO.getDoctorId()!=null){
+        	queryWrapper.eq("doctor_id", hisInquirysVO.getDoctorId());
+        }
         if (hisInquirysVO.getPatientId() != null) {
             queryWrapper.eq("patient_id", hisInquirysVO.getPatientId());
         }