Merge remote-tracking branch 'origin/dev/diagnose20210315' into dev/diagnose20210315

src/main/java/com/diagbot/client/StandConvertNewServiceClient.java

@@ -19,7 +19,7 @@ public interface StandConvertNewServiceClient {
     @PostMapping(value = "/api/similarity")
     StandConvertCrfDTO similarity(StandConvertCrfVO standConvertCrfVO);
 
-    @PostMapping(value = "/api/similarity_batch")
+    @PostMapping(value = "/es/word_type_body")
     StandConvertCrfBatchDTO similarityBatch(List<StandConvertCrfVO> standConvertCrfVOList);
 }
 

src/main/java/com/diagbot/web/TestController.java

@@ -130,12 +130,6 @@ public class TestController {
         return RespDTO.onSuc(testFacade.testStandConvert(standConvertCrfVO));
     }
 
-    @ApiOperation(value = "标准词转换API【新版】[zhoutg]", notes = "类型，疾病: disease，症状: symptom，手术和操作:operation，药品: drug，实验室检查：lis，辅助检查：pacs， 辅助检查：vital")
-    @PostMapping("/testStandConvertNew")
-    public RespDTO<StandConvertCrfDTO> testStandConvertNew(@RequestBody StandConvertCrfVO standConvertCrfVO) {
-        return RespDTO.onSuc(testFacade.testStandConvertNew(standConvertCrfVO));
-    }
-
     @ApiOperation(value = "标准词批量转换API[zhoutg]", notes = "类型，疾病: disease，症状: symptom，手术和操作:operation，药品: drug，实验室检查：lis，辅助检查：pacs， 查体：vital")
     @PostMapping("/testStandConvertBatch")
     public RespDTO<StandConvertCrfBatchDTO> testStandConvertBatch(@RequestBody List<StandConvertCrfVO> standConvertCrfVOList) {
@@ -145,7 +139,7 @@ public class TestController {
     @ApiOperation(value = "标准词批量转换【新版】API[zhoutg]", notes = "类型，疾病: disease，症状: symptom，手术和操作:operation，药品: drug，实验室检查：lis，辅助检查：pacs， 查体：vital")
     @PostMapping("/testStandConvertBatchNew")
     public RespDTO<StandConvertCrfBatchDTO> testStandConvertBatchNew(@RequestBody List<StandConvertCrfVO> standConvertCrfVOList) {
-        return RespDTO.onSuc(testFacade.testStandConvertBatch(standConvertCrfVOList));
+        return RespDTO.onSuc(testFacade.testStandConvertBatchNew(standConvertCrfVOList));
     }
 
     @ApiOperation(value = "复杂高危手术测试API[zhoutg]",

src/main/resources/application-dev.yml

@@ -171,7 +171,7 @@ StandConvert:
   rate: 0.9
 
 StandConvertNew:
-  url: http://192.168.3.150:9205
+  url: http://192.168.3.150:7000
   rate: 0.9
 
 IcssPush:

src/main/resources/application-local.yml

@@ -171,7 +171,7 @@ StandConvert:
   rate: 0.9
 
 StandConvertNew:
-  url: http://192.168.3.150:9205
+  url: http://192.168.3.150:7000
   rate: 0.9
 
 IcssPush:

src/main/resources/application-pre.yml

@@ -171,7 +171,7 @@ StandConvert:
   rate: 0.9
 
 StandConvertNew:
-  url: http://192.168.3.150:9205
+  url: http://192.168.3.150:7000
   rate: 0.9
 
 IcssPush:

src/main/resources/application-pro.yml

@@ -171,7 +171,7 @@ StandConvert:
   rate: 0.9
 
 StandConvertNew:
-  url: http://192.168.3.150:9205
+  url: http://192.168.3.150:7000
   rate: 0.9
 
 IcssPush:

src/main/resources/application-test.yml

@@ -171,7 +171,7 @@ StandConvert:
   rate: 0.9
 
 StandConvertNew:
-  url: http://192.168.3.150:9205
+  url: http://192.168.3.150:7000
   rate: 0.9
 
 IcssPush: