소스 검색

自动化测试

zhaops 4 년 전
부모
커밋
7ad5ab4611

+ 2 - 1
cdssman-service/src/main/java/com/diagbot/facade/MedRuleConvertFacade.java

@@ -203,6 +203,7 @@ public class MedRuleConvertFacade {
                             break;
                     }
                 }
+
                 result.setMessage("");
                 result.setReferenceValue("");
                 result.setRuleMsg(record.getRuleMsg());
@@ -636,7 +637,7 @@ public class MedRuleConvertFacade {
             BillMsg billMsg = getBillMsg(entry.getValue());
             if (billMsg != null) {
                 entry.getValue().forEach(item -> {
-                    if(StringUtil.isBlank(item.getExpectedOutput())) {
+                    if (StringUtil.isBlank(item.getExpectedOutput())) {
                         item.setExpectedOutput(billMsg.getMsg());
                     }
                 });

+ 1 - 1
cdssman-service/src/main/java/com/diagbot/facade/MedSearchDataFacade.java

@@ -236,7 +236,7 @@ public class MedSearchDataFacade {
                         pacs.setDesc(result.getRuleBaseInputValue());
                         pacs.setResult(result.getRuleBaseInputValue());
                         pacs.setDateValue(lastDate);
-                        indicationPushVO.getPacsOrder().add(pacs);
+                        indicationPushVO.getPacs().add(pacs);
                     }
                 } else if (result.getRuleBaseLibType().equals(LexiconEnum.PacsResult.getKey())) {
                     if (result.getRuleBaseType().equals(RuleBaseTypeEnum.Eq.getKey())) {

+ 1 - 11
cdssman-service/src/main/java/com/diagbot/web/ConceptInfoController.java

@@ -6,7 +6,6 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.KlConceptStaticDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.StaticKnowledgeIndexDTO;
-import com.diagbot.facade.ConceptInfoFacade;
 import com.diagbot.facade.KlConceptStaticFacade;
 import com.diagbot.vo.ChangeStatusVO;
 import com.diagbot.vo.IdVO;
@@ -34,17 +33,14 @@ import java.util.List;
  * @since 2020-08-18
  */
 @RestController
-@RequestMapping("/graph/conceptInfo")
+@RequestMapping("/kl/conceptInfo")
 @Api(value = "静态知识标准术语相关API", tags = { "静态知识标准术语相关API" })
 @SuppressWarnings("unchecked")
 public class ConceptInfoController {
 
-    @Autowired
-    private ConceptInfoFacade conceptInfoFacade;
     @Autowired
     private KlConceptStaticFacade klConceptStaticFacade;
 
-
     @ApiOperation(value = "医学术语检索-新增静态知识[zhaops]",
             notes = "types: 类型(多选):0-全部、1-诊断、2-药品、3-检验、5-检查、6-手术和操作 <br>" +
                     "inputStr: 检索内容<br>")
@@ -52,7 +48,6 @@ public class ConceptInfoController {
     @SysLogger("staticKnowledgeIndexWithoutInfo")
     public RespDTO<List<StaticKnowledgeIndexDTO>> staticKnowledgeIndexWithoutInfo(@Valid @RequestBody StaticKnowledgeIndexVO staticKnowledgeIndexVO) {
         staticKnowledgeIndexVO.setHasInfo(0);
-        //List<StaticKnowledgeIndexDTO> data = conceptInfoFacade.staticKnowledgeIndexWithoutInfo(staticKnowledgeIndexVO);
         List<StaticKnowledgeIndexDTO> data = klConceptStaticFacade.staticKnowledgeIndex(staticKnowledgeIndexVO);
         return RespDTO.onSuc(data);
     }
@@ -64,7 +59,6 @@ public class ConceptInfoController {
     @PostMapping("/getPage")
     @SysLogger("getPage")
     public RespDTO<IPage<KlConceptStaticDTO>> getPage(@Valid @RequestBody KlConceptStaticPageVO klConceptStaticPageVO) {
-        //IPage<ConceptInfoDTO> data = conceptInfoFacade.getPage(conceptInfoPageVO);
         IPage<KlConceptStaticDTO> data = klConceptStaticFacade.getPage(klConceptStaticPageVO);
         return RespDTO.onSuc(data);
     }
@@ -80,7 +74,6 @@ public class ConceptInfoController {
     @SysLogger("saveOrUpdateRecord")
     @Transactional
     public RespDTO<Boolean> saveOrUpdateRecord(@Valid @RequestBody KlConceptStaticVO klConceptStaticVO) {
-        //Boolean data = conceptInfoFacade.saveOrUpdateRecord(conceptInfoVO);
         Boolean data = klConceptStaticFacade.saveOrUpdateRecord(klConceptStaticVO);
         return RespDTO.onSuc(data);
     }
@@ -92,7 +85,6 @@ public class ConceptInfoController {
     @SysLogger("changeStatus")
     @Transactional
     public RespDTO<Boolean> changeStatus(@Valid @RequestBody ChangeStatusVO changeStatusVO) {
-        //Boolean data = conceptInfoFacade.changeStatus(changeStatusVO);
         Boolean data = klConceptStaticFacade.changeStatus(changeStatusVO);
         return RespDTO.onSuc(data);
     }
@@ -103,7 +95,6 @@ public class ConceptInfoController {
     @PostMapping("/isExist")
     @SysLogger("isExist")
     public RespDTO<Boolean> isExist(@Valid @RequestBody KlConceptStaticVO klConceptStaticVO) {
-        //Boolean data = conceptInfoFacade.isExist(conceptInfoVO);
         Boolean data = klConceptStaticFacade.isExist(klConceptStaticVO);
         return RespDTO.onSuc(data);
     }
@@ -113,7 +104,6 @@ public class ConceptInfoController {
     @PostMapping("/getRecordById")
     @SysLogger("getRecordById")
     public RespDTO<KlConceptStaticDTO> getRecordById(@Valid @RequestBody IdVO idVO) {
-        //ConceptInfoDTO data = conceptInfoFacade.getRecordById(idVO);
         KlConceptStaticDTO data = klConceptStaticFacade.getRecordById(idVO);
         return RespDTO.onSuc(data);
     }

+ 1 - 1
config-server/src/main/resources/shared/cdssman-service-local.yml

@@ -128,4 +128,4 @@ imageUrl:
 
 #CDSS核心地址
 cdss-core:
-  url: http://192.168.2.121:7010
+  url: http://192.168.2.236:7010