调整

src/VitalMixtureService/DBService/Service/VitalHealthStatisticDBService.cs

@@ -29,12 +29,9 @@ namespace VitalService.Service
         {
             var model = new CountyHealthPlatformStatisticsDTO();
             var builder = Builders<CountyHealthPlatformStatisticsEntity>.Filter;
-            var filter = builder.Where(c => c.IsDelete == false);
-            if (!string.IsNullOrEmpty(request.ServerAreaCode))
-            {
-                var codeFilter = builder.Where(c => c.CountyCode == request.ServerAreaCode);
-                filter = filter & codeFilter;
-            }
+            var filter = builder.Where(c => c.IsDelete == false);            
+            var codeFilter = builder.Where(c => c.CountyCode == request.ServerAreaCode);
+            filter = filter & codeFilter;
             var sortDefinition = Builders<CountyHealthPlatformStatisticsEntity>.Sort.Descending(x => x.CreateTime);
             var pageFilter = new DBPageRequest<CountyHealthPlatformStatisticsEntity>
             {
@@ -69,11 +66,9 @@ namespace VitalService.Service
             var model = new TownHealthPlatformStatisticsDTO();
             var builder = Builders<TownHealthPlatformStatisticsEntity>.Filter;
             var filter = builder.Where(c => c.IsDelete == false);
-            if (!string.IsNullOrEmpty(request.ServerAreaCode))
-            {
-                var codeFilter = builder.Where(c => c.TownCode == request.ServerAreaCode || c.TownName == request.ServerAreaCode);
-                filter = filter & codeFilter;
-            }
+            var codeFilter = builder.Where(c => c.TownCode == request.ServerAreaCode || c.TownName == request.ServerAreaCode);
+            filter = filter & codeFilter;
+            
             var sortDefinition = Builders<TownHealthPlatformStatisticsEntity>.Sort.Descending(x => x.CreateTime);
             var pageFilter = new DBPageRequest<TownHealthPlatformStatisticsEntity>
             {
@@ -101,11 +96,9 @@ namespace VitalService.Service
             var model = new VillageHealthPlatformStatisticsDTO();
             var builder = Builders<VillageHealthPlatformStatisticsEntity>.Filter;
             var filter = builder.Where(c => c.IsDelete == false);
-            if (!string.IsNullOrEmpty(request.ServerAreaCode))
-            {
-                var codeFilter = builder.Where(c => c.VillageCode == request.ServerAreaCode || c.VillageName == request.ServerAreaCode);
-                filter = filter & codeFilter;
-            }
+            var codeFilter = builder.Where(c => c.VillageCode == request.ServerAreaCode || c.VillageName == request.ServerAreaCode);
+            filter = filter & codeFilter;
+            
             var sortDefinition = Builders<VillageHealthPlatformStatisticsEntity>.Sort.Descending(x => x.CreateTime);
             var pageFilter = new DBPageRequest<VillageHealthPlatformStatisticsEntity>
             {

src/appsettings_vital.json

@@ -37,7 +37,8 @@
     "DBName": "VitalDB",
     "ArchiveDeletionDays": 0,
     "InitMigrateBeginTime": "",
-    "InitMigrateEndTime": "2023-06-26"
+    "InitMigrateEndTime": "2023-06-26",
+    "IsWatchingDB":false
   },
   "DataArchiving":{
     "ArchivingCron": "0 0 1 * * ?",