Browse Source

小问题。

lighter 3 years ago
parent
commit
1041c64e55

+ 1 - 1
pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>10.2.3</version>
+    <version>10.2.4</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
     <properties>

+ 4 - 8
src/main/java/thyyxxk/webserver/controller/yibao/DictionaryController.java

@@ -5,7 +5,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import thyyxxk.webserver.config.auth.PassToken;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
-import thyyxxk.webserver.constants.ResponceType;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.dictionary.PureCodeName;
 import thyyxxk.webserver.entity.dictionary.SearchDataParam;
@@ -56,15 +55,12 @@ public class DictionaryController {
     @PassToken
     @PostMapping("/searchYbDiag")
     public ResultVo<List<PureCodeName>> searchYbDiag(@RequestBody SearchDataParam param) {
-        if (null == param.getResponceType()) {
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "医保身份不能为空!");
+        ResultVo<List<PureCodeName>> res = service.executeSearch(param);
+        if (res.getCode() != ExceptionEnum.SUCCESS.getCode()) {
+            return res;
         }
-        if (!param.getResponceType().equals(ResponceType.NEW_RURAL_COOPERATIVE_MEDICAL_INSURANCE) && null == param.getYbType()) {
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "医保类别不能为空!");
-        }
-        List<PureCodeName> list = service.searchYbDiag(param);
         int start = param.getPage() * 10;
         int end = param.getPage() * 10 + 10;
-        return ResultVoUtil.success(list.subList(start, Math.min(list.size(), end)));
+        return ResultVoUtil.success(res.getData().subList(start, Math.min(res.getData().size(), end)));
     }
 }

+ 1 - 0
src/main/java/thyyxxk/webserver/entity/examinations/lisdock/HealthCardResult.java

@@ -10,5 +10,6 @@ public class HealthCardResult {
     private String appId;
     private String signature;
     private CustomerInfo customerInfo;
+    // 老系统是单数形式,新系统上线后会变成复数形式。
     private List<ItemResult> itemResult;
 }

+ 4 - 4
src/main/java/thyyxxk/webserver/service/examinations/LisDockService.java

@@ -35,10 +35,10 @@ public class LisDockService {
     private final static String APP_ID = "jkzd5e26bf01c5a0d79";
     private final static String SECRET = "957a642f1dae09fd226a3517a465";
     private final static String IMG_URL_PREFIX = "http://staticweb.hnthyy.cn/inspections/";
-//    private static final String GET_CUSTOMER_INFO = "https://api.hnocc.com/commonInterface/selectUserInfo"; // 线上
-//    private static final String PUSH_RESULT = "https://api.hnocc.com/commonInterface/pushResult"; // 线上
-    private static final String GET_CUSTOMER_INFO = "http://api.ingeye.com/commonInterface/selectUserInfo"; // 测试
-    private static final String PUSH_RESULT = "http://api.ingeye.com/commonInterface/pushResult"; // 测试
+    private static final String GET_CUSTOMER_INFO = "https://api.hnocc.com/commonInterface/selectUserInfo"; // 线上
+    private static final String PUSH_RESULT = "https://api.hnocc.com/commonInterface/pushResult"; // 线上
+//    private static final String GET_CUSTOMER_INFO = "http://api.ingeye.com/commonInterface/selectUserInfo"; // 测试
+//    private static final String PUSH_RESULT = "http://api.ingeye.com/commonInterface/pushResult"; // 测试
     private final InspectionsDao dao;
     private final InspectionsService service;
     private final static String STOOL_CULTURE = "JK01";