Merge remote-tracking branch 'origin/dev/icss20200109_template' into dev/icss20200109_template

icss-service/src/main/java/com/diagbot/dto/TemplateNormsDTO.java

@@ -0,0 +1,20 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.FolderMapping;
+import com.diagbot.entity.TemplateInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-01-10 14:54
+ */
+@Getter
+@Setter
+public class TemplateNormsDTO {
+    private List<FolderMapping> folderMapping;
+    private List<TemplateInfo> templateInfo;
+}

icss-service/src/main/java/com/diagbot/entity/TemplateInfo.java

@@ -56,6 +56,11 @@ public class TemplateInfo implements Serializable {
      */
     private String name;
 
+    /**
+     * 拼音
+     */
+    private String spell;
+
     /**
      * 医生id
      */
@@ -217,6 +222,14 @@ public class TemplateInfo implements Serializable {
         this.templateType = templateType;
     }
 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public void setSpell(String spell) {
+        this.spell = spell;
+    }
+
     @Override
     public String toString() {
         return "TemplateInfo{" +

icss-service/src/main/java/com/diagbot/facade/TemplateNormFacade.java

@@ -0,0 +1,71 @@
+package com.diagbot.facade;
+
+import com.diagbot.dto.TemplateInfoDTO;
+import com.diagbot.dto.TemplateNormsDTO;
+import com.diagbot.service.impl.TemplateInfoServiceImpl;
+import com.diagbot.vo.TemplateIdVO;
+import com.diagbot.vo.TemplateNormUpVO;
+import com.diagbot.vo.TemplateNormsIdsVO;
+import com.diagbot.vo.TemplateNormsParamVO;
+import com.diagbot.vo.TemplateNormsVO;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-01-10 14:25
+ */
+@Component
+public class TemplateNormFacade extends TemplateInfoServiceImpl {
+
+    /**
+     *根据模板id修改模板名称和文件夹名称
+     * @param templateNormUpVO
+     * @return
+     */
+    public boolean updateTemplateNorm(TemplateNormUpVO templateNormUpVO) {
+        //
+
+
+        return true;
+
+    }
+
+    /**
+     * 保存病历模板
+     * @param templateNormsVO
+     * @return
+     */
+    public boolean saveTemplateNorm(TemplateNormsVO templateNormsVO) {
+
+        return true;
+    }
+
+    /**
+     * 根据模板id批量删除病历模板
+     * @param templateNormsIdsVO
+     * @return
+     */
+    public boolean cancelTemplateInfo(TemplateNormsIdsVO templateNormsIdsVO) {
+
+        return true;
+    }
+
+    /**
+     *查询标准模板列表
+     * @param templateNormsParamVO
+     * @return
+     */
+    public TemplateNormsDTO getTemplateNorm(TemplateNormsParamVO templateNormsParamVO) {
+        return null;
+    }
+
+    /**
+     * 根据模板id获取病历模板内容
+     * @param templateIdVO
+     * @return
+     */
+    public TemplateInfoDTO getTemplateIdData(TemplateIdVO templateIdVO) {
+        return null;
+    }
+}

icss-service/src/main/java/com/diagbot/vo/TemplateNormUpVO.java

@@ -0,0 +1,39 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-01-10 14:30
+ */
+@Setter
+@Getter
+public class TemplateNormUpVO {
+
+    @NotNull(message = "请输入模板id")
+    private Long id;//模板id
+    @NotBlank(message = "请输入模板名")
+    private String modeName;//模板名
+    /**
+     * 医生id
+     */
+    @NotNull(message = "请输入医生id")
+    private Long doctorId;
+
+    /**
+     * 医院编码
+     */
+    @NotNull(message = "请输入文件Id")
+    private Long folderId;
+    /**
+     * 部门id
+     */
+    @NotBlank(message = "请输入文件夹")
+    private String folderName;//部门id
+
+}

icss-service/src/main/java/com/diagbot/vo/TemplateNormsIdsVO.java

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-01-10 14:49
+ */
+@Setter
+@Getter
+public class TemplateNormsIdsVO {
+    @NotBlank(message = "请输入模板id")
+    private String ids;
+}

icss-service/src/main/java/com/diagbot/vo/TemplateNormsParamVO.java

@@ -0,0 +1,22 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-01-10 14:58
+ */
+@Setter
+@Getter
+public class TemplateNormsParamVO {
+
+    private String Letter ;//模板首字母
+
+    private String name;//模板名字
+
+    private  String modeType;//模板类型
+}

icss-service/src/main/java/com/diagbot/vo/TemplateNormsVO.java

@@ -0,0 +1,37 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-01-10 14:42
+ */
+@Setter
+@Getter
+public class TemplateNormsVO {
+
+    @NotBlank(message = "请输入模板名字")
+    private String modeName;//模板名字
+    @NotNull(message = "请输入医生id")
+    private Long doctorId;//医生id
+    @NotNull(message = "请输入医院id")
+    private Long hospitalId;//医院id
+    @NotNull(message = "请输入部门id")
+    private Long hospitalDeptId;//部门id
+    @NotNull(message = "请输入性别")
+    private Integer sex;//性别
+    @NotBlank(message = "请输入模板类型")
+    private String modeType;//模板类型
+    @NotNull(message = "请输入预览文本")
+    private ContentsVO preview;//预览文本
+    @NotBlank(message = "请输入模板数据")
+    private String dataJson;//模板数据
+    @NotNull(message = "请输入文件夹id")
+    private Long folderId;
+
+}

icss-service/src/main/java/com/diagbot/web/TemplateNormController.java

@@ -0,0 +1,89 @@
+package com.diagbot.web;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.TemplateInfoDTO;
+import com.diagbot.dto.TemplateNormsDTO;
+import com.diagbot.facade.TemplateNormFacade;
+import com.diagbot.vo.TemplateIdVO;
+import com.diagbot.vo.TemplateInfoAdminPageVO;
+import com.diagbot.vo.TemplateNormUpVO;
+import com.diagbot.vo.TemplateNormsIdsVO;
+import com.diagbot.vo.TemplateNormsParamVO;
+import com.diagbot.vo.TemplateNormsVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-01-10 14:21
+ */
+@RestController
+@RequestMapping("/templateAdmin")
+@Api(value = "管理员标准模板API[by:wangfeng]", tags = { "WF——管理员标准模板API" })
+@SuppressWarnings("unchecked")
+public class TemplateNormController {
+
+    @Autowired
+    TemplateNormFacade templateNormFacade;
+
+    @ApiOperation(value = "根据模板id修改模板名称和模板名首拼及文件目录[by:wangfeng]")
+    @PostMapping("/updateTemplateNorms")
+    @SysLogger("updateTemplateNorms")
+    @Transactional
+    public RespDTO<Boolean> updateTemplateNorms(@Valid @RequestBody TemplateNormUpVO templateNormUpVO) {
+
+        boolean res = templateNormFacade.updateTemplateNorm(templateNormUpVO);
+
+        return RespDTO.onSuc(res);
+    }
+    @ApiOperation(value = "保存病历模板[by:wangfeng]")
+    @PostMapping("/saveTemplateNorms")
+    @SysLogger("saveTemplateNorms")
+    @Transactional
+    public RespDTO<Boolean> saveTemplateNorms(@Valid @RequestBody TemplateNormsVO templateNormsVO) {
+
+        boolean res = templateNormFacade.saveTemplateNorm(templateNormsVO);
+
+        return RespDTO.onSuc(res);
+    }
+
+    @ApiOperation(value = "根据模板id批量删除病历模板[by:wangfeng]", notes = "ids: 模板ids<br>'ids':'1,2,3,4,5,6'")
+    @PostMapping("/cancelTemplateNorms")
+    @SysLogger("cancelTemplateNorms")
+    @Transactional
+    public RespDTO<Boolean> cancelTemplateNorms(@Valid @RequestBody TemplateNormsIdsVO TemplateNormsIdsVO) {
+
+        boolean res = templateNormFacade.cancelTemplateInfo(TemplateNormsIdsVO);
+
+        return RespDTO.onSuc(res);
+    }
+    @ApiOperation(value = "查询标准模板列表[by:wangfeng]")
+    @PostMapping("/getTemplateNorms")
+    @SysLogger("getTemplateNorms")
+    public RespDTO<TemplateNormsDTO> getTemplateNorms(@Valid @RequestBody TemplateNormsParamVO templateNormsParamVO) {
+
+        TemplateNormsDTO data = templateNormFacade.getTemplateNorm(templateNormsParamVO);
+
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "根据模板id获取病历模板内容[by:wangfeng]", notes = "id: 请输入模板id")
+    @PostMapping("/getTemplateIdDatas")
+    @SysLogger("getTemplateIdDatas")
+    public RespDTO<TemplateInfoDTO> getTemplateIdDatas(@Valid @RequestBody TemplateIdVO templateIdVO) {
+
+        TemplateInfoDTO data = templateNormFacade.getTemplateIdData(templateIdVO);
+
+        return RespDTO.onSuc(data);
+    }
+}

icss-service/src/main/resources/mapper/TemplateInfoMapper.xml

@@ -11,6 +11,7 @@
 		<result column="creator" property="creator" />
 		<result column="modifier" property="modifier" />
 		<result column="name" property="name" />
+		<result column="spell" property="spell"/>
 		<result column="doctor_id" property="doctorId" />
 		<result column="hospital_dept_id" property="hospitalDeptId" />
 		<result column="hospital_id" property="hospitalId" />