调整接口

open-server/src/main/java/com/zq/open/service/NaturalPersonService.java

@@ -27,7 +27,7 @@ public class NaturalPersonService {
         List<NaturalPerson> naturalPersonList = naturalPersonDao.selectList(Wrappers.lambdaQuery(NaturalPerson.builder().name(vo.getName()).idCard(vo.getIdCard()).build()));
         AssertUtils.notEmpty(naturalPersonList, "查询为空");
 
-        NaturalPerson naturalPerson = naturalPersonList.stream().max(Comparator.comparing(NaturalPerson::getCreateTime)).get();
+        NaturalPerson naturalPerson = naturalPersonList.stream().max(Comparator.comparing(NaturalPerson::getId)).get();
 
         return NaturalPersonVo.builder().name(naturalPerson.getName()).idCard(naturalPerson.getIdCard()).build();
     }

portal-server/src/main/resources/mapper/HyStatsMapper.xml

@@ -7,6 +7,7 @@
         FROM mrcase m LEFT JOIN taorg t ON m.AIAX0003 = t.ORGID
         WHERE m.AIAX0072 = '1'
         AND m.BIAX0075 = '1'
+        AND DATE_FORMAT(m.AIAX0048, "%Y") <= YEAR(NOW())
         AND m.AIAX0001 = #{type}
         <if test="subAreaCode != null and subAreaCode != ''">
             AND t.YAB003 LIKE CONCAT(#{subAreaCode},'%')