Merge branch 'main' of http://10.10.14.176:3000/huanghai/YangPuBaoMing

src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java

@@ -119,16 +119,13 @@ public class YpModel {
             String st = year - start_year_num + start_month_day;
             String ed = year - end_year_num + end_month_day;
             if (birth.compareTo(st) >= 0 && birth.compareTo(ed) <= 0) {
-                break;
+                kv.set("bx_id", bx_id);
+                kv.set("bx_name", bx_name);
+                return kv;
             }
         }
-        if (bx_id == -2) {
-            kv.set("bx_id", -2);
-            kv.set("bx_name", "出生日期不在指定的时间段内");
-            return kv;
-        }
-        kv.set("bx_id", bx_id);
-        kv.set("bx_name", bx_name);
+        kv.set("bx_id", -2);
+        kv.set("bx_name", "出生日期不在指定的时间段内");
         return kv;
     }