演示病历API

doc/001.00000000初始化脚本/cdss_init.sql

@@ -289,6 +289,13 @@ CREATE TABLE `demo_template_info` (
   `name` varchar(300) DEFAULT NULL COMMENT '名称',
   `hospital_id` bigint(20) DEFAULT NULL COMMENT '医院id',
   `sex` int(11) NOT NULL DEFAULT '0' COMMENT '性别(1：男 2：女)',
+  `age` int(11) NOT NULL DEFAULT '0' COMMENT '年龄',
+  `pat_name` varchar(50) NOT NULL DEFAULT '' COMMENT '病人姓名',
+  `doctor_name` varchar(50) NOT NULL DEFAULT '' COMMENT '医生姓名',
+  `inquiry_code` varchar(50) NOT NULL DEFAULT '' COMMENT '门诊号',
+  `card_no` varchar(50) NOT NULL DEFAULT '' COMMENT '卡号',
+  `dept_name` varchar(50) NOT NULL DEFAULT '' COMMENT '科室名称',
+  `inquiry_date` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '就诊时间',
   `preview` longtext COMMENT '预览文字',
   `data_json` longtext COMMENT '内容JSON字符串(演示病历内容)',
   `remark` varchar(128) DEFAULT NULL COMMENT '备注',

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

@@ -1,5 +1,6 @@
 package com.diagbot.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -17,6 +18,14 @@ public class TemplateInfoDTO {
     private Date gmtCreate;//创建时间
     private String name;//模板名字
     private Integer sex;//性别
+    private Integer age;//年龄
+    private String patName;//病人姓名
+    private String doctorName;//医生姓名
+    private String inquiryCode;//门诊号
+    private String cardNo;//卡号
+    private String deptName;//科室名称
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date inquiryDate;//就诊时间
     private String preview;//预览文字
     private String dataJson;//模板数据
     private String remark;//备注

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

@@ -1,5 +1,6 @@
 package com.diagbot.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -17,6 +18,14 @@ public class TemplateInfoPageDTO {
     private Date gmtCreate;//创建时间
     private String name;//模板名字
     private Integer sex;//性别
+    private Integer age;//年龄
+    private String patName;//病人姓名
+    private String doctorName;//医生姓名
+    private String inquiryCode;//门诊号
+    private String cardNo;//卡号
+    private String deptName;//科室名称
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date inquiryDate;//就诊时间
     private String preview;//预览文字
     private String remark;//备注
 }

src/main/java/com/diagbot/entity/TemplateInfo.java

@@ -66,10 +66,45 @@ public class TemplateInfo implements Serializable {
     private Long hospitalId;
 
     /**
-     * 性别
+     * 性别(1：男 2：女)
      */
     private Integer sex;
 
+    /**
+     * 年龄
+     */
+    private Integer age;
+
+    /**
+     * 病人姓名
+     */
+    private String patName;
+
+    /**
+     * 医生姓名
+     */
+    private String doctorName;
+
+    /**
+     * 门诊号
+     */
+    private String inquiryCode;
+
+    /**
+     * 卡号
+     */
+    private String cardNo;
+
+    /**
+     * 科室名称
+     */
+    private String deptName;
+
+    /**
+     * 就诊时间
+     */
+    private Date inquiryDate;
+
     /**
      * 预览文字
      */

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

@@ -94,13 +94,10 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
         }
         //2.获取传入的数据，保存到数据表中。
         Date now = DateUtil.now();
+        BeanUtil.copyProperties(templateInfosVO, templateInfo);
+        templateInfo.setName(templateInfosVO.getModeName());
         templateInfo.setGmtCreate(now);//创建时间
         templateInfo.setGmtModified(now);//修改时间
-        templateInfo.setHospitalId(templateInfosVO.getHospitalId());//医院id
-        templateInfo.setSex(templateInfosVO.getSex());
-        templateInfo.setPreview(templateInfosVO.getPreview());//文本的展示
-        templateInfo.setDataJson(templateInfosVO.getDataJson());//页面json
-        templateInfo.setName(templateInfosVO.getModeName());//病历名称
         boolean res = save(templateInfo);
         if (!res) {
             throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);

src/main/java/com/diagbot/vo/TemplateInfosVO.java

@@ -1,11 +1,13 @@
 package com.diagbot.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 
 /**
  * @author wangfeng
@@ -21,6 +23,20 @@ public class TemplateInfosVO {
     private Long hospitalId = -1L;//医院ID
     @NotNull(message = "请输入性别")
     private Integer sex;//性别
+    @NotNull(message = "请输入年龄")
+    private Integer age;//年龄
+    @NotBlank(message = "请输入病人姓名")
+    private String patName;//病人姓名
+    @NotBlank(message = "请输入医生姓名")
+    private String doctorName;//医生姓名
+    @NotBlank(message = "请输入门诊号")
+    private String inquiryCode;//门诊号
+    @NotBlank(message = "请输入卡号")
+    private String cardNo;//卡号
+    @NotBlank(message = "请输入科室名称")
+    private String deptName;//科室名称
+    @NotNull(message = "请输入就诊时间")
+    private Date inquiryDate;//就诊时间
     @NotNull(message = "请输入预览文本")
     private String preview;//预览文本
     @NotBlank(message = "请输入模板数据")

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

@@ -50,6 +50,13 @@ public class TemplateInfoController {
     @ApiOperation(value = "保存病历病历[by:wangfeng]",
             notes = "modeName;//病历名字</br>" +
             "sex;//性别</br>" +
+            "age;//年龄</br>" +
+            "patName;//病人姓名</br>" +
+            "doctorName;//医生姓名</br>" +
+            "inquiryCode;//门诊号</br>" +
+            "cardNo;//卡号</br>" +
+            "deptName;//科室名称</br>" +
+            "inquiryDate;//就诊时间</br>" +
             "preview;//预览文本</br>" +
             "dataJson;//病历数据</br>")
     @PostMapping("/saveTemplateInfo")

src/main/resources/mapper/TemplateInfoMapper.xml

@@ -5,28 +5,29 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.TemplateInfo">
-        <id column="id" property="id"/>
-        <result column="is_deleted" property="isDeleted"/>
-        <result column="gmt_create" property="gmtCreate"/>
-        <result column="gmt_modified" property="gmtModified"/>
-        <result column="creator" property="creator"/>
-        <result column="modifier" property="modifier"/>
-        <result column="name" property="name"/>
-        <result column="hospital_id" property="hospitalId"/>
-        <result column="sex" property="sex"/>
-        <result column="preview" property="preview"/>
-        <result column="data_json" property="dataJson"/>
-        <result column="remark" property="remark"/>
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="name" property="name" />
+        <result column="hospital_id" property="hospitalId" />
+        <result column="sex" property="sex" />
+        <result column="age" property="age" />
+        <result column="pat_name" property="patName" />
+        <result column="doctor_name" property="doctorName" />
+        <result column="inquiry_code" property="inquiryCode" />
+        <result column="card_no" property="cardNo" />
+        <result column="dept_name" property="deptName" />
+        <result column="inquiry_date" property="inquiryDate" />
+        <result column="preview" property="preview" />
+        <result column="data_json" property="dataJson" />
+        <result column="remark" property="remark" />
     </resultMap>
 
     <select id="getTemplatePages" resultType="com.diagbot.dto.TemplateInfoPageDTO">
-        SELECT
-        id AS id,
-        gmt_create AS gmtCreate,
-        NAME AS name,
-        sex AS sex,
-        preview AS preview,
-        remark AS remark
+        SELECT distinct  *
         FROM
         demo_template_info
         WHERE is_deleted = "N"
@@ -36,7 +37,5 @@
         <if test="name != null and name != ''">
             and UPPER(TRIM(name)) like concat('%',UPPER(TRIM(#{name})),'%')
         </if>
-        ORDER BY gmt_create DESC
-
     </select>
 </mapper>

src/test/java/com/diagbot/CodeGeneration.java

@@ -54,9 +54,9 @@ public class CodeGeneration {
 
         // 策略配置
         StrategyConfig strategy = new StrategyConfig();
-//        strategy.setTablePrefix(new String[] { "med_" });// 此处可以修改为您的表前缀
+        strategy.setTablePrefix(new String[] { "demo_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "med_crisis_info"}); // 需要生成的表
+        strategy.setInclude(new String[] { "demo_template_info"}); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);