查看模板信息接口修改

daqe-center/src/main/java/com/lantone/daqe/dto/GetFieldCalibrationPageDTO.java

@@ -23,7 +23,7 @@ public class GetFieldCalibrationPageDTO implements Serializable {
     private Long hospitalId;
 
     @ApiModelProperty(value = "序号")
-    private Long Id;
+    private Long id;
 
     @ApiModelProperty(value = "表名称（中文）")
     private String tableNameChinese;

daqe-center/src/main/java/com/lantone/daqe/dto/GetRecordTemplateManageDTO.java

@@ -0,0 +1,47 @@
+package com.lantone.daqe.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 查看文书模板信息-接口出参
+ * @author: zhanghang
+ * @time: 2022/2/28 17:47
+ */
+@ApiModel(value = "查看文书模板信息-接口出参")
+@Getter
+@Setter
+public class GetRecordTemplateManageDTO implements Serializable {
+
+
+    private static final long serialVersionUID = 391072141806786072L;
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @ApiModelProperty(value = "组织机构ID")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "医院模板ID")
+    private String code;
+
+    @ApiModelProperty(value = "医院模板名称")
+    private String name;
+
+    @ApiModelProperty(value = "医院父类模板ID")
+    private String parentCode;
+
+    @ApiModelProperty(value = "医院父类模板名称")
+    private String parentName;
+
+    @ApiModelProperty(value = "模板内容")
+    private String content;
+
+    @ApiModelProperty(value = "模板类型")
+    private String contentType;
+
+
+}

daqe-center/src/main/java/com/lantone/daqe/dto/GetRecordTemplatePageDTO.java

@@ -20,7 +20,7 @@ public class GetRecordTemplatePageDTO implements Serializable {
 
     private static final long serialVersionUID = 8095973115574155886L;
     @ApiModelProperty(value = "主键")
-    private Long Id;
+    private Long id;
 
     @ApiModelProperty(value = "组织机构ID")
     private Long hospitalId;

daqe-center/src/main/java/com/lantone/daqe/facade/OfficialCapacityManagementFacade.java

@@ -66,12 +66,7 @@ public class OfficialCapacityManagementFacade {
         return getOfficialCapacityPageDTOPage;
     }
 
-    /**
-     * 根据ID删除该条职务职称变更记录
-     *
-     * @param delOfficialCapacityByIdVO
-     * @return: 是否成功
-     */
+
     /**
      * @param idList
      * @return: 是否成功

daqe-center/src/main/java/com/lantone/daqe/facade/RecordTemplateManagementFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lantone.common.enums.IsDeleteEnum;
 import com.lantone.common.util.BeanUtil;
 import com.lantone.common.util.StringUtil;
+import com.lantone.daqe.dto.GetRecordTemplateManageDTO;
 import com.lantone.daqe.dto.GetRecordTemplatePageDTO;
 import com.lantone.daqe.entity.RecordTemplate;
 import com.lantone.daqe.facade.base.RecordTemplateFacade;
@@ -58,11 +59,13 @@ public class RecordTemplateManagementFacade {
      * @param getRecordTemplateByIdVO
      * @return: 模板具体的内容
      */
-    public RecordTemplate getRecordTemplateById(GetRecordTemplateByIdVO getRecordTemplateByIdVO) {
+    public GetRecordTemplateManageDTO getRecordTemplateById(GetRecordTemplateByIdVO getRecordTemplateByIdVO) {
+        GetRecordTemplateManageDTO getRecordTemplateManageDTO = new GetRecordTemplateManageDTO();
         RecordTemplate recordTemplate = recordTemplateFacade.getOne(new QueryWrapper<RecordTemplate>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("id", getRecordTemplateByIdVO.getId())
         );
-        return recordTemplate;
+        BeanUtil.copyProperties(recordTemplate, getRecordTemplateManageDTO);
+        return getRecordTemplateManageDTO;
     }
 }

daqe-center/src/main/java/com/lantone/daqe/web/RecordTemplateManagementController.java

@@ -2,6 +2,7 @@ package com.lantone.daqe.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.api.CommonResult;
+import com.lantone.daqe.dto.GetRecordTemplateManageDTO;
 import com.lantone.daqe.dto.GetRecordTemplatePageDTO;
 import com.lantone.daqe.entity.RecordTemplate;
 import com.lantone.daqe.facade.RecordTemplateManagementFacade;
@@ -39,7 +40,7 @@ public class RecordTemplateManagementController {
 
     @ApiOperation(value = "查看文书模板信息 [by:zhanghang]")
     @PostMapping("/getRecordTemplateManage")
-    public CommonResult<RecordTemplate> getRecordTemplateManage(@RequestBody GetRecordTemplateByIdVO getRecordTemplateByIdVO) {
+    public CommonResult<GetRecordTemplateManageDTO> getRecordTemplateManage(@RequestBody GetRecordTemplateByIdVO getRecordTemplateByIdVO) {
         return CommonResult.success(recordTemplateManagementFacade.getRecordTemplateById(getRecordTemplateByIdVO));
     }