Browse Source

000000005

zhoulisky 7 months ago
parent
commit
45d56c14fb

+ 2 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/EnterpriseInfoServiceImpl.java

@@ -1156,7 +1156,8 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
 		vo.setQj57_1(zlList.stream().filter(zl -> Func.notNull(zl.getShouquanRq()) && zl.getShouquanRq().before(dateMax) && zl.getShouquanRq().after(dateMin) && Func.equals("发明专利", zl.getZllx()) && Func.equals("国内", zl.getGb())).count());
 		vo.setQj75(zlList.stream().filter(zl -> Func.notNull(zl.getShouquanRq()) && zl.getShouquanRq().before(dateMax) && zl.getShouquanRq().after(dateMin) && Func.equals("境外(欧美日)", zl.getGb())).count());
 
-		vo.setQj83(zlList.stream().filter(zl -> Func.notNull(zl.getShouquanRq()) && zl.getShouquanRq().before(dateMax) && zl.getShouquanRq().after(dateMin)).count());
+		vo.setQj83(zlList.stream().filter(zl -> Func.notNull(zl.getShouquanRq()) && zl.getShouquanRq().before(dateMax) && Func.equals("授权有效", zl.getFlzt())).count());
+		vo.setQj83_1(zlList.stream().filter(zl -> Func.notNull(zl.getShouquanRq()) && zl.getShouquanRq().before(dateMax) && Func.equals("授权有效", zl.getFlzt())).count());
 
 		//(三)其他情况
 		//发表科技论文