Merge remote-tracking branch 'origin/master'

src/main/java/com/syjiaer/clinic/server/service/social/SocialIcpcDiagnoseService.java

@@ -8,9 +8,11 @@ import com.syjiaer.clinic.server.common.util.HttpUtil;
 import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.entity.social.SocialIcpcDiagnosis;
 import com.syjiaer.clinic.server.entity.social.SocialIcpcDoctorDiagnose;
+import com.syjiaer.clinic.server.entity.social.SocialIcpcItem;
 import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView;
 import com.syjiaer.clinic.server.mapper.social.SocialIcpcDiagnosisMapper;
 import com.syjiaer.clinic.server.mapper.social.SocialIcpcDoctorDiagnoseMapper;
+import com.syjiaer.clinic.server.service.BaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,7 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Service
-public class SocialIcpcDiagnoseService {
+public class SocialIcpcDiagnoseService extends BaseService {
     @Autowired
     private HttpUtil httpUtil;
     @Autowired
@@ -29,7 +31,7 @@ public class SocialIcpcDiagnoseService {
     private SocialDirectoryVersionService socialDirectoryVersionService;
 
     public String download(String pre_version_name) {
-        JSONArray jsonArray = httpUtil.download2("icpc_doctor_diagnose", 1361);
+        JSONArray jsonArray = httpUtil.download2(pre_version_name, 1361);
         List<String> code_list = new ArrayList<>();
         DateTimeFormatter dateTimeFormatter = DateUtil.getDateTimeFormatter(DateUtil.DATE_TIME_FORMAT);
         List<SocialIcpcDiagnosis> list = new ArrayList<>();
@@ -78,7 +80,16 @@ public class SocialIcpcDiagnoseService {
         return list.get(0).getVar();
     }
 
-    public Page<SocialDirectoryView> getDocList(int type, int page, int size, String keyword) {
+    public Page<SocialIcpcDiagnosis> getDocList(int type, int page, int size, String keyword) {
-        return  null;
+        QueryWrapper<SocialIcpcDiagnosis> codeqw = new QueryWrapper<>();
+
+        //模糊搜索
+        if (!keyword.trim().isEmpty()) {
+            codeqw.like("name", keyword);
+            codeqw.or().like("code", keyword);
+        }
+        // 执行查询
+        Page<SocialIcpcDiagnosis> pageResult = pageHelper(page, size, codeqw, socialIcpcDiagnosisMapper, "updt_time", false);
+        return pageResult;
     }
 }

src/main/resources/doc_title/1361.json

@@ -1,16 +1,54 @@
 [
   {
-    "2": {
+    "1": {
       "en": "name",
       "zh": "门诊诊疗名称",
       "column_width": 200
     }
   },
   {
-    "1": {
+    "2": {
       "en": "code",
-      "zh": "门诊诊疗代码",
+      "zh": "门诊诊疗编码",
+      "column_width": 200
+    }
+  },
+  {
+    "3": {
+      "en": "icd10AsocName",
+      "zh": "ICD-10",
+      "column_width": 200
+    }
+  },
+  {
+    "4": {
+      "en": "trtType",
+      "zh": "诊疗类型",
+      "column_width": 200
+    }
+  },
+  {
+    "5": {
+      "en": "invdTime",
+      "zh": "失效时间",
       "column_width": 200
     }
   }
+,
+  {
+    "6": {
+      "en": "efftTime",
+      "zh": "生效时间",
+      "column_width": 200
+    }
+  }
+,
+  {
+    "7": {
+      "en": "memo",
+      "zh": "备注",
+      "column_width": 200
+    }
+  }
+
 ]

src/main/resources/doc_title/1362.json

@@ -22,39 +22,39 @@
   },
   {
     "4": {
-      "en": "code",
+      "en": "icpcCode",
-      "zh": "收费项目省代码，收费项目国家代码",
+      "zh": "icpc编码",
       "column_width": 200
     }
   },
   {
     "5": {
-      "en": "code",
+      "en": "icpcCodeFlag",
-      "zh": "收费项目省代码，收费项目国家代码",
+      "zh": "ICPC编码应用标识",
       "column_width": 200
     }
   }
 ,
   {
-    "5": {
+    "6": {
-      "en": "code",
+      "en": "chrgitmAttr",
-      "zh": "收费项目省代码，收费项目国家代码",
+      "zh": "收费项目属性",
       "column_width": 200
     }
   }
 ,
   {
     "7": {
-      "en": "code",
+      "en": "efftTime",
-      "zh": "收费项目省代码，收费项目国家代码",
+      "zh": "失效时间",
       "column_width": 200
     }
   }
 ,
   {
     "8": {
-      "en": "code",
+      "en": "invdTime",
-      "zh": "收费项目省代码，收费项目国家代码",
+      "zh": "生效时间",
       "column_width": 200
     }
   }