|
@@ -61,7 +61,7 @@ public class GetRightAndFullTextFromWebThread extends Thread {
|
|
try {
|
|
try {
|
|
StarPatentVO starPatentVO = uploadPatentWebDTO.getStarPatentVO();
|
|
StarPatentVO starPatentVO = uploadPatentWebDTO.getStarPatentVO();
|
|
|
|
|
|
- if ((starPatentVO.getPublicNo() != null && starPatentVO.getPublicNo().contains("CN")) || (starPatentVO.getPublicNo() == null && starPatentVO.getPublicNo().contains("CN"))) {
|
|
|
|
|
|
+ if ((starPatentVO.getPublicNo() != null && starPatentVO.getPublicNo().contains("CN")) || (starPatentVO.getApplicationNo() != null && starPatentVO.getApplicationNo().contains("CN"))|| (starPatentVO.getPublicAccreditNo() != null && starPatentVO.getPublicAccreditNo().contains("CN"))) {
|
|
patentStarApiService = applicationContext.getBean(PatentStarApiService.class);
|
|
patentStarApiService = applicationContext.getBean(PatentStarApiService.class);
|
|
String cnFullXmlStr = patentStarApiService.getCnFullXmlApi(starPatentVO.getRowApplicationNo());
|
|
String cnFullXmlStr = patentStarApiService.getCnFullXmlApi(starPatentVO.getRowApplicationNo());
|
|
this.loadClaim(uploadPatentWebDTO, cnFullXmlStr);
|
|
this.loadClaim(uploadPatentWebDTO, cnFullXmlStr);
|
|
@@ -128,7 +128,7 @@ public class GetRightAndFullTextFromWebThread extends Thread {
|
|
}
|
|
}
|
|
//装载权利要求原文
|
|
//装载权利要求原文
|
|
Text text = new Text();
|
|
Text text = new Text();
|
|
- text.setLanguage(patent.getAppCountry());
|
|
|
|
|
|
+ text.setLanguage("CN");
|
|
text.setTextContent(reClaim);
|
|
text.setTextContent(reClaim);
|
|
text.setIfOrigin(true);
|
|
text.setIfOrigin(true);
|
|
patent.setClaim(Arrays.asList(text));
|
|
patent.setClaim(Arrays.asList(text));
|