lrf402788946 3 years ago
parent
commit
0e746abc59
1 changed files with 6 additions and 8 deletions
  1. 6 8
      app/service/patent/patentinfo.js

+ 6 - 8
app/service/patent/patentinfo.js

@@ -447,9 +447,6 @@ class PatentinfoService extends CrudService {
     assert(code, '缺少机构信息!');
     const { empower_sort, ...others } = query;
     const newQuery = await this.toSetQuery(others);
-    console.group('query');
-    console.log(query);
-    console.groupEnd();
     console.group('newQuery');
     console.log(newQuery);
     console.groupEnd();
@@ -474,17 +471,17 @@ class PatentinfoService extends CrudService {
       } else if (key === 'apply_year') {
         queryObject.create_date = this.dealYearRange(query[key]);
       } else if (key === 'ipc_type') {
-        queryObject.ipc_type = new RegExp(`/\^${query[key]}/`, 'i');
+        queryObject.ipc_type = new RegExp(`^${query[key]}`, 'i');
       } else if (key === 'field') {
         queryObject.abstract = new RegExp(query[key]);
       } else if (key === 'create_number') {
         queryObject.create_number = new RegExp(query[key]);
       } else if (key === 'first_inventor') {
-        queryObject.inventor = new RegExp(`/\^${query[key]}/`, 'i');
+        queryObject.inventor = new RegExp(`^${query[key]}`, 'i');
       } else if (key === 'on_obligee') {
-        queryObject.on_obligee = new RegExp(`/\^${query[key]}/`, 'i');
+        queryObject.on_obligee = new RegExp(`^${query[key]}`, 'i');
       } else if (key === 'type') {
-        queryObject.type = new RegExp(`/\^${query[key]}/`, 'i');
+        queryObject.type = new RegExp(`^${query[key]}`, 'i');
       } else if (key === 'is_empower') {
         let r = '';
         if (query[key] === '0') r = true;
@@ -499,8 +496,9 @@ class PatentinfoService extends CrudService {
         else r = { $lte: toDay };
         queryObject.lose_date = r;
       }
-      return queryObject;
     }
+    return queryObject;
+
   }
   async dealCode(code) {
     let pids = await this.personalModel.find({ code }, { _id: 1 });