静态知识维护

src/main/java/com/diagbot/dto/KlConceptStaticDTO.java

@@ -1,5 +1,6 @@
 package com.diagbot.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -45,6 +46,7 @@ public class KlConceptStaticDTO {
     /**
      * 修改时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date gmtModified;
     /**
      * 修改人

src/main/java/com/diagbot/dto/StaticKnowledgeIndexDTO.java

@@ -56,4 +56,8 @@ public class StaticKnowledgeIndexDTO {
      * 是否有治疗方案静态知识
      */
     private Integer hasTreatInfo = 0;
+    /**
+     * 启用禁用
+     */
+    private Integer status;
 }

src/main/java/com/diagbot/facade/KlConceptStaticFacade.java

@@ -420,6 +420,13 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
         return true;
     }
 
+    /**
+     * 页面展示类型转换
+     *
+     * @param type
+     * @param flag
+     * @return
+     */
     public Integer convertType(Integer type, Integer flag) {
         Integer retType = null;
         if (flag.equals(1)) {

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

@@ -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);

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

@@ -52,7 +52,7 @@ public class RetrievalController {
 
     @ApiOperation(value = "术语名称检索[Mark]",
             notes = "type： 类型：1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、9-症状、10-体征 <br>" +
-                    "inputStr： 检索内容<br>" )
+                    "inputStr： 检索内容<br>")
     @PostMapping("/namelist")
     public RespDTO<RetrievalDTO> namelist(@Valid @RequestBody RetrievalVO retrievalVO) {
         RetrievalDTO data = retrievalFacade.getname(retrievalVO);
@@ -65,7 +65,7 @@ public class RetrievalController {
     @PostMapping("/staticKnowledgeIndex")
     public RespDTO<List<StaticKnowledgeIndexDTO>> staticKnowledgeIndex(@Valid @RequestBody StaticKnowledgeIndexVO staticKnowledgeIndexVO) {
         //List<StaticKnowledgeIndexDTO> data = retrievalFacade.staticKnowledgeIndex(staticKnowledgeIndexVO);
-        List<StaticKnowledgeIndexDTO> data=medRetrievalFacade.staticKnowledgeIndex(staticKnowledgeIndexVO);
+        List<StaticKnowledgeIndexDTO> data = medRetrievalFacade.staticKnowledgeIndex(staticKnowledgeIndexVO);
         return RespDTO.onSuc(data);
     }
 

src/main/resources/application-dev.yml

@@ -54,6 +54,10 @@ spring:
           username: root
           password: lantone
 
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+
   #redis
   redis:
     database:

src/main/resources/application-local.yml

@@ -54,6 +54,10 @@ spring:
           username: root
           password: lantone
 
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+
   #redis
   redis:
     database:

src/main/resources/application-pre.yml

@@ -54,6 +54,10 @@ spring:
           username: teamback
           password: goTulmLeon
 
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+
   #redis
   redis:
     database:

src/main/resources/application-pro.yml

@@ -54,6 +54,10 @@ spring:
           username: root
           password: lantone
 
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+
   #redis
   redis:
     database:

src/main/resources/application-test.yml

@@ -54,6 +54,10 @@ spring:
           username: root
           password: lantone
 
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+
   #redis
   redis:
     database:

src/main/resources/mapper/KlConceptMapper.xml

@@ -156,7 +156,7 @@
 		s1.concept_id AS conceptId,
 		s1.clinical_pathway_name,
 		s1.notice_name,
-		s1.`status` AS STATUS,
+		s1.`status` AS status,
 		IF( count( s2.id )> 0, 1, 0 ) AS hasInfo ,
 		IF( sum( IF ( FIND_IN_SET( 1, s2.content_type )> 0, 1, 0 ))> 0, 1, 0 ) AS hasStaticKnowledge,
 		IF( sum( IF ( FIND_IN_SET( 2, s2.content_type )> 0, 1, 0 ))> 0, 1, 0 ) AS hasNotice,