wuyongyi 1 год назад
Родитель
Сommit
d2da08e854
1 измененных файлов с 9 добавлено и 9 удалено
  1. 9 9
      src/main/java/com/ywt/mg/services/OfflineNewService.java

+ 9 - 9
src/main/java/com/ywt/mg/services/OfflineNewService.java

@@ -165,14 +165,16 @@ public class OfflineNewService {
                 whereSql += " and ( doctor_name like ?  )";
                 paramList.add("%" + doctorName.trim() + "%");
             }
+
             String source = request.getSource();
             int searchHospitalId = request.getHospitalId();
-            if (searchHospitalId > 0) {
-                whereSql += " and ( hospital_id = ?  )";
-                paramList.add(searchHospitalId);
+            if (searchHospitalId > -1 && StringHelper.isNullOrWhiteSpace(source)) {
+                List<Integer> filteredSources = convertHospitalId2OfflineSources(searchHospitalId);
+                if (!Checker.isNone(filteredSources)) {
+                    whereSql += String.format(" and ( source in (%s)  )", filteredSources.stream().map(String::valueOf).collect(Collectors.joining(",")));
+                }
             }
 
-
             String hisClinicCode = request.getHisClinicCode();
             if (!Checker.isNull(hisClinicCode)) {
                 whereSql += " and ( his_clinic_code like ?  )";
@@ -506,11 +508,9 @@ public class OfflineNewService {
             }
             String source = request.getSource();
             int searchHospitalId = request.getHospitalId();
-            if (searchHospitalId > -1 && StringHelper.isNullOrWhiteSpace(source)) {
-                List<Integer> filteredSources = convertHospitalId2OfflineSources(searchHospitalId);
-                if (!Checker.isNone(filteredSources)) {
-                    whereSql += String.format(" and ( source in (%s)  )", filteredSources.stream().map(String::valueOf).collect(Collectors.joining(",")));
-                }
+            if (searchHospitalId > 0) {
+                whereSql += " and ( hospital_id = ?  )";
+                paramList.add(searchHospitalId);
             }
 
             String hisClinicCode = request.getHisClinicCode();