update

修改疼痛评价结构

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/dto/BizPainAssessmentDTO.java

@@ -1,5 +1,6 @@
 package cn.tr.module.smart.common.dto;
 
+import cn.tr.module.smart.common.entity.BizPainAssessmentContentEntity;
 import cn.tr.plugin.mybatis.pojo.BaseDTO;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -27,46 +28,46 @@ public class BizPainAssessmentDTO extends BaseDTO  {
     private String id;
 
     @ApiModelProperty(value = "静息时疼痛评分(0-10)", position = 2)
-    private String restingPain;
+    private BizPainAssessmentContentEntity restingPain;
 
     @ApiModelProperty(value = "运动时疼痛评分(0-10)", position = 3)
-    private String movementPain;
+    private BizPainAssessmentContentEntity movementPain;
 
     @ApiModelProperty(value = "过去24小时内最剧烈疼痛评分(0-10)", position = 4)
-    private String painLast;
+    private BizPainAssessmentContentEntity painLast;
 
     @ApiModelProperty(value = "爆发痛每日发生频次", position = 5)
-    private String flareUpFrequency;
+    private BizPainAssessmentContentEntity flareUpFrequency;
 
     @ApiModelProperty(value = "爆发痛每次持续时长(分钟)", position = 6)
-    private String flareUpDuration;
+    private BizPainAssessmentContentEntity flareUpDuration;
 
     @ApiModelProperty(value = "睡眠质量状况(极差/很差/较差/尚可/正常)", position = 7)
-    private String sleepStatus;
+    private BizPainAssessmentContentEntity sleepStatus;
 
     @ApiModelProperty(value = "精神状态(极差/很差/较差/尚可/正常)", position = 8)
-    private String mentalStatus;
+    private BizPainAssessmentContentEntity mentalStatus;
 
     @ApiModelProperty(value = "食欲状况(极差/很差/较差/尚可/正常)", position = 9)
-    private String appetiteStatus;
+    private BizPainAssessmentContentEntity appetiteStatus;
 
     @ApiModelProperty(value = "恶心呕吐情况(呕吐/仅恶心/无)", position = 10)
-    private String nauseaVomiting;
+    private BizPainAssessmentContentEntity nauseaVomiting;
 
     @ApiModelProperty(value = "瘙痒程度(无/轻度/中度/重度)", position = 11)
-    private String itching;
+    private BizPainAssessmentContentEntity itching;
 
     @ApiModelProperty(value = "眩晕程度(无/轻度/中度/重度)", position = 12)
-    private String dizziness;
+    private BizPainAssessmentContentEntity dizziness;
 
     @ApiModelProperty(value = "喉咙疼痛程度(无/轻度/中度/重度)", position = 13)
-    private String throatPain;
+    private BizPainAssessmentContentEntity throatPain;
 
     @ApiModelProperty(value = "声音嘶哑情况(无/有)", position = 14)
-    private String voiceHoarseness;
+    private BizPainAssessmentContentEntity voiceHoarseness;
 
     @ApiModelProperty(value = "患者满意度评分(不满意/较满意/满意)", position = 15)
-    private String satisfactionRating;
+    private BizPainAssessmentContentEntity satisfactionRating;
 
     @ApiModelProperty(value = "手术id", position = 21)
     private String clinicId;

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/entity/BizPainAssessmentContentEntity.java

@@ -0,0 +1,11 @@
+package cn.tr.module.smart.common.entity;
+
+import lombok.Data;
+
+@Data
+public class BizPainAssessmentContentEntity {
+    private String key;
+    private String value;
+    private String content;
+
+}

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/po/BizPainAssessmentPO.java

@@ -1,5 +1,6 @@
 package cn.tr.module.smart.common.po;
 
+import cn.tr.module.smart.common.entity.BizPainAssessmentContentEntity;
 import cn.tr.plugin.mybatis.config.handler.JsonbTypeHandler;
 import cn.tr.plugin.mybatis.config.handler.StringListTypeHandler;
 import cn.tr.plugin.mybatis.pojo.TenantPO;
@@ -30,59 +31,73 @@ public class BizPainAssessmentPO extends TenantPO {
 
     /** 静息时疼痛评分(0-10) */
     @ApiModelProperty(value = "静息时疼痛评分(0-10)", position = 2)
-    private String restingPain;
+    @TableField(typeHandler = JsonbTypeHandler.class)
+    private BizPainAssessmentContentEntity restingPain;
 
     /** 运动时疼痛评分(0-10) */
     @ApiModelProperty(value = "运动时疼痛评分(0-10)", position = 3)
-    private String movementPain;
+    @TableField(typeHandler = JsonbTypeHandler.class)
+    private BizPainAssessmentContentEntity movementPain;
 
     /** 过去24小时内最剧烈疼痛评分(0-10) */
     @ApiModelProperty(value = "过去24小时内最剧烈疼痛评分(0-10)", position = 4)
-    private String painLast;
+    @TableField(typeHandler = JsonbTypeHandler.class)
+    private BizPainAssessmentContentEntity painLast;
 
     /** 爆发痛每日发生频次 */
     @ApiModelProperty(value = "爆发痛每日发生频次", position = 5)
-    private String flareUpFrequency;
+    @TableField(typeHandler = JsonbTypeHandler.class)
+    private BizPainAssessmentContentEntity flareUpFrequency;
 
     /** 爆发痛每次持续时长(分钟) */
     @ApiModelProperty(value = "爆发痛每次持续时长(分钟)", position = 6)
-    private String flareUpDuration;
+    @TableField(typeHandler = JsonbTypeHandler.class)
+    private BizPainAssessmentContentEntity flareUpDuration;
 
     /** 睡眠质量状况(极差/很差/较差/尚可/正常) */
     @ApiModelProperty(value = "睡眠质量状况(极差/很差/较差/尚可/正常)", position = 7)
-    private String sleepStatus;
+    @TableField(typeHandler = JsonbTypeHandler.class)
+    private BizPainAssessmentContentEntity sleepStatus;
 
     /** 精神状态(极差/很差/较差/尚可/正常) */
     @ApiModelProperty(value = "精神状态(极差/很差/较差/尚可/正常)", position = 8)
-    private String mentalStatus;
+    @TableField(typeHandler = JsonbTypeHandler.class)
+    private BizPainAssessmentContentEntity mentalStatus;
 
     /** 食欲状况(极差/很差/较差/尚可/正常) */
     @ApiModelProperty(value = "食欲状况(极差/很差/较差/尚可/正常)", position = 9)
-    private String appetiteStatus;
+    @TableField(typeHandler = JsonbTypeHandler.class)
+    private BizPainAssessmentContentEntity appetiteStatus;
 
     /** 恶心呕吐情况(呕吐/仅恶心/无) */
     @ApiModelProperty(value = "恶心呕吐情况(呕吐/仅恶心/无)", position = 10)
-    private String nauseaVomiting;
+    @TableField(typeHandler = JsonbTypeHandler.class)
+    private BizPainAssessmentContentEntity nauseaVomiting;
 
     /** 瘙痒程度(无/轻度/中度/重度) */
     @ApiModelProperty(value = "瘙痒程度(无/轻度/中度/重度)", position = 11)
-    private String itching;
+    @TableField(typeHandler = JsonbTypeHandler.class)
+    private BizPainAssessmentContentEntity itching;
 
     /** 眩晕程度(无/轻度/中度/重度) */
     @ApiModelProperty(value = "眩晕程度(无/轻度/中度/重度)", position = 12)
-    private String dizziness;
+    @TableField(typeHandler = JsonbTypeHandler.class)
+    private BizPainAssessmentContentEntity dizziness;
 
     /** 喉咙疼痛程度(无/轻度/中度/重度) */
     @ApiModelProperty(value = "喉咙疼痛程度(无/轻度/中度/重度)", position = 13)
-    private String throatPain;
+    @TableField(typeHandler = JsonbTypeHandler.class)
+    private BizPainAssessmentContentEntity throatPain;
 
     /** 声音嘶哑情况(无/有) */
     @ApiModelProperty(value = "声音嘶哑情况(无/有)", position = 14)
-    private String voiceHoarseness;
+    @TableField(typeHandler = JsonbTypeHandler.class)
+    private BizPainAssessmentContentEntity voiceHoarseness;
 
     /** 患者满意度评分(不满意/较满意/满意) */
     @ApiModelProperty(value = "患者满意度评分(不满意/较满意/满意)", position = 15)
-    private String satisfactionRating;
+    @TableField(typeHandler = JsonbTypeHandler.class)
+    private BizPainAssessmentContentEntity satisfactionRating;
 
     @ApiModelProperty(value = "手术ID" ,position = 16)
     private String clinicId;

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/web/dto/BizPainAssessmentListDTO.java

@@ -1,5 +1,6 @@
 package cn.tr.module.smart.web.dto;
 
+import cn.tr.module.smart.common.entity.BizPainAssessmentContentEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -21,7 +22,7 @@ public class BizPainAssessmentListDTO implements Serializable {
     private String assessmentId;
 
     @ApiModelProperty(value = "疼痛评价满意度", position = 2)
-    private String satisfactionRating;
+    private BizPainAssessmentContentEntity satisfactionRating;
 
     @ApiModelProperty(value = "创建时间",position = 3)
     private Date createTime;