|
@@ -1,11 +1,13 @@
|
|
|
package com.diagbot.web;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.diagbot.annotation.SysLogger;
|
|
|
import com.diagbot.dto.KlConceptStaticDTO;
|
|
|
import com.diagbot.dto.RespDTO;
|
|
|
import com.diagbot.dto.StaticKnowledgeDTO;
|
|
|
import com.diagbot.facade.KlConceptStaticFacade;
|
|
|
+import com.diagbot.util.BeanUtil;
|
|
|
import com.diagbot.vo.ChangeStatusVO;
|
|
|
import com.diagbot.vo.IdVO;
|
|
|
import com.diagbot.vo.KlConceptStaticPageVO;
|
|
@@ -28,13 +30,13 @@ import javax.validation.Valid;
|
|
|
* @time: 2021/2/24 11:34
|
|
|
*/
|
|
|
@RestController
|
|
|
-@RequestMapping("/kl/concept_static")
|
|
|
+@RequestMapping("/kl/conceptStatic")
|
|
|
@Api(value = "静态知识维护相关API", tags = { "静态知识维护相关API" })
|
|
|
public class KlConceptStaticController {
|
|
|
@Autowired
|
|
|
KlConceptStaticFacade klConceptStaticFacade;
|
|
|
|
|
|
- @ApiOperation(value = "页面获取静态知识[zhaops]",
|
|
|
+ @ApiOperation(value = "获取静态知识[zhaops]",
|
|
|
notes = "type: 类型:1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作 <br>" +
|
|
|
"contentTypes: 内容类型(多选):1-静态信息、2-注意事项、3-临床路径、4-治疗方案<br>" +
|
|
|
"name: 标准术语名称<br>")
|
|
@@ -51,9 +53,12 @@ public class KlConceptStaticController {
|
|
|
"isDeleted: 启用状态:N-启用中、Y-已删除<br>")
|
|
|
@PostMapping("/getPage")
|
|
|
@SysLogger("getPage")
|
|
|
- public RespDTO<IPage<KlConceptStaticDTO>> getPage(@Valid @RequestBody KlConceptStaticPageVO klConceptStaticPageVO) {
|
|
|
+ @SuppressWarnings("unchecked")
|
|
|
+ public RespDTO<Page<KlConceptStaticDTO>> getPage(@Valid @RequestBody KlConceptStaticPageVO klConceptStaticPageVO) {
|
|
|
IPage<KlConceptStaticDTO> data = klConceptStaticFacade.getPage(klConceptStaticPageVO);
|
|
|
- return RespDTO.onSuc(data);
|
|
|
+ Page<KlConceptStaticDTO> page = new Page<>();
|
|
|
+ BeanUtil.copyProperties(data, page);
|
|
|
+ return RespDTO.onSuc(page);
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "保存静态知识-新增或修改[zhaops]",
|
|
@@ -65,7 +70,7 @@ public class KlConceptStaticController {
|
|
|
"details: 明细<br>")
|
|
|
@PostMapping("/saveOrUpdateRecord")
|
|
|
@SysLogger("saveOrUpdateRecord")
|
|
|
- @Transactional(rollbackFor = Exception.class)
|
|
|
+ @Transactional
|
|
|
public RespDTO<Boolean> saveOrUpdateRecord(@Valid @RequestBody KlConceptStaticVO klConceptStaticVO) {
|
|
|
Boolean data = klConceptStaticFacade.saveOrUpdateRecord(klConceptStaticVO);
|
|
|
return RespDTO.onSuc(data);
|