|
@@ -3,18 +3,16 @@ package com.diagbot.web;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.diagbot.annotation.SysLogger;
|
|
|
-import com.diagbot.dto.ConceptInfoDTO;
|
|
|
+import com.diagbot.dto.KlConceptStaticDTO;
|
|
|
import com.diagbot.dto.RespDTO;
|
|
|
-import com.diagbot.dto.StaticKnowledgeDTO;
|
|
|
import com.diagbot.dto.StaticKnowledgeIndexDTO;
|
|
|
import com.diagbot.facade.ConceptInfoFacade;
|
|
|
+import com.diagbot.facade.KlConceptStaticFacade;
|
|
|
import com.diagbot.vo.ChangeStatusVO;
|
|
|
-import com.diagbot.vo.ConceptInfoPageVO;
|
|
|
-import com.diagbot.vo.ConceptInfoVO;
|
|
|
import com.diagbot.vo.IdVO;
|
|
|
-import com.diagbot.vo.StaticKnowledgeHISVO;
|
|
|
+import com.diagbot.vo.KlConceptStaticPageVO;
|
|
|
+import com.diagbot.vo.KlConceptStaticVO;
|
|
|
import com.diagbot.vo.StaticKnowledgeIndexVO;
|
|
|
-import com.diagbot.vo.StaticKnowledgeVO;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -43,6 +41,9 @@ public class ConceptInfoController {
|
|
|
|
|
|
@Autowired
|
|
|
private ConceptInfoFacade conceptInfoFacade;
|
|
|
+ @Autowired
|
|
|
+ private KlConceptStaticFacade klConceptStaticFacade;
|
|
|
+
|
|
|
|
|
|
@ApiOperation(value = "医学术语检索-新增静态知识[zhaops]",
|
|
|
notes = "types: 类型(多选):0-全部、1-诊断、2-药品、3-检验、5-检查、6-手术和操作 <br>" +
|
|
@@ -50,7 +51,9 @@ public class ConceptInfoController {
|
|
|
@PostMapping("/staticKnowledgeIndexWithoutInfo")
|
|
|
@SysLogger("staticKnowledgeIndexWithoutInfo")
|
|
|
public RespDTO<List<StaticKnowledgeIndexDTO>> staticKnowledgeIndexWithoutInfo(@Valid @RequestBody StaticKnowledgeIndexVO staticKnowledgeIndexVO) {
|
|
|
- List<StaticKnowledgeIndexDTO> data = conceptInfoFacade.staticKnowledgeIndexWithoutInfo(staticKnowledgeIndexVO);
|
|
|
+ staticKnowledgeIndexVO.setHasInfo(0);
|
|
|
+ //List<StaticKnowledgeIndexDTO> data = conceptInfoFacade.staticKnowledgeIndexWithoutInfo(staticKnowledgeIndexVO);
|
|
|
+ List<StaticKnowledgeIndexDTO> data = klConceptStaticFacade.staticKnowledgeIndex(staticKnowledgeIndexVO);
|
|
|
return RespDTO.onSuc(data);
|
|
|
}
|
|
|
|
|
@@ -60,8 +63,9 @@ public class ConceptInfoController {
|
|
|
"isDeleted: 启用状态:N-启用中、Y-已删除<br>")
|
|
|
@PostMapping("/getPage")
|
|
|
@SysLogger("getPage")
|
|
|
- public RespDTO<IPage<ConceptInfoDTO>> getPage(@Valid @RequestBody ConceptInfoPageVO conceptInfoPageVO) {
|
|
|
- IPage<ConceptInfoDTO> data = conceptInfoFacade.getPage(conceptInfoPageVO);
|
|
|
+ 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);
|
|
|
}
|
|
|
|
|
@@ -75,8 +79,9 @@ public class ConceptInfoController {
|
|
|
@PostMapping("/saveOrUpdateRecord")
|
|
|
@SysLogger("saveOrUpdateRecord")
|
|
|
@Transactional
|
|
|
- public RespDTO<Boolean> saveOrUpdateRecord(@Valid @RequestBody ConceptInfoVO conceptInfoVO) {
|
|
|
- Boolean data = conceptInfoFacade.saveOrUpdateRecord(conceptInfoVO);
|
|
|
+ public RespDTO<Boolean> saveOrUpdateRecord(@Valid @RequestBody KlConceptStaticVO klConceptStaticVO) {
|
|
|
+ //Boolean data = conceptInfoFacade.saveOrUpdateRecord(conceptInfoVO);
|
|
|
+ Boolean data = klConceptStaticFacade.saveOrUpdateRecord(klConceptStaticVO);
|
|
|
return RespDTO.onSuc(data);
|
|
|
}
|
|
|
|
|
@@ -87,7 +92,8 @@ public class ConceptInfoController {
|
|
|
@SysLogger("changeStatus")
|
|
|
@Transactional
|
|
|
public RespDTO<Boolean> changeStatus(@Valid @RequestBody ChangeStatusVO changeStatusVO) {
|
|
|
- Boolean data = conceptInfoFacade.changeStatus(changeStatusVO);
|
|
|
+ //Boolean data = conceptInfoFacade.changeStatus(changeStatusVO);
|
|
|
+ Boolean data = klConceptStaticFacade.changeStatus(changeStatusVO);
|
|
|
return RespDTO.onSuc(data);
|
|
|
}
|
|
|
|
|
@@ -96,8 +102,9 @@ public class ConceptInfoController {
|
|
|
"type: 类型:1-诊断、2-药品、3-检验套餐、4-检验明细、5-检查、6-手术和操作 <br>")
|
|
|
@PostMapping("/isExist")
|
|
|
@SysLogger("isExist")
|
|
|
- public RespDTO<Boolean> isExist(@Valid @RequestBody ConceptInfoVO conceptInfoVO) {
|
|
|
- Boolean data = conceptInfoFacade.isExist(conceptInfoVO);
|
|
|
+ public RespDTO<Boolean> isExist(@Valid @RequestBody KlConceptStaticVO klConceptStaticVO) {
|
|
|
+ //Boolean data = conceptInfoFacade.isExist(conceptInfoVO);
|
|
|
+ Boolean data = klConceptStaticFacade.isExist(klConceptStaticVO);
|
|
|
return RespDTO.onSuc(data);
|
|
|
}
|
|
|
|
|
@@ -105,8 +112,9 @@ public class ConceptInfoController {
|
|
|
notes = "id: 术语id <br>")
|
|
|
@PostMapping("/getRecordById")
|
|
|
@SysLogger("getRecordById")
|
|
|
- public RespDTO<ConceptInfoDTO> getRecordById(@Valid @RequestBody IdVO idVO) {
|
|
|
- ConceptInfoDTO data = conceptInfoFacade.getRecordById(idVO);
|
|
|
+ public RespDTO<KlConceptStaticDTO> getRecordById(@Valid @RequestBody IdVO idVO) {
|
|
|
+ //ConceptInfoDTO data = conceptInfoFacade.getRecordById(idVO);
|
|
|
+ KlConceptStaticDTO data = klConceptStaticFacade.getRecordById(idVO);
|
|
|
return RespDTO.onSuc(data);
|
|
|
}
|
|
|
}
|