Merge branch 'sd' of dd.tall.wiki:ccsens_wiki/ccsenscloud into sd

cloudutil/src/main/resources/application-util-green.yml

@@ -0,0 +1,61 @@
+#服务端点暴露
+management:
+  endpoints:
+    web:
+      exposure:
+        # 暴露xxx端点，如需暴露多个，用,分隔；如需暴露所有端点，用'*'
+        include: auditevents,caches,conditions,flyway,health,heapdump,httptrace,info,integrationgraph,jolokia,logfile,loggers,liquibase,metrics,mappings,prometheus,scheduledtasks,sessions,shutdown,threaddump,hystrix.stream
+#        # 不暴露哪些端点
+#        exclude: env,beans,configprops
+  endpoint:
+    health:
+      # 是否展示健康检查详情
+      show-details: always
+  health:
+    redis:
+      enabled: false
+#eureka注册
+eureka:
+  client:
+    service-url:
+      # 指定eureka server通信地址，注意/eureka/小尾巴不能少
+      #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/
+      defaultZone: http://admin:admin@49.232.6.143:7010/eureka/
+#      defaultZone: http://admin:admin@192.168.0.99:7010/eureka/
+  instance:
+    # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server
+    prefer-ip-address: true
+    metadata-map:
+      management:
+        context-path: ${server.servlet.context-path:}/actuator
+    home-page-url-path: ${server.servlet.context-path:}/
+    status-page-url-path: ${server.servlet.context-path:}/actuator/info
+    health-check-url-path: ${server.servlet.context-path:}/actuator/health
+feign:
+  client:
+    config:
+      default:
+        connectTime: 5000
+        readTimeout: 5000
+        #  NONE【性能最佳，适用于生产】：不记录任何日志（默认值）。
+        #  BASIC【适用于生产环境追踪问题】：仅记录请求方法、URL、响应状态代码以及执行时间。
+        #  HEADERS：记录BASIC级别的基础上，记录请求和响应的header。
+        #  FULL【比较适用于开发及测试环境定位问题】：记录请求和响应的header、body和元数据
+        loggerLevel: basic
+  hystrix:
+    enabled: true
+# sleuth
+logging:
+  level:
+    root: info
+    org.springframework.cloud.sleuth: DEBUG
+spring:
+#  zipkin:
+#    base-url: http://49.233.89.188:9411
+#  sleuth:
+#    sampler:
+#      # 采样率，模式0.1，也就是10%，为了便于观察效果，改为1.0，也就是100%。生产环境建议保持默认。
+#      probability: 1.0
+  cloud:
+    inetutils:
+      ignored-interfaces: ['VMware.*']

ht/src/main/java/com/ccsens/ht/HtApplication.java

@@ -3,7 +3,6 @@ package com.ccsens.ht;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 import org.springframework.cloud.openfeign.EnableFeignClients;

ht/src/main/java/com/ccsens/ht/api/ImportController.java

@@ -70,6 +70,41 @@ public class ImportController {
         return JsonResponse.newInstance().ok();
     }
 
+    /**
+     *@Description:
+     *@Param:
+     *@return: com.ccsens.ptpro.util.JsonResponse
+     *@Author: wuhuijuan
+     *@date: 2019/10/21 10:04
+     */
+    @ApiOperation(value = "单独导入报告单类型",notes = "文件大小不能超过20M，支持后缀:.xls|.xlsx")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "医疗项目表", required = true, paramType = "form",dataType = "__file")
+    })
+    @RequestMapping(value = "/importReportType", method = RequestMethod.POST)
+    public JsonResponse importReportType(@RequestParam(required = true) Part file) throws Exception{
+
+        long time1 = System.currentTimeMillis();
+        //1.上传文件
+        String allowedExts = "xls,xlsx";
+        String dir = WebConstant.UPLOAD_PROJECT_WBS + File.separator;
+        String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExts, dir);
+        File execlFile = new File(dir+path);
+        long time2 = System.currentTimeMillis();
+        log.info("解析文件耗时：{}", (time2 - time1));
+//        importService.importPosition(execlFile, 0);
+//        long time3 = System.currentTimeMillis();
+//        log.info("导入职务耗时：{}", (time3 - time2));
+//        importService.importTitle(execlFile, 1);
+        long time4 = System.currentTimeMillis();
+//        log.info("导入职称耗时：{}", (time4 - time3));
+        importService.importReport(execlFile, 2);
+        long time5 = System.currentTimeMillis();
+        log.info("导入报告单耗时：{}", (time5 - time4));
+//        importService.importQuestion(execlFile, Constant.Ht.Question.ALL);
+        return JsonResponse.newInstance().ok();
+    }
+
 
     /**
      *@Description:
@@ -149,4 +184,30 @@ public class ImportController {
         return JsonResponse.newInstance().ok();
     }
 
+
+    /**
+     *@Description:
+     *@Param:
+     *@return: com.ccsens.ptpro.util.JsonResponse
+     *@Author: wuhuijuan
+     *@date: 2020/5/14 11:21
+     */
+    @ApiOperation(value = "导入importXFXPD",notes = "文件大小不能超过20M，支持后缀:.xls|.xlsx")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "医疗项目表", required = true, paramType = "form",dataType = "__file")
+    })
+    @RequestMapping(value = "/importXFXPD", method = RequestMethod.POST)
+    public JsonResponse importXFXPD(@RequestParam(required = true) Part file) throws Exception{
+
+        long time1 = System.currentTimeMillis();
+        //1.上传文件
+        String allowedExts = "xls,xlsx";
+        String dir = WebConstant.UPLOAD_PROJECT_WBS + File.separator;
+        String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExts, dir);
+        File execlFile = new File(dir+path);
+        long time2 = System.currentTimeMillis();
+        importService.importQuestion(execlFile, Constant.Ht.Report.XFXPD);
+        log.info("导入XFXPD");
+        return JsonResponse.newInstance().ok();
+    }
 }

ht/src/main/java/com/ccsens/ht/api/PatientReportController.java

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
@@ -35,7 +36,7 @@ import java.util.List;
 @RestController
 public class PatientReportController {
 
-    @Autowired
+    @Resource
     private IPatientReportService patientReportService;
 
     @MustLogin

ht/src/main/java/com/ccsens/ht/api/PatientReportSearchController.java

@@ -0,0 +1,64 @@
+package com.ccsens.ht.api;
+
+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.ht.annotation.DoctorAudit;
+import com.ccsens.ht.bean.dto.PatientReportDto;
+import com.ccsens.ht.bean.dto.PatientReportSearchDto;
+import com.ccsens.ht.bean.vo.PatientReportSearchVo;
+import com.ccsens.ht.bean.vo.PatientReportVo;
+import com.ccsens.ht.service.IPatientReportService;
+import com.ccsens.util.JsonResponse;
+import com.ccsens.util.bean.dto.QueryDto;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: whj
+ * @time: 2021/3/10 15:03
+ */
+@Slf4j
+@Api(tags = "报告单搜索",value = "报告单搜索条件，搜索")
+@RestController
+@RequestMapping("/patientReport")
+public class PatientReportSearchController {
+    @Resource
+    private IPatientReportService patientReportService;
+
+    @MustLogin
+    @DoctorAudit
+    @ApiOperation(value = "查询搜索条件",notes = "whj 查询搜索条件")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "查询搜索条件", required = true)
+    })
+    @RequestMapping(value="/searchParam", method = RequestMethod.POST)
+    public JsonResponse<PatientReportSearchVo.SearchParam> searchParam(@RequestBody @ApiParam @Valid QueryDto<PatientReportSearchDto.SearchParam> dto){
+        log.info("查询搜索条件：{}", dto);
+        List<PatientReportSearchVo.SearchParam> params = patientReportService.searchParam(dto.getParam());
+        log.info("查询搜索条件已完成");
+        return JsonResponse.newInstance().ok(params);
+    }
+
+    @MustLogin
+    @DoctorAudit
+    @ApiOperation(value = "根据条件搜索报告单",notes = "whj 搜索报告单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "查询搜索条件", required = true)
+    })
+    @RequestMapping(value="/search", method = RequestMethod.POST)
+    public JsonResponse<PatientReportSearchVo.Search> search(@RequestBody @ApiParam @Valid QueryDto<PatientReportSearchDto.SearchList> dto){
+        log.info("搜索报告单：{}", dto);
+        PageInfo<PatientReportSearchVo.Search> params = patientReportService.search(dto.getParam());
+        log.info("搜索报告单已完成");
+        return JsonResponse.newInstance().ok(params);
+    }
+}

ht/src/main/java/com/ccsens/ht/api/QuestionController.java

@@ -104,4 +104,17 @@ public class QuestionController {
         log.info("查看用户画图信息成功");
         return JsonResponse.newInstance().ok(patientCanvas);
     }
+
+    @MustLogin
+    @DoctorAudit
+    @ApiOperation(value = "删除画图轨迹",notes = "zy:删除画图的轨迹，可以一次删除多条")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value="/delCanvas", method = RequestMethod.POST)
+    public JsonResponse delCanvas(@RequestBody @ApiParam @Valid QueryDto<QuestionDto.DelPatientCanvas> queryDto) throws IOException, NotSupportedFileTypeException {
+        log.info("删除画图轨迹");
+        questionService.delCanvas(queryDto.getParam(), queryDto.getUserId());
+        log.info("删除画图轨迹成功");
+        return JsonResponse.newInstance().ok();
+    }
 }

ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportDto.java

@@ -81,7 +81,10 @@ public class PatientReportDto {
         @ApiModelProperty("病人报告单ID")
         @NotNull(message = "病人报告单ID不能为空")
         private Long id;
+        @ApiModelProperty("是否需要rey 默认为0 0全部查询导出 1不导出rey 2只导出rey")
+        private int rey = 0;
     }
+    
 
     /**医生对报告单权限*/
     @ApiModel("PatientReportDtoAuthority")

ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportSearchDto.java

@@ -0,0 +1,47 @@
+package com.ccsens.ht.bean.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: whj
+ * @time: 2021/3/10 16:21
+ */
+public class PatientReportSearchDto {
+    @Data
+    @ApiModel("搜索条件-请求参数")
+    public static class SearchParam{
+        @ApiModelProperty("查询类型")
+        @NotEmpty(message = "请输入查询报告单类型")
+        private String parentCode;
+    }
+
+    @Data
+    @ApiModel("搜索报告单参数列表-请求")
+    public static class SearchList {
+        private List<Search> codes;
+        @ApiModelProperty("第几页")
+        @Min(value = 1)
+        private int pageNum = 1;
+        @ApiModelProperty("每页多少条")
+        @Min(value = 1)
+        @Max(value=100)
+        private int pageSize = 10;
+    }
+
+    @Data
+    @ApiModel("搜索报告单参数-请求")
+    public static class Search {
+        @NotEmpty(message="请选择查询类型")
+        private String code;
+        private Integer start;
+        private Integer end;
+    }
+}

ht/src/main/java/com/ccsens/ht/bean/dto/QuestionDto.java

@@ -103,4 +103,11 @@ public class QuestionDto {
         private Long questionId;
     }
 
+    @Data
+    @ApiModel("删除画图笔画")
+    public static class DelPatientCanvas{
+        @ApiModelProperty("轨迹的id")
+        private List<Long> pointId;
+    }
+
 }

ht/src/main/java/com/ccsens/ht/bean/po/HtPatientAcp.java

@@ -1,183 +1,205 @@
-package com.ccsens.ht.bean.po;
-
-import java.io.Serializable;
-import java.util.Date;
-
-public class HtPatientAcp implements Serializable {
-    private Long id;
-
-    private Long patientId;
-
-    private String ct;
-
-    private String mri;
-
-    private String hcy;
-
-    private String vb12;
-
-    private String folicAcid;
-
-    private String tt3;
-
-    private String tt4;
-
-    private String tsh;
-
-    private String remark;
-
-    private Date createTime;
-
-    private Date updateTime;
-
-    private Byte isDel;
-
-    private Long recorder;
-
-    private static final long serialVersionUID = 1L;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getPatientId() {
-        return patientId;
-    }
-
-    public void setPatientId(Long patientId) {
-        this.patientId = patientId;
-    }
-
-    public String getCt() {
-        return ct;
-    }
-
-    public void setCt(String ct) {
-        this.ct = ct == null ? null : ct.trim();
-    }
-
-    public String getMri() {
-        return mri;
-    }
-
-    public void setMri(String mri) {
-        this.mri = mri == null ? null : mri.trim();
-    }
-
-    public String getHcy() {
-        return hcy;
-    }
-
-    public void setHcy(String hcy) {
-        this.hcy = hcy == null ? null : hcy.trim();
-    }
-
-    public String getVb12() {
-        return vb12;
-    }
-
-    public void setVb12(String vb12) {
-        this.vb12 = vb12 == null ? null : vb12.trim();
-    }
-
-    public String getFolicAcid() {
-        return folicAcid;
-    }
-
-    public void setFolicAcid(String folicAcid) {
-        this.folicAcid = folicAcid == null ? null : folicAcid.trim();
-    }
-
-    public String getTt3() {
-        return tt3;
-    }
-
-    public void setTt3(String tt3) {
-        this.tt3 = tt3 == null ? null : tt3.trim();
-    }
-
-    public String getTt4() {
-        return tt4;
-    }
-
-    public void setTt4(String tt4) {
-        this.tt4 = tt4 == null ? null : tt4.trim();
-    }
-
-    public String getTsh() {
-        return tsh;
-    }
-
-    public void setTsh(String tsh) {
-        this.tsh = tsh == null ? null : tsh.trim();
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark == null ? null : remark.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Byte getIsDel() {
-        return isDel;
-    }
-
-    public void setIsDel(Byte isDel) {
-        this.isDel = isDel;
-    }
-
-    public Long getRecorder() {
-        return recorder;
-    }
-
-    public void setRecorder(Long recorder) {
-        this.recorder = recorder;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", patientId=").append(patientId);
-        sb.append(", ct=").append(ct);
-        sb.append(", mri=").append(mri);
-        sb.append(", hcy=").append(hcy);
-        sb.append(", vb12=").append(vb12);
-        sb.append(", folicAcid=").append(folicAcid);
-        sb.append(", tt3=").append(tt3);
-        sb.append(", tt4=").append(tt4);
-        sb.append(", tsh=").append(tsh);
-        sb.append(", remark=").append(remark);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", updateTime=").append(updateTime);
-        sb.append(", isDel=").append(isDel);
-        sb.append(", recorder=").append(recorder);
-        sb.append("]");
-        return sb.toString();
-    }
+package com.ccsens.ht.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class HtPatientAcp implements Serializable {
+    private Long id;
+
+    private Long patientId;
+
+    private String ct;
+
+    private String mri;
+
+    private String hcy;
+
+    private String vb12;
+
+    private String folicAcid;
+
+    private String tt3;
+
+    private String tt4;
+
+    private String tsh;
+
+    private String remark;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Byte isDel;
+
+    private Long recorder;
+
+    private String ta1;
+
+    private String tpt;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getPatientId() {
+        return patientId;
+    }
+
+    public void setPatientId(Long patientId) {
+        this.patientId = patientId;
+    }
+
+    public String getCt() {
+        return ct;
+    }
+
+    public void setCt(String ct) {
+        this.ct = ct == null ? null : ct.trim();
+    }
+
+    public String getMri() {
+        return mri;
+    }
+
+    public void setMri(String mri) {
+        this.mri = mri == null ? null : mri.trim();
+    }
+
+    public String getHcy() {
+        return hcy;
+    }
+
+    public void setHcy(String hcy) {
+        this.hcy = hcy == null ? null : hcy.trim();
+    }
+
+    public String getVb12() {
+        return vb12;
+    }
+
+    public void setVb12(String vb12) {
+        this.vb12 = vb12 == null ? null : vb12.trim();
+    }
+
+    public String getFolicAcid() {
+        return folicAcid;
+    }
+
+    public void setFolicAcid(String folicAcid) {
+        this.folicAcid = folicAcid == null ? null : folicAcid.trim();
+    }
+
+    public String getTt3() {
+        return tt3;
+    }
+
+    public void setTt3(String tt3) {
+        this.tt3 = tt3 == null ? null : tt3.trim();
+    }
+
+    public String getTt4() {
+        return tt4;
+    }
+
+    public void setTt4(String tt4) {
+        this.tt4 = tt4 == null ? null : tt4.trim();
+    }
+
+    public String getTsh() {
+        return tsh;
+    }
+
+    public void setTsh(String tsh) {
+        this.tsh = tsh == null ? null : tsh.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Byte isDel) {
+        this.isDel = isDel;
+    }
+
+    public Long getRecorder() {
+        return recorder;
+    }
+
+    public void setRecorder(Long recorder) {
+        this.recorder = recorder;
+    }
+
+    public String getTa1() {
+        return ta1;
+    }
+
+    public void setTa1(String ta1) {
+        this.ta1 = ta1 == null ? null : ta1.trim();
+    }
+
+    public String getTpt() {
+        return tpt;
+    }
+
+    public void setTpt(String tpt) {
+        this.tpt = tpt == null ? null : tpt.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", patientId=").append(patientId);
+        sb.append(", ct=").append(ct);
+        sb.append(", mri=").append(mri);
+        sb.append(", hcy=").append(hcy);
+        sb.append(", vb12=").append(vb12);
+        sb.append(", folicAcid=").append(folicAcid);
+        sb.append(", tt3=").append(tt3);
+        sb.append(", tt4=").append(tt4);
+        sb.append(", tsh=").append(tsh);
+        sb.append(", remark=").append(remark);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", isDel=").append(isDel);
+        sb.append(", recorder=").append(recorder);
+        sb.append(", ta1=").append(ta1);
+        sb.append(", tpt=").append(tpt);
+        sb.append("]");
+        return sb.toString();
+    }
 }

ht/src/main/java/com/ccsens/ht/bean/po/HtPatientScore.java

@@ -1,183 +1,184 @@
-package com.ccsens.ht.bean.po;
-
-import java.io.Serializable;
-import java.util.Date;
-
-public class HtPatientScore implements Serializable {
-    private Long id;
-
-    private Long patientReportId;
-
-    private Long patientId;
-
-    private String questionParentCode;
-
-    private Long questionId;
-
-    private Long optionId;
-
-    private String optionName;
-
-    private Integer score;
-
-    private Byte type;
-
-    private String answer;
-
-    private String remark;
-
-    private Date createTime;
-
-    private Date updateTime;
-
-    private Byte isDel;
-
-    private Long answerTime;
-
-    private static final long serialVersionUID = 1L;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getPatientReportId() {
-        return patientReportId;
-    }
-
-    public void setPatientReportId(Long patientReportId) {
-        this.patientReportId = patientReportId;
-    }
-
-    public Long getPatientId() {
-        return patientId;
-    }
-
-    public void setPatientId(Long patientId) {
-        this.patientId = patientId;
-    }
-
-    public String getQuestionParentCode() {
-        return questionParentCode;
-    }
-
-    public void setQuestionParentCode(String questionParentCode) {
-        this.questionParentCode = questionParentCode == null ? null : questionParentCode.trim();
-    }
-
-    public Long getQuestionId() {
-        return questionId;
-    }
-
-    public void setQuestionId(Long questionId) {
-        this.questionId = questionId;
-    }
-
-    public Long getOptionId() {
-        return optionId;
-    }
-
-    public void setOptionId(Long optionId) {
-        this.optionId = optionId;
-    }
-
-    public String getOptionName() {
-        return optionName;
-    }
-
-    public void setOptionName(String optionName) {
-        this.optionName = optionName == null ? null : optionName.trim();
-    }
-
-    public Integer getScore() {
-        return score;
-    }
-
-    public void setScore(Integer score) {
-        this.score = score;
-    }
-
-    public Byte getType() {
-        return type;
-    }
-
-    public void setType(Byte type) {
-        this.type = type;
-    }
-
-    public String getAnswer() {
-        return answer;
-    }
-
-    public void setAnswer(String answer) {
-        this.answer = answer == null ? null : answer.trim();
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark == null ? null : remark.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Byte getIsDel() {
-        return isDel;
-    }
-
-    public void setIsDel(Byte isDel) {
-        this.isDel = isDel;
-    }
-
-    public Long getAnswerTime() {
-        return answerTime;
-    }
-
-    public void setAnswerTime(Long answerTime) {
-        this.answerTime = answerTime;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", patientReportId=").append(patientReportId);
-        sb.append(", patientId=").append(patientId);
-        sb.append(", questionParentCode=").append(questionParentCode);
-        sb.append(", questionId=").append(questionId);
-        sb.append(", optionId=").append(optionId);
-        sb.append(", optionName=").append(optionName);
-        sb.append(", score=").append(score);
-        sb.append(", type=").append(type);
-        sb.append(", answer=").append(answer);
-        sb.append(", remark=").append(remark);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", updateTime=").append(updateTime);
-        sb.append(", isDel=").append(isDel);
-        sb.append(", answerTime=").append(answerTime);
-        sb.append("]");
-        return sb.toString();
-    }
+package com.ccsens.ht.bean.po;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class HtPatientScore implements Serializable {
+    private Long id;
+
+    private Long patientReportId;
+
+    private Long patientId;
+
+    private String questionParentCode;
+
+    private Long questionId;
+
+    private Long optionId;
+
+    private String optionName;
+
+    private BigDecimal score;
+
+    private Byte type;
+
+    private String answer;
+
+    private String remark;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Byte isDel;
+
+    private Long answerTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getPatientReportId() {
+        return patientReportId;
+    }
+
+    public void setPatientReportId(Long patientReportId) {
+        this.patientReportId = patientReportId;
+    }
+
+    public Long getPatientId() {
+        return patientId;
+    }
+
+    public void setPatientId(Long patientId) {
+        this.patientId = patientId;
+    }
+
+    public String getQuestionParentCode() {
+        return questionParentCode;
+    }
+
+    public void setQuestionParentCode(String questionParentCode) {
+        this.questionParentCode = questionParentCode == null ? null : questionParentCode.trim();
+    }
+
+    public Long getQuestionId() {
+        return questionId;
+    }
+
+    public void setQuestionId(Long questionId) {
+        this.questionId = questionId;
+    }
+
+    public Long getOptionId() {
+        return optionId;
+    }
+
+    public void setOptionId(Long optionId) {
+        this.optionId = optionId;
+    }
+
+    public String getOptionName() {
+        return optionName;
+    }
+
+    public void setOptionName(String optionName) {
+        this.optionName = optionName == null ? null : optionName.trim();
+    }
+
+    public BigDecimal getScore() {
+        return score;
+    }
+
+    public void setScore(BigDecimal score) {
+        this.score = score;
+    }
+
+    public Byte getType() {
+        return type;
+    }
+
+    public void setType(Byte type) {
+        this.type = type;
+    }
+
+    public String getAnswer() {
+        return answer;
+    }
+
+    public void setAnswer(String answer) {
+        this.answer = answer == null ? null : answer.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Byte isDel) {
+        this.isDel = isDel;
+    }
+
+    public Long getAnswerTime() {
+        return answerTime;
+    }
+
+    public void setAnswerTime(Long answerTime) {
+        this.answerTime = answerTime;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", patientReportId=").append(patientReportId);
+        sb.append(", patientId=").append(patientId);
+        sb.append(", questionParentCode=").append(questionParentCode);
+        sb.append(", questionId=").append(questionId);
+        sb.append(", optionId=").append(optionId);
+        sb.append(", optionName=").append(optionName);
+        sb.append(", score=").append(score);
+        sb.append(", type=").append(type);
+        sb.append(", answer=").append(answer);
+        sb.append(", remark=").append(remark);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", isDel=").append(isDel);
+        sb.append(", answerTime=").append(answerTime);
+        sb.append("]");
+        return sb.toString();
+    }
 }

ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionOption.java

@@ -1,139 +1,140 @@
-package com.ccsens.ht.bean.po;
-
-import java.io.Serializable;
-import java.util.Date;
-
-public class HtQuestionOption implements Serializable {
-    private Long id;
-
-    private Long questionId;
-
-    private Integer sort;
-
-    private String type;
-
-    private String name;
-
-    private Integer score;
-
-    private String display;
-
-    private String remark;
-
-    private Date createTime;
-
-    private Date updateTime;
-
-    private Byte isDel;
-
-    private static final long serialVersionUID = 1L;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getQuestionId() {
-        return questionId;
-    }
-
-    public void setQuestionId(Long questionId) {
-        this.questionId = questionId;
-    }
-
-    public Integer getSort() {
-        return sort;
-    }
-
-    public void setSort(Integer sort) {
-        this.sort = sort;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type == null ? null : type.trim();
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name == null ? null : name.trim();
-    }
-
-    public Integer getScore() {
-        return score;
-    }
-
-    public void setScore(Integer score) {
-        this.score = score;
-    }
-
-    public String getDisplay() {
-        return display;
-    }
-
-    public void setDisplay(String display) {
-        this.display = display == null ? null : display.trim();
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark == null ? null : remark.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Byte getIsDel() {
-        return isDel;
-    }
-
-    public void setIsDel(Byte isDel) {
-        this.isDel = isDel;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", questionId=").append(questionId);
-        sb.append(", sort=").append(sort);
-        sb.append(", type=").append(type);
-        sb.append(", name=").append(name);
-        sb.append(", score=").append(score);
-        sb.append(", display=").append(display);
-        sb.append(", remark=").append(remark);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", updateTime=").append(updateTime);
-        sb.append(", isDel=").append(isDel);
-        sb.append("]");
-        return sb.toString();
-    }
+package com.ccsens.ht.bean.po;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class HtQuestionOption implements Serializable {
+    private Long id;
+
+    private Long questionId;
+
+    private Integer sort;
+
+    private String type;
+
+    private String name;
+
+    private BigDecimal score;
+
+    private String display;
+
+    private String remark;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Byte isDel;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getQuestionId() {
+        return questionId;
+    }
+
+    public void setQuestionId(Long questionId) {
+        this.questionId = questionId;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type == null ? null : type.trim();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public BigDecimal getScore() {
+        return score;
+    }
+
+    public void setScore(BigDecimal score) {
+        this.score = score;
+    }
+
+    public String getDisplay() {
+        return display;
+    }
+
+    public void setDisplay(String display) {
+        this.display = display == null ? null : display.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Byte isDel) {
+        this.isDel = isDel;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", questionId=").append(questionId);
+        sb.append(", sort=").append(sort);
+        sb.append(", type=").append(type);
+        sb.append(", name=").append(name);
+        sb.append(", score=").append(score);
+        sb.append(", display=").append(display);
+        sb.append(", remark=").append(remark);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", isDel=").append(isDel);
+        sb.append("]");
+        return sb.toString();
+    }
 }

ht/src/main/java/com/ccsens/ht/bean/vo/PatientReportSearchVo.java

@@ -0,0 +1,33 @@
+package com.ccsens.ht.bean.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: whj
+ * @time: 2021/3/10 16:06
+ */
+public class PatientReportSearchVo {
+
+    @Data
+    @ApiModel("搜索条件-响应")
+    public static class SearchParam {
+        private Long id;
+        private String code;
+        private String name;
+        private byte optionStatus;
+        private String parentCode;
+        private List<SearchParam> children = new ArrayList<>();
+    }
+
+    @Data
+    @ApiModel("搜索-响应")
+    public static class Search {
+        private Long id;
+        private String name;
+    }
+}

ht/src/main/java/com/ccsens/ht/bean/vo/PatientReportVo.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -210,7 +211,7 @@ public class PatientReportVo {
         @ApiModelProperty("总分（<0:不需要显示总分,=0：不计分, >0:总分）")
         private Integer totalScore;
         @ApiModelProperty("病人得分")
-        private Integer score;
+        private BigDecimal score;
         @ApiModelProperty("备注")
         private String remark;
         @ApiModelProperty("类型（1：报告单 2:测评 3：测评子类 4：二级子类）")

ht/src/main/java/com/ccsens/ht/bean/vo/QuestionVo.java

@@ -307,6 +307,8 @@ public class QuestionVo {
     @Data
     @ApiModel("轨迹信息及颜色")
     public static class Point{
+        @ApiModelProperty("id")
+        private Long pointId;
         @ApiModelProperty("颜色")
         private Integer color;
         @ApiModelProperty("轨迹坐标值")
@@ -339,9 +341,9 @@ public class QuestionVo {
         private Long totalDuration;
         @ApiModelProperty("总笔画数")
         private int lineNums;
-        @ApiModelProperty("最长笔画")
+        @ApiModelProperty("最长笔画长度")
         private double longLine;
-        @ApiModelProperty("最短笔画")
+        @ApiModelProperty("最短笔画长度")
         private double shortLine;
         @ApiModelProperty("笔画中间值")
         private double centre;
@@ -351,6 +353,19 @@ public class QuestionVo {
         private String beyondProportion;
         @ApiModelProperty("每条轨迹的参数")
         private List<LineParameter> lineParameterList;
+        /*20210112新加统计数据*/
+        @ApiModelProperty("思考总时间（所有笔画间隔时间）")
+        private Long reflectOnTime;
+        @ApiModelProperty("中心 暂定为坐标：X,Y")
+        private String centreCoordinate;
+        @ApiModelProperty("面积 暂定均为最小外接长方形 单位为px")
+        private double acreage;
+        @ApiModelProperty("平均笔画长度")
+        private double aveLength;
+        @ApiModelProperty("长笔画数量")
+        private int longNums;
+        @ApiModelProperty("长笔画数量")
+        private int shortNums;
     }
 
     @Data

ht/src/main/java/com/ccsens/ht/config/SpringConfig.java

@@ -17,7 +17,6 @@ import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 

ht/src/main/java/com/ccsens/ht/persist/dao/HtPatientReportDao.java

@@ -1,6 +1,8 @@
 package com.ccsens.ht.persist.dao;
 
 import com.ccsens.ht.bean.dto.PatientReportDto;
+import com.ccsens.ht.bean.dto.PatientReportSearchDto;
+import com.ccsens.ht.bean.vo.PatientReportSearchVo;
 import com.ccsens.ht.bean.vo.PatientReportVo;
 import com.ccsens.ht.persist.mapper.HtPatientReportMapper;
 import org.apache.ibatis.annotations.Param;
@@ -29,7 +31,7 @@ public interface HtPatientReportDao extends HtPatientReportMapper {
      *@Author: wuHuiJuan
      *@date: 2019/11/19 11:46
      */
-    List<PatientReportVo.ReportScore> queryReportScore(@Param("id") Long id);
+    List<PatientReportVo.ReportScore> queryReportScore(@Param("id") Long id,@Param("rey") int rey);
 
     /**
      * 查询NPI的分数
@@ -95,4 +97,11 @@ public interface HtPatientReportDao extends HtPatientReportMapper {
      * @return
      */
     List<PatientReportVo.ReportDetailAnswer> queryReportAnswer(@Param("id")Long id, @Param("evaluationCode")String evaluationCode);
+
+    /**
+     * 根据分数搜索报告单
+     * @param codes 分数
+     * @return 报告单
+     */
+    List<PatientReportSearchVo.Search> search(@Param("codes") List<PatientReportSearchDto.Search> codes);
 }

ht/src/main/java/com/ccsens/ht/persist/dao/HtReportDao.java

@@ -1,7 +1,9 @@
 package com.ccsens.ht.persist.dao;
 
 import com.ccsens.ht.bean.po.HtReport;
+import com.ccsens.ht.bean.vo.PatientReportSearchVo;
 import com.ccsens.ht.persist.mapper.HtReportMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -28,4 +30,11 @@ public interface HtReportDao extends HtReportMapper {
      *@date: 2019/11/19 10:10
      */
     List<HtReport> queryReportShow();
+
+    /**
+     * 查询所有下级菜单和是否有试题
+     * @param parentCode 父code
+     * @return 搜索条件
+     */
+    List<PatientReportSearchVo.SearchParam> queryParam(@Param("parentCode") String parentCode);
 }

ht/src/main/java/com/ccsens/ht/persist/mapper/HtPatientAcpMapper.java

@@ -1,30 +1,30 @@
-package com.ccsens.ht.persist.mapper;
-
-import com.ccsens.ht.bean.po.HtPatientAcp;
-import com.ccsens.ht.bean.po.HtPatientAcpExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface HtPatientAcpMapper {
-    long countByExample(HtPatientAcpExample example);
-
-    int deleteByExample(HtPatientAcpExample example);
-
-    int deleteByPrimaryKey(Long id);
-
-    int insert(HtPatientAcp record);
-
-    int insertSelective(HtPatientAcp record);
-
-    List<HtPatientAcp> selectByExample(HtPatientAcpExample example);
-
-    HtPatientAcp selectByPrimaryKey(Long id);
-
-    int updateByExampleSelective(@Param("record") HtPatientAcp record, @Param("example") HtPatientAcpExample example);
-
-    int updateByExample(@Param("record") HtPatientAcp record, @Param("example") HtPatientAcpExample example);
-
-    int updateByPrimaryKeySelective(HtPatientAcp record);
-
-    int updateByPrimaryKey(HtPatientAcp record);
+package com.ccsens.ht.persist.mapper;
+
+import com.ccsens.ht.bean.po.HtPatientAcp;
+import com.ccsens.ht.bean.po.HtPatientAcpExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface HtPatientAcpMapper {
+    long countByExample(HtPatientAcpExample example);
+
+    int deleteByExample(HtPatientAcpExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(HtPatientAcp record);
+
+    int insertSelective(HtPatientAcp record);
+
+    List<HtPatientAcp> selectByExample(HtPatientAcpExample example);
+
+    HtPatientAcp selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") HtPatientAcp record, @Param("example") HtPatientAcpExample example);
+
+    int updateByExample(@Param("record") HtPatientAcp record, @Param("example") HtPatientAcpExample example);
+
+    int updateByPrimaryKeySelective(HtPatientAcp record);
+
+    int updateByPrimaryKey(HtPatientAcp record);
 }

ht/src/main/java/com/ccsens/ht/persist/mapper/HtPatientScoreMapper.java

@@ -1,30 +1,30 @@
-package com.ccsens.ht.persist.mapper;
-
-import com.ccsens.ht.bean.po.HtPatientScore;
-import com.ccsens.ht.bean.po.HtPatientScoreExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface HtPatientScoreMapper {
-    long countByExample(HtPatientScoreExample example);
-
-    int deleteByExample(HtPatientScoreExample example);
-
-    int deleteByPrimaryKey(Long id);
-
-    int insert(HtPatientScore record);
-
-    int insertSelective(HtPatientScore record);
-
-    List<HtPatientScore> selectByExample(HtPatientScoreExample example);
-
-    HtPatientScore selectByPrimaryKey(Long id);
-
-    int updateByExampleSelective(@Param("record") HtPatientScore record, @Param("example") HtPatientScoreExample example);
-
-    int updateByExample(@Param("record") HtPatientScore record, @Param("example") HtPatientScoreExample example);
-
-    int updateByPrimaryKeySelective(HtPatientScore record);
-
-    int updateByPrimaryKey(HtPatientScore record);
+package com.ccsens.ht.persist.mapper;
+
+import com.ccsens.ht.bean.po.HtPatientScore;
+import com.ccsens.ht.bean.po.HtPatientScoreExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface HtPatientScoreMapper {
+    long countByExample(HtPatientScoreExample example);
+
+    int deleteByExample(HtPatientScoreExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(HtPatientScore record);
+
+    int insertSelective(HtPatientScore record);
+
+    List<HtPatientScore> selectByExample(HtPatientScoreExample example);
+
+    HtPatientScore selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") HtPatientScore record, @Param("example") HtPatientScoreExample example);
+
+    int updateByExample(@Param("record") HtPatientScore record, @Param("example") HtPatientScoreExample example);
+
+    int updateByPrimaryKeySelective(HtPatientScore record);
+
+    int updateByPrimaryKey(HtPatientScore record);
 }

ht/src/main/java/com/ccsens/ht/persist/mapper/HtQuestionOptionMapper.java

@@ -1,30 +1,30 @@
-package com.ccsens.ht.persist.mapper;
-
-import com.ccsens.ht.bean.po.HtQuestionOption;
-import com.ccsens.ht.bean.po.HtQuestionOptionExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface HtQuestionOptionMapper {
-    long countByExample(HtQuestionOptionExample example);
-
-    int deleteByExample(HtQuestionOptionExample example);
-
-    int deleteByPrimaryKey(Long id);
-
-    int insert(HtQuestionOption record);
-
-    int insertSelective(HtQuestionOption record);
-
-    List<HtQuestionOption> selectByExample(HtQuestionOptionExample example);
-
-    HtQuestionOption selectByPrimaryKey(Long id);
-
-    int updateByExampleSelective(@Param("record") HtQuestionOption record, @Param("example") HtQuestionOptionExample example);
-
-    int updateByExample(@Param("record") HtQuestionOption record, @Param("example") HtQuestionOptionExample example);
-
-    int updateByPrimaryKeySelective(HtQuestionOption record);
-
-    int updateByPrimaryKey(HtQuestionOption record);
+package com.ccsens.ht.persist.mapper;
+
+import com.ccsens.ht.bean.po.HtQuestionOption;
+import com.ccsens.ht.bean.po.HtQuestionOptionExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface HtQuestionOptionMapper {
+    long countByExample(HtQuestionOptionExample example);
+
+    int deleteByExample(HtQuestionOptionExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(HtQuestionOption record);
+
+    int insertSelective(HtQuestionOption record);
+
+    List<HtQuestionOption> selectByExample(HtQuestionOptionExample example);
+
+    HtQuestionOption selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") HtQuestionOption record, @Param("example") HtQuestionOptionExample example);
+
+    int updateByExample(@Param("record") HtQuestionOption record, @Param("example") HtQuestionOptionExample example);
+
+    int updateByPrimaryKeySelective(HtQuestionOption record);
+
+    int updateByPrimaryKey(HtQuestionOption record);
 }

ht/src/main/java/com/ccsens/ht/service/IPatientReportService.java

@@ -1,7 +1,9 @@
 package com.ccsens.ht.service;
 
 import com.ccsens.ht.bean.dto.PatientReportDto;
+import com.ccsens.ht.bean.dto.PatientReportSearchDto;
 import com.ccsens.ht.bean.po.HtDoctor;
+import com.ccsens.ht.bean.vo.PatientReportSearchVo;
 import com.ccsens.ht.bean.vo.PatientReportVo;
 import com.ccsens.util.CodeEnum;
 import com.ccsens.util.JsonResponse;
@@ -142,4 +144,17 @@ public interface IPatientReportService {
     List<PatientReportVo.ReportDetailAnswer> queryReportAnswer(PatientReportDto.QueryReportAnswer param, Long userId);
 
 
+    /**
+     * 查询报告单的搜索条件
+     * @param param 父code
+     * @return 搜索条件
+     */
+    List<PatientReportSearchVo.SearchParam> searchParam(PatientReportSearchDto.SearchParam param);
+
+    /**
+     * 搜索报告单
+     * @param param 搜索列表
+     * @return 报告单
+     */
+    PageInfo<PatientReportSearchVo.Search> search(PatientReportSearchDto.SearchList param);
 }

ht/src/main/java/com/ccsens/ht/service/IQuestionService.java

@@ -54,4 +54,11 @@ public interface IQuestionService {
      * @return 返回选项
      */
     List<QuestionVo.OptionJson> queryOptionJson(QuestionDto.QueryPatientCanvas param, Long userId);
+
+    /**
+     * 删除画图轨迹
+     * @param param 轨迹的id可以为多条
+     * @param userId userId
+     */
+    void delCanvas(QuestionDto.DelPatientCanvas param, Long userId);
 }

ht/src/main/java/com/ccsens/ht/service/ImportService.java

@@ -362,7 +362,7 @@ public class ImportService implements IImportService {
 
         option.setQuestionId(questionId);
         option.setSort(sort);
-        option.setScore(option.getScore() == null ? Constant.Ht.NUMBER_DEFAULT : option.getScore());
+        option.setScore(option.getScore() == null ? Constant.Ht.NUMBER_DEFAULT_BIGDECIMAL : option.getScore());
 
         log.info("导入选项：{}", option);
         return option;

ht/src/main/java/com/ccsens/ht/service/PatientReportService.java

@@ -4,13 +4,17 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.IdcardUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.ccsens.ht.bean.dto.PatientReportDto;
+import com.ccsens.ht.bean.dto.PatientReportSearchDto;
 import com.ccsens.ht.bean.po.*;
+import com.ccsens.ht.bean.vo.PatientReportSearchVo;
 import com.ccsens.ht.bean.vo.PatientReportVo;
 import com.ccsens.ht.persist.dao.HtDoctorDao;
 import com.ccsens.ht.persist.dao.HtPatientReportDao;
 import com.ccsens.ht.persist.dao.HtPositionDao;
+import com.ccsens.ht.persist.dao.HtReportDao;
 import com.ccsens.ht.persist.mapper.HtPatientFollowUpMapper;
 import com.ccsens.ht.persist.mapper.HtPatientMapper;
 import com.ccsens.ht.persist.mapper.HtPatientReportRecordMapper;
@@ -21,7 +25,6 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.StringUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -45,7 +48,7 @@ import java.util.concurrent.atomic.AtomicReference;
 @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
 public class PatientReportService implements IPatientReportService {
 
-    @Autowired
+    @Resource
     private Snowflake snowflake;
     @Resource
     private HtDoctorDao htDoctorDao;
@@ -59,6 +62,8 @@ public class PatientReportService implements IPatientReportService {
     private HtPatientReportRecordMapper htPatientReportRecordMapper;
     @Resource
     private HtPatientFollowUpMapper htPatientFollowUpMapper;
+    @Resource
+    private HtReportDao htReportDao;
 
     @Override
     public JsonResponse<PatientReportVo.Generate> generatePatientReport(PatientReportDto.Generate generate, Long userId) {
@@ -145,6 +150,7 @@ public class PatientReportService implements IPatientReportService {
         copy.setUrl(Constant.Ht.STRING_DEFAULT);
         copy.setQrCodeUrl(Constant.Ht.STRING_DEFAULT);
         copy.setCompleteStatus(Constant.Ht.Report.COMPLETE_OK);
+        copy.setShowStatus(Constant.Ht.Report.SHOW_HISTORY);
         htPatientReportDao.updateByPrimaryKeySelective(copy);
         log.info("成功编辑报告单信息");
         HtPatientReportRecord record = new HtPatientReportRecord();
@@ -217,11 +223,16 @@ public class PatientReportService implements IPatientReportService {
         //查询报告单信息和病人信息
         PatientReportVo.ReprotPatient reportPatient = htPatientReportDao.queryReportResult(queryDetail.getId());
         //查询报告单分数
-        List<PatientReportVo.ReportScore> reportScore = htPatientReportDao.queryReportScore(queryDetail.getId());
+        List<PatientReportVo.ReportScore> reportScore = htPatientReportDao.queryReportScore(queryDetail.getId(),queryDetail.getRey());
         //重新封装报告单信息
         Map<String, PatientReportVo.ReportScore> map = new HashMap<>(32);
         List<PatientReportVo.ReportScore> scores = new ArrayList<>();
         reportScore.forEach(score -> {
+            if(ObjectUtil.isNotNull(score.getScore())){
+                if(BigDecimal.valueOf(score.getScore().intValue()).compareTo(score.getScore()) == 0){
+                    score.setScore(score.getScore().setScale(0,BigDecimal.ROUND_HALF_UP));
+                }
+            }
             map.put(score.getCode(), score);
             //测评类（MOCA等）
             if (Constant.Ht.Report.TYPE_EVALUATION.equals(score.getType())) {
@@ -231,6 +242,7 @@ public class PatientReportService implements IPatientReportService {
                 }
                 scores.add(score);
             } else {
+
                 log.info("score:{}", score);
                 map.get(score.getParentCode()).addSub(score);
             }
@@ -258,7 +270,10 @@ public class PatientReportService implements IPatientReportService {
         carer.setCode("carer");
         carer.setName("照顾者");
         carer.setTotalScore(-1);
-        carer.setScore(npiScore == null || npiScore.get("carer") == null ? null : ((BigDecimal) npiScore.get("carer")).intValue());
+        carer.setScore(npiScore == null || npiScore.get("carer") == null ? null : ((BigDecimal)npiScore.get("carer")));
+        if(ObjectUtil.isNotNull(carer.getScore())){
+            carer.setScore(carer.getScore().setScale(0,BigDecimal.ROUND_HALF_UP));
+        }
         carer.setType((byte)3);
         carer.setParentCode("NPI");
         score.addSub(carer);
@@ -266,7 +281,10 @@ public class PatientReportService implements IPatientReportService {
         patient.setCode("result");
         patient.setName("患者");
         patient.setTotalScore(-1);
-        patient.setScore(npiScore == null || npiScore.get("result") == null ? null : ((BigDecimal) npiScore.get("result")).intValue());
+        patient.setScore(npiScore == null || npiScore.get("result") == null ? null : ((BigDecimal) npiScore.get("result")));
+        if(ObjectUtil.isNotNull(patient.getScore())){
+            patient.setScore(patient.getScore().setScale(0,BigDecimal.ROUND_HALF_UP));
+        }
         patient.setType((byte)3);
         patient.setParentCode("NPI");
         score.addSub(patient);
@@ -318,23 +336,25 @@ public class PatientReportService implements IPatientReportService {
      *@Author: wuHuiJuan
      *@date: 2019/11/19 15:42
      */
-    private Integer sumScore(PatientReportVo.ReportScore score){
-        AtomicReference<Integer> sum = new AtomicReference<>(score.getScore() == null ? 0 : score.getScore());
+    private BigDecimal sumScore(PatientReportVo.ReportScore score){
+        AtomicReference<BigDecimal> sum = new AtomicReference<>(score.getScore() == null ? BigDecimal.valueOf(0) : score.getScore());
         AtomicBoolean hasAdd = new AtomicBoolean(false);
         if (!CollectionUtils.isEmpty(score.getSubReport())) {
             score.getSubReport().forEach(sub -> {
                 sum.updateAndGet(v -> {
-                    Integer sumScore = sumScore(sub);
+                    BigDecimal sumScore = sumScore(sub);
                     if (sumScore== null) {
                         return v;
                     }
                     hasAdd.set(true);
-                    return v += sumScore;
+//                    return v += sumScore;
+                     v = v.add(sumScore);
+                    return v;
                 });
             });
         } else  {
             if (StringUtil.isNotEmpty(score.getRemark()) && score.getRemark().matches(Constant.Ht.Report.IGNORE_SCORE)) {
-                return score.getScore() == null ? null : 0;
+                return score.getScore() == null ? null : BigDecimal.valueOf(0);
             }
             if (Constant.Ht.Report.MOCA_SJZ.equals(score.getCode()))  {
                 return null;
@@ -352,6 +372,8 @@ public class PatientReportService implements IPatientReportService {
     @Override
     public String exportReport(PatientReportDto.QueryDetail queryDetail, Long userId) {
         log.info("导出报告单：{}， 操作用户：{}", queryDetail, userId);
+        // TODO 暂时不导出rey试题，将传入参数改为1
+        queryDetail.setRey(1);
         //查看是否已生成对应文件路径
         HtPatientReport report = htPatientReportDao.selectByPrimaryKey(queryDetail.getId());
         if (report == null) {
@@ -560,5 +582,33 @@ public class PatientReportService implements IPatientReportService {
         return htPatientReportDao.queryReportAnswer(param.getId(),param.getEvaluationCode());
     }
 
+    @Override
+    public List<PatientReportSearchVo.SearchParam> searchParam(PatientReportSearchDto.SearchParam param) {
+        List<PatientReportSearchVo.SearchParam> list =  htReportDao.queryParam(param.getParentCode());
+        if (CollectionUtil.isEmpty(list)) {
+            return list;
+        }
+        Map<String, PatientReportSearchVo.SearchParam> map = new HashMap<>();
+        List<PatientReportSearchVo.SearchParam> nodes = new ArrayList<>();
+        list.forEach(searchParam -> {
+            if (param.getParentCode().equals(searchParam.getParentCode())) {
+                nodes.add(searchParam);
+            } else {
+                PatientReportSearchVo.SearchParam parent = map.get(searchParam.getParentCode());
+                parent.getChildren().add(searchParam);
+            }
+            map.put(searchParam.getCode(), searchParam);
+        });
+        return nodes;
+    }
+
+    @Override
+    public PageInfo<PatientReportSearchVo.Search> search(PatientReportSearchDto.SearchList param) {
+
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+        List<PatientReportSearchVo.Search> list = htPatientReportDao.search(param.getCodes());
+        return new PageInfo<>(list);
+    }
+
 
 }

ht/src/main/java/com/ccsens/ht/service/QuestionService.java

@@ -29,6 +29,7 @@ import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -243,6 +244,12 @@ public class QuestionService implements IQuestionService {
 
         for(QuestionDto.Option option : score.getOptions()) {
             HtQuestionOption questionOption = htQuestionOptionDao.selectByPrimaryKey(option.getId());
+            //去除整数后多余的小数点
+            if(ObjectUtil.isNotNull(questionOption.getScore())){
+                if(BigDecimal.valueOf(questionOption.getScore().intValue()).compareTo(questionOption.getScore()) == 0){
+                    questionOption.setScore(questionOption.getScore().setScale(0,BigDecimal.ROUND_HALF_UP));
+                }
+            }
             //未找到对应选项 或选项不是该试题的选项
             if (questionOption == null || questionOption.getQuestionId().longValue() != question.getId()) {
                 log.info("选项不存在或不是对应试题的选项");
@@ -273,7 +280,7 @@ public class QuestionService implements IQuestionService {
         //保存现在的答案
         if (CollectionUtil.isEmpty(scores)) {
             // 选项为空，默认0分
-            HtPatientScore zeroScore = getHtPatientScore(score, parentCode, report, 0);
+            HtPatientScore zeroScore = getHtPatientScore(score, parentCode, report, BigDecimal.valueOf(0));
             scores.add(zeroScore);
         }
         htPatientScoreDao.insertBatch(scores);
@@ -285,7 +292,7 @@ public class QuestionService implements IQuestionService {
         return CodeEnum.SUCCESS;
     }
 
-    private HtPatientScore getHtPatientScore(QuestionDto.Score score, String parentCode, HtPatientReport report, int i) {
+    private HtPatientScore getHtPatientScore(QuestionDto.Score score, String parentCode, HtPatientReport report, BigDecimal i) {
         HtPatientScore zeroScore = new HtPatientScore();
         zeroScore.setId(snowflake.nextId());
         zeroScore.setPatientReportId(score.getPatientReportId());
@@ -363,7 +370,7 @@ public class QuestionService implements IQuestionService {
                 patientScore.set(next.getIntValue(Constant.Ht.Rule.SMALL_SCORE));
             }
         }
-        HtPatientScore singleScore = getHtPatientScore(score, parentCode, report, patientScore.get());
+        HtPatientScore singleScore = getHtPatientScore(score, parentCode, report, BigDecimal.valueOf(patientScore.get()));
 
         scores.add(singleScore);
     }
@@ -378,7 +385,7 @@ public class QuestionService implements IQuestionService {
             return 0;
         }
         // 分数>0， 算1道题
-        return scores.stream().mapToInt(score -> score.getScore() > 0 ? 1 : 0).sum();
+        return scores.stream().mapToInt(score -> score.getScore().compareTo(BigDecimal.valueOf(0)) > 0 ? 1 : 0).sum();
     }
 
     private void optionUniq(QuestionDto.Score score) {
@@ -469,7 +476,7 @@ public class QuestionService implements IQuestionService {
                 ScriptEngineManager manager = new ScriptEngineManager();
                 ScriptEngine js = manager.getEngineByName("js");
                 try {
-                    Integer result = (Integer)js.eval(substring);
+                    BigDecimal result = BigDecimal.valueOf((Integer)js.eval(substring));
                     patientScore.setScore(result);
                 } catch (ScriptException e) {
                     log.error("计算出现异常",e);
@@ -637,7 +644,7 @@ public class QuestionService implements IQuestionService {
         //共几分钟
         double d = (double) endTime / 1000 / 60;
         //每分钟几笔
-        parameter.setAveTimes((int) Math.floor(canvasPoints.size() / d));
+        parameter.setAveTimes((int) Math.round(canvasPoints.size() / d));
         //每笔数据
         List<QuestionVo.LineParameter> lineParameterList = new ArrayList<>();
         long intervalDuration = 0;
@@ -645,6 +652,18 @@ public class QuestionService implements IQuestionService {
         double longLine = 0;
         //最短的笔画
         double shortLine = 0;
+        //思考总时间 每笔间隔相加
+        long reflectOnTime = 0;
+        //X最小值
+        int minX = 0;
+        //X最大值
+        int maxX = 0;
+        //Y最小值
+        int minY = 0;
+        //Y最大值
+        int maxY = 0;
+        //总长度
+        double totalLength = 0;
         for(QuestionVo.Point canvas : canvasPoints){
             //时间
             QuestionVo.LineParameter lineParameter = new QuestionVo.LineParameter();
@@ -652,6 +671,14 @@ public class QuestionService implements IQuestionService {
             if(a.length <= 0){
                 continue;
             }
+            //获取最边缘的四个点
+            for (String value : a) {
+                String[] split1 = value.split(",");
+                minX = Math.min(Integer.parseInt(split1[0]), minX);
+                maxX = Math.max(Integer.parseInt(split1[0]), maxX);
+                minY = Math.min(Integer.parseInt(split1[1]), minY);
+                maxY = Math.max(Integer.parseInt(split1[1]), maxY);
+            }
             String[] s = a[0].split(",");
             if(s.length <= 0){
                 continue;
@@ -664,6 +691,8 @@ public class QuestionService implements IQuestionService {
             lineParameter.setDuration(duration);
             //长度
             double length = getLengthByCanvas(a);
+            //计算总长度
+            totalLength += length;
             lineParameter.setLength(length);
             //计算最长最短
             if(longLine == 0){
@@ -679,27 +708,69 @@ public class QuestionService implements IQuestionService {
             //速度
             double speed = 0;
             if(length != 0 && duration != 0){
-                speed = BigDecimal.valueOf(length / duration).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+                speed = BigDecimal.valueOf(length / duration).setScale(2, RoundingMode.HALF_UP).doubleValue();
             }
             lineParameter.setSpeed(speed);
-            //和上一笔的间隔
+            //和上一笔的间隔 & 思考总时长
             if(Long.parseLong(e[e.length - 1]) == 0){
                 lineParameter.setIntervalDuration(htPatientCanvas.getBeginTime() - htPatientCanvas.getOpenCanvasTime());
+                reflectOnTime += htPatientCanvas.getBeginTime() - htPatientCanvas.getOpenCanvasTime();
             }else {
                 intervalDuration = Long.parseLong(e[e.length - 1]) - intervalDuration;
                 lineParameter.setIntervalDuration(intervalDuration);
+                reflectOnTime += intervalDuration;
             }
             lineParameterList.add(lineParameter);
+
         }
         parameter.setLineParameterList(lineParameterList);
         //最长笔画
         parameter.setLongLine(longLine);
         //最短笔画
         parameter.setShortLine(shortLine);
+        //思考总时长
+        parameter.setReflectOnTime(reflectOnTime);
+        //计算中心
+        int x = minX + ((maxX - minX) / 2);
+        int y = minY + ((maxY - minY) / 2);
+        String centreCoordinate = x + "," + y;
+        parameter.setCentreCoordinate(centreCoordinate);
+        //面积
+        double acreage = (maxX - minX) * (maxY - minY);
+        parameter.setAcreage(acreage);
+        //平均长度
+        double aveLength = BigDecimal.valueOf(totalLength / canvasPoints.size()).setScale(2, RoundingMode.HALF_UP).doubleValue();
+        parameter.setAveLength(aveLength);
+        //短笔画数量
+        double coefficient = 1.00;
+        int shortNums = getShortNums(aveLength,coefficient,lineParameterList);
+        parameter.setShortNums(shortNums);
+        //长笔画数量，等于总笔画减去短笔画的数量
+        parameter.setLongNums(lineParameterList.size() - shortNums);
         //TODO 笔画中间值
         return parameter;
     }
 
+    /**
+     * 获取短笔画的数量
+     * @param aveLength 平均长度
+     * @param coefficient 自定义系数
+     * @param lineParameterList 所有笔画的参数
+     * @return 返回短笔画的数量
+     */
+    private int getShortNums(double aveLength, double coefficient, List<QuestionVo.LineParameter> lineParameterList) {
+        int shortNums = 0;
+        double a = aveLength * coefficient;
+        if(CollectionUtil.isNotEmpty(lineParameterList)){
+            for(QuestionVo.LineParameter lineParameter : lineParameterList){
+                if(lineParameter.getLength() <= a){
+                    shortNums++;
+                }
+            }
+        }
+        return shortNums;
+    }
+
     private double getLengthByCanvas(String[] canvas) {
         double l = 0;
         for (int i = 1; i < canvas.length; i++){
@@ -710,6 +781,19 @@ public class QuestionService implements IQuestionService {
             double sqrt = Math.sqrt(pow + pow1);
             l += sqrt;
         }
-        return BigDecimal.valueOf(l).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+        return BigDecimal.valueOf(l).setScale(2, RoundingMode.HALF_UP).doubleValue();
+    }
+
+
+    @Override
+    public void delCanvas(QuestionDto.DelPatientCanvas param, Long userId) {
+        if(CollectionUtil.isNotEmpty(param.getPointId())){
+            param.getPointId().forEach(pointId ->{
+                HtPatientCanvasLine patientCanvasLine = new HtPatientCanvasLine();
+                patientCanvasLine.setId(pointId);
+                patientCanvasLine.setIsDel((byte) 2);
+                patientCanvasLineMapper.updateByPrimaryKeySelective(patientCanvasLine);
+            });
+        }
     }
 }

ht/src/main/java/com/ccsens/ht/uitl/Constant.java

@@ -2,6 +2,7 @@ package com.ccsens.ht.uitl;
 
 import com.ccsens.util.PropUtil;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -49,6 +50,8 @@ public class Constant {
     public static class Ht {
         /**数字默认值*/
         public final static byte NUMBER_DEFAULT = 0;
+        /**数字默认值*/
+        public final static BigDecimal NUMBER_DEFAULT_BIGDECIMAL = BigDecimal.valueOf(0);
         /**字符串默认值*/
         public final static String STRING_DEFAULT = "";
         public final static String DOCTOR_PARAM = "doctor";
@@ -117,6 +120,7 @@ public class Constant {
                 QUESTION_TYPE.add("MMSE");
                 QUESTION_TYPE.add("MoCA");
                 QUESTION_TYPE.add("Rey");
+                QUESTION_TYPE.add("XFXPD");
             }
         }
 
@@ -130,6 +134,7 @@ public class Constant {
             public final static String MMSE = "MMSE";
             public final static String NPI = "NPI";
             public final static String REY = "Rey";
+            public final static String XFXPD = "XFXPD";
             /**报告单未完成*/
             public final static Byte COMPLETE_NO = 0;
             /**报告单已完成*/

ht/src/main/resources/application-dev.yml

@@ -8,7 +8,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
   rabbitmq:
-    host: api.ccsens.com
+    host: 127.0.0.1
     password: 111111
     port: 5672
     username: admin

ht/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: prod
-    include: common, util-prod
+    active: dev
+    include: common, util-dev

ht/src/main/resources/mapper_dao/HtPatientCanvasDao.xml

@@ -5,6 +5,7 @@
 
   <select id="getCanvasPoints" resultType="com.ccsens.ht.bean.vo.QuestionVo$Point">
     SELECT
+    id as pointId,
     points as `value`
     FROM
     t_ht_patient_canvas_line cl

ht/src/main/resources/mapper_dao/HtPatientReportDao.xml

@@ -47,7 +47,15 @@
     <select id="queryReportScore" resultMap="ScoreMap">
     select t1.code,t1.name, t1.description, t1.total_score, t1.remark,t1.type,t1.parent_code, sum(t2.score) as score
     from
-       (select code,name, description, total_score, remark, type, parent_code, sort from t_ht_report where is_show = 1 and is_del = 0) t1
+       (select code,name, description, total_score, remark, type, parent_code, sort from t_ht_report
+       where is_show = 1 and is_del = 0
+       <if test="rey == 1">
+           and `code` != 'Rey' and `code` != 'XFXPD' and parent_code != 'Rey'
+       </if>
+        <if test="rey == 2">
+            AND (`code` = 'Rey' or parent_code = 'Rey')
+        </if>
+       ) t1
        left join t_ht_patient_score t2
        on t1.code = t2.question_parent_code and
 			 (
@@ -216,6 +224,38 @@
 			and a.questionId = t.question_id
       ORDER BY a.questionId ,a.sort
     </select>
+    <select id="search" resultType="com.ccsens.ht.bean.vo.PatientReportSearchVo$Search">
+        <foreach collection="codes" item="item" separator="INTERSECT">
+            <if test="item.code != null and item.code != '' and (item.start != null or item.end != null)">
+                SELECT
+                r.id,
+                r.NAME
+                FROM
+                t_ht_patient_score s,
+                t_ht_question q,
+                t_ht_patient_report r
+                WHERE
+                s.question_id = q.id
+                AND s.patient_report_id = r.id
+                AND s.question_parent_code = #{item.code}
+                AND s.type IN ( 0, 2 )
+                AND s.is_del = 0
+                AND q.is_del = 0
+                GROUP BY
+                patient_report_id
+                HAVING
+                <trim suffixOverrides="AND">
+                    <if test="item.start != null">
+                        sum( score ) &gt;= #{item.start} AND
+                    </if>
+                    <if test="item.end != null">
+                        sum( score ) &lt;= #{item.end} AND
+                    </if>
+                </trim>
+            </if>
+        </foreach>
+
+    </select>
 
 
 </mapper>

ht/src/main/resources/mapper_dao/HtReportDao.xml

@@ -35,5 +35,36 @@
   <select id="queryReportShow" resultMap="BaseResultMap">
      select * from t_ht_report where is_show = 1 and is_del = 0 order by type,sort
   </select>
+    <select id="queryParam" resultType="com.ccsens.ht.bean.vo.PatientReportSearchVo$SearchParam">
+      SELECT
+      t.id,
+      t.code,
+      t.parent_code as parentCode,
+      t.name,
+      IF( count( q.id ) > 0, 1, 0 ) AS optionStatus
+      FROM
+      (
+      SELECT
+      t.id,
+      t.CODE,
+      t.parent_code,
+      t.NAME,
+      t.type,
+      t.sort
+      FROM
+      (
+      SELECT
+      t1.*,
+      IF ( find_in_set( parent_code, @pcodes ) > 0, @pcodes := concat( @pcodes, ',', CODE ), 0 ) AS ischild
+      FROM
+      ( SELECT id, CODE, parent_code, NAME, type, sort FROM t_ht_report WHERE is_del = 0 ) t1,
+      ( SELECT @pcodes := #{parentCode} ) t2
+      ) t
+      WHERE t.ischild != '0'
+      ) t
+      LEFT JOIN t_ht_question q ON t.CODE = q.parent_code  AND q.is_del = 0
+      GROUP BY t.CODE
+      ORDER BY t.type,t.parent_code,t.sort
+    </select>
 
 </mapper>

ht/src/main/resources/mapper_raw/HtPatientAcpMapper.xml

@@ -1,368 +1,398 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ccsens.ht.persist.mapper.HtPatientAcpMapper">
-  <resultMap id="BaseResultMap" type="com.ccsens.ht.bean.po.HtPatientAcp">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="patient_id" jdbcType="BIGINT" property="patientId" />
-    <result column="ct" jdbcType="VARCHAR" property="ct" />
-    <result column="mri" jdbcType="VARCHAR" property="mri" />
-    <result column="hcy" jdbcType="VARCHAR" property="hcy" />
-    <result column="vb12" jdbcType="VARCHAR" property="vb12" />
-    <result column="folic_acid" jdbcType="VARCHAR" property="folicAcid" />
-    <result column="tt3" jdbcType="VARCHAR" property="tt3" />
-    <result column="tt4" jdbcType="VARCHAR" property="tt4" />
-    <result column="tsh" jdbcType="VARCHAR" property="tsh" />
-    <result column="remark" jdbcType="VARCHAR" property="remark" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="is_del" jdbcType="TINYINT" property="isDel" />
-    <result column="recorder" jdbcType="BIGINT" property="recorder" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, patient_id, ct, mri, hcy, vb12, folic_acid, tt3, tt4, tsh, remark, create_time, 
-    update_time, is_del, recorder
-  </sql>
-  <select id="selectByExample" parameterType="com.ccsens.ht.bean.po.HtPatientAcpExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from t_ht_patient_acp
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from t_ht_patient_acp
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from t_ht_patient_acp
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.ccsens.ht.bean.po.HtPatientAcpExample">
-    delete from t_ht_patient_acp
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.ccsens.ht.bean.po.HtPatientAcp">
-    insert into t_ht_patient_acp (id, patient_id, ct, 
-      mri, hcy, vb12, folic_acid, 
-      tt3, tt4, tsh, remark, 
-      create_time, update_time, is_del, 
-      recorder)
-    values (#{id,jdbcType=BIGINT}, #{patientId,jdbcType=BIGINT}, #{ct,jdbcType=VARCHAR}, 
-      #{mri,jdbcType=VARCHAR}, #{hcy,jdbcType=VARCHAR}, #{vb12,jdbcType=VARCHAR}, #{folicAcid,jdbcType=VARCHAR}, 
-      #{tt3,jdbcType=VARCHAR}, #{tt4,jdbcType=VARCHAR}, #{tsh,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT}, 
-      #{recorder,jdbcType=BIGINT})
-  </insert>
-  <insert id="insertSelective" parameterType="com.ccsens.ht.bean.po.HtPatientAcp">
-    insert into t_ht_patient_acp
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="patientId != null">
-        patient_id,
-      </if>
-      <if test="ct != null">
-        ct,
-      </if>
-      <if test="mri != null">
-        mri,
-      </if>
-      <if test="hcy != null">
-        hcy,
-      </if>
-      <if test="vb12 != null">
-        vb12,
-      </if>
-      <if test="folicAcid != null">
-        folic_acid,
-      </if>
-      <if test="tt3 != null">
-        tt3,
-      </if>
-      <if test="tt4 != null">
-        tt4,
-      </if>
-      <if test="tsh != null">
-        tsh,
-      </if>
-      <if test="remark != null">
-        remark,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-      <if test="isDel != null">
-        is_del,
-      </if>
-      <if test="recorder != null">
-        recorder,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=BIGINT},
-      </if>
-      <if test="patientId != null">
-        #{patientId,jdbcType=BIGINT},
-      </if>
-      <if test="ct != null">
-        #{ct,jdbcType=VARCHAR},
-      </if>
-      <if test="mri != null">
-        #{mri,jdbcType=VARCHAR},
-      </if>
-      <if test="hcy != null">
-        #{hcy,jdbcType=VARCHAR},
-      </if>
-      <if test="vb12 != null">
-        #{vb12,jdbcType=VARCHAR},
-      </if>
-      <if test="folicAcid != null">
-        #{folicAcid,jdbcType=VARCHAR},
-      </if>
-      <if test="tt3 != null">
-        #{tt3,jdbcType=VARCHAR},
-      </if>
-      <if test="tt4 != null">
-        #{tt4,jdbcType=VARCHAR},
-      </if>
-      <if test="tsh != null">
-        #{tsh,jdbcType=VARCHAR},
-      </if>
-      <if test="remark != null">
-        #{remark,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="isDel != null">
-        #{isDel,jdbcType=TINYINT},
-      </if>
-      <if test="recorder != null">
-        #{recorder,jdbcType=BIGINT},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.ccsens.ht.bean.po.HtPatientAcpExample" resultType="java.lang.Long">
-    select count(*) from t_ht_patient_acp
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update t_ht_patient_acp
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.patientId != null">
-        patient_id = #{record.patientId,jdbcType=BIGINT},
-      </if>
-      <if test="record.ct != null">
-        ct = #{record.ct,jdbcType=VARCHAR},
-      </if>
-      <if test="record.mri != null">
-        mri = #{record.mri,jdbcType=VARCHAR},
-      </if>
-      <if test="record.hcy != null">
-        hcy = #{record.hcy,jdbcType=VARCHAR},
-      </if>
-      <if test="record.vb12 != null">
-        vb12 = #{record.vb12,jdbcType=VARCHAR},
-      </if>
-      <if test="record.folicAcid != null">
-        folic_acid = #{record.folicAcid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.tt3 != null">
-        tt3 = #{record.tt3,jdbcType=VARCHAR},
-      </if>
-      <if test="record.tt4 != null">
-        tt4 = #{record.tt4,jdbcType=VARCHAR},
-      </if>
-      <if test="record.tsh != null">
-        tsh = #{record.tsh,jdbcType=VARCHAR},
-      </if>
-      <if test="record.remark != null">
-        remark = #{record.remark,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.updateTime != null">
-        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.isDel != null">
-        is_del = #{record.isDel,jdbcType=TINYINT},
-      </if>
-      <if test="record.recorder != null">
-        recorder = #{record.recorder,jdbcType=BIGINT},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update t_ht_patient_acp
-    set id = #{record.id,jdbcType=BIGINT},
-      patient_id = #{record.patientId,jdbcType=BIGINT},
-      ct = #{record.ct,jdbcType=VARCHAR},
-      mri = #{record.mri,jdbcType=VARCHAR},
-      hcy = #{record.hcy,jdbcType=VARCHAR},
-      vb12 = #{record.vb12,jdbcType=VARCHAR},
-      folic_acid = #{record.folicAcid,jdbcType=VARCHAR},
-      tt3 = #{record.tt3,jdbcType=VARCHAR},
-      tt4 = #{record.tt4,jdbcType=VARCHAR},
-      tsh = #{record.tsh,jdbcType=VARCHAR},
-      remark = #{record.remark,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      is_del = #{record.isDel,jdbcType=TINYINT},
-      recorder = #{record.recorder,jdbcType=BIGINT}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.ht.bean.po.HtPatientAcp">
-    update t_ht_patient_acp
-    <set>
-      <if test="patientId != null">
-        patient_id = #{patientId,jdbcType=BIGINT},
-      </if>
-      <if test="ct != null">
-        ct = #{ct,jdbcType=VARCHAR},
-      </if>
-      <if test="mri != null">
-        mri = #{mri,jdbcType=VARCHAR},
-      </if>
-      <if test="hcy != null">
-        hcy = #{hcy,jdbcType=VARCHAR},
-      </if>
-      <if test="vb12 != null">
-        vb12 = #{vb12,jdbcType=VARCHAR},
-      </if>
-      <if test="folicAcid != null">
-        folic_acid = #{folicAcid,jdbcType=VARCHAR},
-      </if>
-      <if test="tt3 != null">
-        tt3 = #{tt3,jdbcType=VARCHAR},
-      </if>
-      <if test="tt4 != null">
-        tt4 = #{tt4,jdbcType=VARCHAR},
-      </if>
-      <if test="tsh != null">
-        tsh = #{tsh,jdbcType=VARCHAR},
-      </if>
-      <if test="remark != null">
-        remark = #{remark,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="isDel != null">
-        is_del = #{isDel,jdbcType=TINYINT},
-      </if>
-      <if test="recorder != null">
-        recorder = #{recorder,jdbcType=BIGINT},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.ccsens.ht.bean.po.HtPatientAcp">
-    update t_ht_patient_acp
-    set patient_id = #{patientId,jdbcType=BIGINT},
-      ct = #{ct,jdbcType=VARCHAR},
-      mri = #{mri,jdbcType=VARCHAR},
-      hcy = #{hcy,jdbcType=VARCHAR},
-      vb12 = #{vb12,jdbcType=VARCHAR},
-      folic_acid = #{folicAcid,jdbcType=VARCHAR},
-      tt3 = #{tt3,jdbcType=VARCHAR},
-      tt4 = #{tt4,jdbcType=VARCHAR},
-      tsh = #{tsh,jdbcType=VARCHAR},
-      remark = #{remark,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP},
-      is_del = #{isDel,jdbcType=TINYINT},
-      recorder = #{recorder,jdbcType=BIGINT}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ccsens.ht.persist.mapper.HtPatientAcpMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.ht.bean.po.HtPatientAcp">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="patient_id" jdbcType="BIGINT" property="patientId" />
+    <result column="ct" jdbcType="VARCHAR" property="ct" />
+    <result column="mri" jdbcType="VARCHAR" property="mri" />
+    <result column="hcy" jdbcType="VARCHAR" property="hcy" />
+    <result column="vb12" jdbcType="VARCHAR" property="vb12" />
+    <result column="folic_acid" jdbcType="VARCHAR" property="folicAcid" />
+    <result column="tt3" jdbcType="VARCHAR" property="tt3" />
+    <result column="tt4" jdbcType="VARCHAR" property="tt4" />
+    <result column="tsh" jdbcType="VARCHAR" property="tsh" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="is_del" jdbcType="TINYINT" property="isDel" />
+    <result column="recorder" jdbcType="BIGINT" property="recorder" />
+    <result column="ta1" jdbcType="VARCHAR" property="ta1" />
+    <result column="tpt" jdbcType="VARCHAR" property="tpt" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, patient_id, ct, mri, hcy, vb12, folic_acid, tt3, tt4, tsh, remark, create_time, 
+    update_time, is_del, recorder, ta1, tpt
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.ht.bean.po.HtPatientAcpExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_ht_patient_acp
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_ht_patient_acp
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_ht_patient_acp
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.ht.bean.po.HtPatientAcpExample">
+    delete from t_ht_patient_acp
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.ht.bean.po.HtPatientAcp">
+    insert into t_ht_patient_acp (id, patient_id, ct, 
+      mri, hcy, vb12, folic_acid, 
+      tt3, tt4, tsh, remark, 
+      create_time, update_time, is_del, 
+      recorder, ta1, tpt)
+    values (#{id,jdbcType=BIGINT}, #{patientId,jdbcType=BIGINT}, #{ct,jdbcType=VARCHAR}, 
+      #{mri,jdbcType=VARCHAR}, #{hcy,jdbcType=VARCHAR}, #{vb12,jdbcType=VARCHAR}, #{folicAcid,jdbcType=VARCHAR}, 
+      #{tt3,jdbcType=VARCHAR}, #{tt4,jdbcType=VARCHAR}, #{tsh,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT}, 
+      #{recorder,jdbcType=BIGINT}, #{ta1,jdbcType=VARCHAR}, #{tpt,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.ht.bean.po.HtPatientAcp">
+    insert into t_ht_patient_acp
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="patientId != null">
+        patient_id,
+      </if>
+      <if test="ct != null">
+        ct,
+      </if>
+      <if test="mri != null">
+        mri,
+      </if>
+      <if test="hcy != null">
+        hcy,
+      </if>
+      <if test="vb12 != null">
+        vb12,
+      </if>
+      <if test="folicAcid != null">
+        folic_acid,
+      </if>
+      <if test="tt3 != null">
+        tt3,
+      </if>
+      <if test="tt4 != null">
+        tt4,
+      </if>
+      <if test="tsh != null">
+        tsh,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="isDel != null">
+        is_del,
+      </if>
+      <if test="recorder != null">
+        recorder,
+      </if>
+      <if test="ta1 != null">
+        ta1,
+      </if>
+      <if test="tpt != null">
+        tpt,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="patientId != null">
+        #{patientId,jdbcType=BIGINT},
+      </if>
+      <if test="ct != null">
+        #{ct,jdbcType=VARCHAR},
+      </if>
+      <if test="mri != null">
+        #{mri,jdbcType=VARCHAR},
+      </if>
+      <if test="hcy != null">
+        #{hcy,jdbcType=VARCHAR},
+      </if>
+      <if test="vb12 != null">
+        #{vb12,jdbcType=VARCHAR},
+      </if>
+      <if test="folicAcid != null">
+        #{folicAcid,jdbcType=VARCHAR},
+      </if>
+      <if test="tt3 != null">
+        #{tt3,jdbcType=VARCHAR},
+      </if>
+      <if test="tt4 != null">
+        #{tt4,jdbcType=VARCHAR},
+      </if>
+      <if test="tsh != null">
+        #{tsh,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="isDel != null">
+        #{isDel,jdbcType=TINYINT},
+      </if>
+      <if test="recorder != null">
+        #{recorder,jdbcType=BIGINT},
+      </if>
+      <if test="ta1 != null">
+        #{ta1,jdbcType=VARCHAR},
+      </if>
+      <if test="tpt != null">
+        #{tpt,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.ht.bean.po.HtPatientAcpExample" resultType="java.lang.Long">
+    select count(*) from t_ht_patient_acp
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_ht_patient_acp
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.patientId != null">
+        patient_id = #{record.patientId,jdbcType=BIGINT},
+      </if>
+      <if test="record.ct != null">
+        ct = #{record.ct,jdbcType=VARCHAR},
+      </if>
+      <if test="record.mri != null">
+        mri = #{record.mri,jdbcType=VARCHAR},
+      </if>
+      <if test="record.hcy != null">
+        hcy = #{record.hcy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.vb12 != null">
+        vb12 = #{record.vb12,jdbcType=VARCHAR},
+      </if>
+      <if test="record.folicAcid != null">
+        folic_acid = #{record.folicAcid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.tt3 != null">
+        tt3 = #{record.tt3,jdbcType=VARCHAR},
+      </if>
+      <if test="record.tt4 != null">
+        tt4 = #{record.tt4,jdbcType=VARCHAR},
+      </if>
+      <if test="record.tsh != null">
+        tsh = #{record.tsh,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.isDel != null">
+        is_del = #{record.isDel,jdbcType=TINYINT},
+      </if>
+      <if test="record.recorder != null">
+        recorder = #{record.recorder,jdbcType=BIGINT},
+      </if>
+      <if test="record.ta1 != null">
+        ta1 = #{record.ta1,jdbcType=VARCHAR},
+      </if>
+      <if test="record.tpt != null">
+        tpt = #{record.tpt,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_ht_patient_acp
+    set id = #{record.id,jdbcType=BIGINT},
+      patient_id = #{record.patientId,jdbcType=BIGINT},
+      ct = #{record.ct,jdbcType=VARCHAR},
+      mri = #{record.mri,jdbcType=VARCHAR},
+      hcy = #{record.hcy,jdbcType=VARCHAR},
+      vb12 = #{record.vb12,jdbcType=VARCHAR},
+      folic_acid = #{record.folicAcid,jdbcType=VARCHAR},
+      tt3 = #{record.tt3,jdbcType=VARCHAR},
+      tt4 = #{record.tt4,jdbcType=VARCHAR},
+      tsh = #{record.tsh,jdbcType=VARCHAR},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      is_del = #{record.isDel,jdbcType=TINYINT},
+      recorder = #{record.recorder,jdbcType=BIGINT},
+      ta1 = #{record.ta1,jdbcType=VARCHAR},
+      tpt = #{record.tpt,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.ht.bean.po.HtPatientAcp">
+    update t_ht_patient_acp
+    <set>
+      <if test="patientId != null">
+        patient_id = #{patientId,jdbcType=BIGINT},
+      </if>
+      <if test="ct != null">
+        ct = #{ct,jdbcType=VARCHAR},
+      </if>
+      <if test="mri != null">
+        mri = #{mri,jdbcType=VARCHAR},
+      </if>
+      <if test="hcy != null">
+        hcy = #{hcy,jdbcType=VARCHAR},
+      </if>
+      <if test="vb12 != null">
+        vb12 = #{vb12,jdbcType=VARCHAR},
+      </if>
+      <if test="folicAcid != null">
+        folic_acid = #{folicAcid,jdbcType=VARCHAR},
+      </if>
+      <if test="tt3 != null">
+        tt3 = #{tt3,jdbcType=VARCHAR},
+      </if>
+      <if test="tt4 != null">
+        tt4 = #{tt4,jdbcType=VARCHAR},
+      </if>
+      <if test="tsh != null">
+        tsh = #{tsh,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="isDel != null">
+        is_del = #{isDel,jdbcType=TINYINT},
+      </if>
+      <if test="recorder != null">
+        recorder = #{recorder,jdbcType=BIGINT},
+      </if>
+      <if test="ta1 != null">
+        ta1 = #{ta1,jdbcType=VARCHAR},
+      </if>
+      <if test="tpt != null">
+        tpt = #{tpt,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.ht.bean.po.HtPatientAcp">
+    update t_ht_patient_acp
+    set patient_id = #{patientId,jdbcType=BIGINT},
+      ct = #{ct,jdbcType=VARCHAR},
+      mri = #{mri,jdbcType=VARCHAR},
+      hcy = #{hcy,jdbcType=VARCHAR},
+      vb12 = #{vb12,jdbcType=VARCHAR},
+      folic_acid = #{folicAcid,jdbcType=VARCHAR},
+      tt3 = #{tt3,jdbcType=VARCHAR},
+      tt4 = #{tt4,jdbcType=VARCHAR},
+      tsh = #{tsh,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      is_del = #{isDel,jdbcType=TINYINT},
+      recorder = #{recorder,jdbcType=BIGINT},
+      ta1 = #{ta1,jdbcType=VARCHAR},
+      tpt = #{tpt,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
 </mapper>

ht/src/main/resources/mapper_raw/HtPatientScoreMapper.xml

@@ -1,370 +1,370 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ccsens.ht.persist.mapper.HtPatientScoreMapper">
-  <resultMap id="BaseResultMap" type="com.ccsens.ht.bean.po.HtPatientScore">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="patient_report_id" jdbcType="BIGINT" property="patientReportId" />
-    <result column="patient_id" jdbcType="BIGINT" property="patientId" />
-    <result column="question_parent_code" jdbcType="VARCHAR" property="questionParentCode" />
-    <result column="question_id" jdbcType="BIGINT" property="questionId" />
-    <result column="option_id" jdbcType="BIGINT" property="optionId" />
-    <result column="option_name" jdbcType="VARCHAR" property="optionName" />
-    <result column="score" jdbcType="INTEGER" property="score" />
-    <result column="type" jdbcType="TINYINT" property="type" />
-    <result column="answer" jdbcType="VARCHAR" property="answer" />
-    <result column="remark" jdbcType="VARCHAR" property="remark" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="is_del" jdbcType="TINYINT" property="isDel" />
-    <result column="answer_time" jdbcType="BIGINT" property="answerTime" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, patient_report_id, patient_id, question_parent_code, question_id, option_id, 
-    option_name, score, type, answer, remark, create_time, update_time, is_del, answer_time
-  </sql>
-  <select id="selectByExample" parameterType="com.ccsens.ht.bean.po.HtPatientScoreExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from t_ht_patient_score
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from t_ht_patient_score
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from t_ht_patient_score
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.ccsens.ht.bean.po.HtPatientScoreExample">
-    delete from t_ht_patient_score
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.ccsens.ht.bean.po.HtPatientScore">
-    insert into t_ht_patient_score (id, patient_report_id, patient_id, 
-      question_parent_code, question_id, option_id, 
-      option_name, score, type, 
-      answer, remark, create_time, 
-      update_time, is_del, answer_time
-      )
-    values (#{id,jdbcType=BIGINT}, #{patientReportId,jdbcType=BIGINT}, #{patientId,jdbcType=BIGINT}, 
-      #{questionParentCode,jdbcType=VARCHAR}, #{questionId,jdbcType=BIGINT}, #{optionId,jdbcType=BIGINT}, 
-      #{optionName,jdbcType=VARCHAR}, #{score,jdbcType=INTEGER}, #{type,jdbcType=TINYINT}, 
-      #{answer,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT}, #{answerTime,jdbcType=BIGINT}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.ccsens.ht.bean.po.HtPatientScore">
-    insert into t_ht_patient_score
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="patientReportId != null">
-        patient_report_id,
-      </if>
-      <if test="patientId != null">
-        patient_id,
-      </if>
-      <if test="questionParentCode != null">
-        question_parent_code,
-      </if>
-      <if test="questionId != null">
-        question_id,
-      </if>
-      <if test="optionId != null">
-        option_id,
-      </if>
-      <if test="optionName != null">
-        option_name,
-      </if>
-      <if test="score != null">
-        score,
-      </if>
-      <if test="type != null">
-        type,
-      </if>
-      <if test="answer != null">
-        answer,
-      </if>
-      <if test="remark != null">
-        remark,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-      <if test="isDel != null">
-        is_del,
-      </if>
-      <if test="answerTime != null">
-        answer_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=BIGINT},
-      </if>
-      <if test="patientReportId != null">
-        #{patientReportId,jdbcType=BIGINT},
-      </if>
-      <if test="patientId != null">
-        #{patientId,jdbcType=BIGINT},
-      </if>
-      <if test="questionParentCode != null">
-        #{questionParentCode,jdbcType=VARCHAR},
-      </if>
-      <if test="questionId != null">
-        #{questionId,jdbcType=BIGINT},
-      </if>
-      <if test="optionId != null">
-        #{optionId,jdbcType=BIGINT},
-      </if>
-      <if test="optionName != null">
-        #{optionName,jdbcType=VARCHAR},
-      </if>
-      <if test="score != null">
-        #{score,jdbcType=INTEGER},
-      </if>
-      <if test="type != null">
-        #{type,jdbcType=TINYINT},
-      </if>
-      <if test="answer != null">
-        #{answer,jdbcType=VARCHAR},
-      </if>
-      <if test="remark != null">
-        #{remark,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="isDel != null">
-        #{isDel,jdbcType=TINYINT},
-      </if>
-      <if test="answerTime != null">
-        #{answerTime,jdbcType=BIGINT},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.ccsens.ht.bean.po.HtPatientScoreExample" resultType="java.lang.Long">
-    select count(*) from t_ht_patient_score
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update t_ht_patient_score
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.patientReportId != null">
-        patient_report_id = #{record.patientReportId,jdbcType=BIGINT},
-      </if>
-      <if test="record.patientId != null">
-        patient_id = #{record.patientId,jdbcType=BIGINT},
-      </if>
-      <if test="record.questionParentCode != null">
-        question_parent_code = #{record.questionParentCode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.questionId != null">
-        question_id = #{record.questionId,jdbcType=BIGINT},
-      </if>
-      <if test="record.optionId != null">
-        option_id = #{record.optionId,jdbcType=BIGINT},
-      </if>
-      <if test="record.optionName != null">
-        option_name = #{record.optionName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.score != null">
-        score = #{record.score,jdbcType=INTEGER},
-      </if>
-      <if test="record.type != null">
-        type = #{record.type,jdbcType=TINYINT},
-      </if>
-      <if test="record.answer != null">
-        answer = #{record.answer,jdbcType=VARCHAR},
-      </if>
-      <if test="record.remark != null">
-        remark = #{record.remark,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.updateTime != null">
-        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.isDel != null">
-        is_del = #{record.isDel,jdbcType=TINYINT},
-      </if>
-      <if test="record.answerTime != null">
-        answer_time = #{record.answerTime,jdbcType=BIGINT},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update t_ht_patient_score
-    set id = #{record.id,jdbcType=BIGINT},
-      patient_report_id = #{record.patientReportId,jdbcType=BIGINT},
-      patient_id = #{record.patientId,jdbcType=BIGINT},
-      question_parent_code = #{record.questionParentCode,jdbcType=VARCHAR},
-      question_id = #{record.questionId,jdbcType=BIGINT},
-      option_id = #{record.optionId,jdbcType=BIGINT},
-      option_name = #{record.optionName,jdbcType=VARCHAR},
-      score = #{record.score,jdbcType=INTEGER},
-      type = #{record.type,jdbcType=TINYINT},
-      answer = #{record.answer,jdbcType=VARCHAR},
-      remark = #{record.remark,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      is_del = #{record.isDel,jdbcType=TINYINT},
-      answer_time = #{record.answerTime,jdbcType=BIGINT}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.ht.bean.po.HtPatientScore">
-    update t_ht_patient_score
-    <set>
-      <if test="patientReportId != null">
-        patient_report_id = #{patientReportId,jdbcType=BIGINT},
-      </if>
-      <if test="patientId != null">
-        patient_id = #{patientId,jdbcType=BIGINT},
-      </if>
-      <if test="questionParentCode != null">
-        question_parent_code = #{questionParentCode,jdbcType=VARCHAR},
-      </if>
-      <if test="questionId != null">
-        question_id = #{questionId,jdbcType=BIGINT},
-      </if>
-      <if test="optionId != null">
-        option_id = #{optionId,jdbcType=BIGINT},
-      </if>
-      <if test="optionName != null">
-        option_name = #{optionName,jdbcType=VARCHAR},
-      </if>
-      <if test="score != null">
-        score = #{score,jdbcType=INTEGER},
-      </if>
-      <if test="type != null">
-        type = #{type,jdbcType=TINYINT},
-      </if>
-      <if test="answer != null">
-        answer = #{answer,jdbcType=VARCHAR},
-      </if>
-      <if test="remark != null">
-        remark = #{remark,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="isDel != null">
-        is_del = #{isDel,jdbcType=TINYINT},
-      </if>
-      <if test="answerTime != null">
-        answer_time = #{answerTime,jdbcType=BIGINT},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.ccsens.ht.bean.po.HtPatientScore">
-    update t_ht_patient_score
-    set patient_report_id = #{patientReportId,jdbcType=BIGINT},
-      patient_id = #{patientId,jdbcType=BIGINT},
-      question_parent_code = #{questionParentCode,jdbcType=VARCHAR},
-      question_id = #{questionId,jdbcType=BIGINT},
-      option_id = #{optionId,jdbcType=BIGINT},
-      option_name = #{optionName,jdbcType=VARCHAR},
-      score = #{score,jdbcType=INTEGER},
-      type = #{type,jdbcType=TINYINT},
-      answer = #{answer,jdbcType=VARCHAR},
-      remark = #{remark,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP},
-      is_del = #{isDel,jdbcType=TINYINT},
-      answer_time = #{answerTime,jdbcType=BIGINT}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ccsens.ht.persist.mapper.HtPatientScoreMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.ht.bean.po.HtPatientScore">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="patient_report_id" jdbcType="BIGINT" property="patientReportId" />
+    <result column="patient_id" jdbcType="BIGINT" property="patientId" />
+    <result column="question_parent_code" jdbcType="VARCHAR" property="questionParentCode" />
+    <result column="question_id" jdbcType="BIGINT" property="questionId" />
+    <result column="option_id" jdbcType="BIGINT" property="optionId" />
+    <result column="option_name" jdbcType="VARCHAR" property="optionName" />
+    <result column="score" jdbcType="DECIMAL" property="score" />
+    <result column="type" jdbcType="TINYINT" property="type" />
+    <result column="answer" jdbcType="VARCHAR" property="answer" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="is_del" jdbcType="TINYINT" property="isDel" />
+    <result column="answer_time" jdbcType="BIGINT" property="answerTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, patient_report_id, patient_id, question_parent_code, question_id, option_id, 
+    option_name, score, type, answer, remark, create_time, update_time, is_del, answer_time
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.ht.bean.po.HtPatientScoreExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_ht_patient_score
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_ht_patient_score
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_ht_patient_score
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.ht.bean.po.HtPatientScoreExample">
+    delete from t_ht_patient_score
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.ht.bean.po.HtPatientScore">
+    insert into t_ht_patient_score (id, patient_report_id, patient_id, 
+      question_parent_code, question_id, option_id, 
+      option_name, score, type, 
+      answer, remark, create_time, 
+      update_time, is_del, answer_time
+      )
+    values (#{id,jdbcType=BIGINT}, #{patientReportId,jdbcType=BIGINT}, #{patientId,jdbcType=BIGINT}, 
+      #{questionParentCode,jdbcType=VARCHAR}, #{questionId,jdbcType=BIGINT}, #{optionId,jdbcType=BIGINT}, 
+      #{optionName,jdbcType=VARCHAR}, #{score,jdbcType=DECIMAL}, #{type,jdbcType=TINYINT}, 
+      #{answer,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT}, #{answerTime,jdbcType=BIGINT}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.ht.bean.po.HtPatientScore">
+    insert into t_ht_patient_score
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="patientReportId != null">
+        patient_report_id,
+      </if>
+      <if test="patientId != null">
+        patient_id,
+      </if>
+      <if test="questionParentCode != null">
+        question_parent_code,
+      </if>
+      <if test="questionId != null">
+        question_id,
+      </if>
+      <if test="optionId != null">
+        option_id,
+      </if>
+      <if test="optionName != null">
+        option_name,
+      </if>
+      <if test="score != null">
+        score,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+      <if test="answer != null">
+        answer,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="isDel != null">
+        is_del,
+      </if>
+      <if test="answerTime != null">
+        answer_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="patientReportId != null">
+        #{patientReportId,jdbcType=BIGINT},
+      </if>
+      <if test="patientId != null">
+        #{patientId,jdbcType=BIGINT},
+      </if>
+      <if test="questionParentCode != null">
+        #{questionParentCode,jdbcType=VARCHAR},
+      </if>
+      <if test="questionId != null">
+        #{questionId,jdbcType=BIGINT},
+      </if>
+      <if test="optionId != null">
+        #{optionId,jdbcType=BIGINT},
+      </if>
+      <if test="optionName != null">
+        #{optionName,jdbcType=VARCHAR},
+      </if>
+      <if test="score != null">
+        #{score,jdbcType=DECIMAL},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=TINYINT},
+      </if>
+      <if test="answer != null">
+        #{answer,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="isDel != null">
+        #{isDel,jdbcType=TINYINT},
+      </if>
+      <if test="answerTime != null">
+        #{answerTime,jdbcType=BIGINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.ht.bean.po.HtPatientScoreExample" resultType="java.lang.Long">
+    select count(*) from t_ht_patient_score
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_ht_patient_score
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.patientReportId != null">
+        patient_report_id = #{record.patientReportId,jdbcType=BIGINT},
+      </if>
+      <if test="record.patientId != null">
+        patient_id = #{record.patientId,jdbcType=BIGINT},
+      </if>
+      <if test="record.questionParentCode != null">
+        question_parent_code = #{record.questionParentCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.questionId != null">
+        question_id = #{record.questionId,jdbcType=BIGINT},
+      </if>
+      <if test="record.optionId != null">
+        option_id = #{record.optionId,jdbcType=BIGINT},
+      </if>
+      <if test="record.optionName != null">
+        option_name = #{record.optionName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.score != null">
+        score = #{record.score,jdbcType=DECIMAL},
+      </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=TINYINT},
+      </if>
+      <if test="record.answer != null">
+        answer = #{record.answer,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.isDel != null">
+        is_del = #{record.isDel,jdbcType=TINYINT},
+      </if>
+      <if test="record.answerTime != null">
+        answer_time = #{record.answerTime,jdbcType=BIGINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_ht_patient_score
+    set id = #{record.id,jdbcType=BIGINT},
+      patient_report_id = #{record.patientReportId,jdbcType=BIGINT},
+      patient_id = #{record.patientId,jdbcType=BIGINT},
+      question_parent_code = #{record.questionParentCode,jdbcType=VARCHAR},
+      question_id = #{record.questionId,jdbcType=BIGINT},
+      option_id = #{record.optionId,jdbcType=BIGINT},
+      option_name = #{record.optionName,jdbcType=VARCHAR},
+      score = #{record.score,jdbcType=DECIMAL},
+      type = #{record.type,jdbcType=TINYINT},
+      answer = #{record.answer,jdbcType=VARCHAR},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      is_del = #{record.isDel,jdbcType=TINYINT},
+      answer_time = #{record.answerTime,jdbcType=BIGINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.ht.bean.po.HtPatientScore">
+    update t_ht_patient_score
+    <set>
+      <if test="patientReportId != null">
+        patient_report_id = #{patientReportId,jdbcType=BIGINT},
+      </if>
+      <if test="patientId != null">
+        patient_id = #{patientId,jdbcType=BIGINT},
+      </if>
+      <if test="questionParentCode != null">
+        question_parent_code = #{questionParentCode,jdbcType=VARCHAR},
+      </if>
+      <if test="questionId != null">
+        question_id = #{questionId,jdbcType=BIGINT},
+      </if>
+      <if test="optionId != null">
+        option_id = #{optionId,jdbcType=BIGINT},
+      </if>
+      <if test="optionName != null">
+        option_name = #{optionName,jdbcType=VARCHAR},
+      </if>
+      <if test="score != null">
+        score = #{score,jdbcType=DECIMAL},
+      </if>
+      <if test="type != null">
+        type = #{type,jdbcType=TINYINT},
+      </if>
+      <if test="answer != null">
+        answer = #{answer,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="isDel != null">
+        is_del = #{isDel,jdbcType=TINYINT},
+      </if>
+      <if test="answerTime != null">
+        answer_time = #{answerTime,jdbcType=BIGINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.ht.bean.po.HtPatientScore">
+    update t_ht_patient_score
+    set patient_report_id = #{patientReportId,jdbcType=BIGINT},
+      patient_id = #{patientId,jdbcType=BIGINT},
+      question_parent_code = #{questionParentCode,jdbcType=VARCHAR},
+      question_id = #{questionId,jdbcType=BIGINT},
+      option_id = #{optionId,jdbcType=BIGINT},
+      option_name = #{optionName,jdbcType=VARCHAR},
+      score = #{score,jdbcType=DECIMAL},
+      type = #{type,jdbcType=TINYINT},
+      answer = #{answer,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      is_del = #{isDel,jdbcType=TINYINT},
+      answer_time = #{answerTime,jdbcType=BIGINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
 </mapper>

ht/src/main/resources/mapper_raw/HtQuestionOptionMapper.xml

@@ -1,306 +1,306 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ccsens.ht.persist.mapper.HtQuestionOptionMapper">
-  <resultMap id="BaseResultMap" type="com.ccsens.ht.bean.po.HtQuestionOption">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="question_id" jdbcType="BIGINT" property="questionId" />
-    <result column="sort" jdbcType="INTEGER" property="sort" />
-    <result column="type" jdbcType="VARCHAR" property="type" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="score" jdbcType="INTEGER" property="score" />
-    <result column="display" jdbcType="VARCHAR" property="display" />
-    <result column="remark" jdbcType="VARCHAR" property="remark" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="is_del" jdbcType="TINYINT" property="isDel" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, question_id, sort, type, name, score, display, remark, create_time, update_time, 
-    is_del
-  </sql>
-  <select id="selectByExample" parameterType="com.ccsens.ht.bean.po.HtQuestionOptionExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from t_ht_question_option
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from t_ht_question_option
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from t_ht_question_option
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.ccsens.ht.bean.po.HtQuestionOptionExample">
-    delete from t_ht_question_option
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.ccsens.ht.bean.po.HtQuestionOption">
-    insert into t_ht_question_option (id, question_id, sort, 
-      type, name, score, 
-      display, remark, create_time, 
-      update_time, is_del)
-    values (#{id,jdbcType=BIGINT}, #{questionId,jdbcType=BIGINT}, #{sort,jdbcType=INTEGER}, 
-      #{type,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{score,jdbcType=INTEGER}, 
-      #{display,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT})
-  </insert>
-  <insert id="insertSelective" parameterType="com.ccsens.ht.bean.po.HtQuestionOption">
-    insert into t_ht_question_option
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="questionId != null">
-        question_id,
-      </if>
-      <if test="sort != null">
-        sort,
-      </if>
-      <if test="type != null">
-        type,
-      </if>
-      <if test="name != null">
-        name,
-      </if>
-      <if test="score != null">
-        score,
-      </if>
-      <if test="display != null">
-        display,
-      </if>
-      <if test="remark != null">
-        remark,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-      <if test="isDel != null">
-        is_del,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=BIGINT},
-      </if>
-      <if test="questionId != null">
-        #{questionId,jdbcType=BIGINT},
-      </if>
-      <if test="sort != null">
-        #{sort,jdbcType=INTEGER},
-      </if>
-      <if test="type != null">
-        #{type,jdbcType=VARCHAR},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="score != null">
-        #{score,jdbcType=INTEGER},
-      </if>
-      <if test="display != null">
-        #{display,jdbcType=VARCHAR},
-      </if>
-      <if test="remark != null">
-        #{remark,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="isDel != null">
-        #{isDel,jdbcType=TINYINT},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.ccsens.ht.bean.po.HtQuestionOptionExample" resultType="java.lang.Long">
-    select count(*) from t_ht_question_option
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update t_ht_question_option
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.questionId != null">
-        question_id = #{record.questionId,jdbcType=BIGINT},
-      </if>
-      <if test="record.sort != null">
-        sort = #{record.sort,jdbcType=INTEGER},
-      </if>
-      <if test="record.type != null">
-        type = #{record.type,jdbcType=VARCHAR},
-      </if>
-      <if test="record.name != null">
-        name = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.score != null">
-        score = #{record.score,jdbcType=INTEGER},
-      </if>
-      <if test="record.display != null">
-        display = #{record.display,jdbcType=VARCHAR},
-      </if>
-      <if test="record.remark != null">
-        remark = #{record.remark,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.updateTime != null">
-        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.isDel != null">
-        is_del = #{record.isDel,jdbcType=TINYINT},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update t_ht_question_option
-    set id = #{record.id,jdbcType=BIGINT},
-      question_id = #{record.questionId,jdbcType=BIGINT},
-      sort = #{record.sort,jdbcType=INTEGER},
-      type = #{record.type,jdbcType=VARCHAR},
-      name = #{record.name,jdbcType=VARCHAR},
-      score = #{record.score,jdbcType=INTEGER},
-      display = #{record.display,jdbcType=VARCHAR},
-      remark = #{record.remark,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      is_del = #{record.isDel,jdbcType=TINYINT}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.ht.bean.po.HtQuestionOption">
-    update t_ht_question_option
-    <set>
-      <if test="questionId != null">
-        question_id = #{questionId,jdbcType=BIGINT},
-      </if>
-      <if test="sort != null">
-        sort = #{sort,jdbcType=INTEGER},
-      </if>
-      <if test="type != null">
-        type = #{type,jdbcType=VARCHAR},
-      </if>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="score != null">
-        score = #{score,jdbcType=INTEGER},
-      </if>
-      <if test="display != null">
-        display = #{display,jdbcType=VARCHAR},
-      </if>
-      <if test="remark != null">
-        remark = #{remark,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="isDel != null">
-        is_del = #{isDel,jdbcType=TINYINT},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.ccsens.ht.bean.po.HtQuestionOption">
-    update t_ht_question_option
-    set question_id = #{questionId,jdbcType=BIGINT},
-      sort = #{sort,jdbcType=INTEGER},
-      type = #{type,jdbcType=VARCHAR},
-      name = #{name,jdbcType=VARCHAR},
-      score = #{score,jdbcType=INTEGER},
-      display = #{display,jdbcType=VARCHAR},
-      remark = #{remark,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP},
-      is_del = #{isDel,jdbcType=TINYINT}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ccsens.ht.persist.mapper.HtQuestionOptionMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.ht.bean.po.HtQuestionOption">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="question_id" jdbcType="BIGINT" property="questionId" />
+    <result column="sort" jdbcType="INTEGER" property="sort" />
+    <result column="type" jdbcType="VARCHAR" property="type" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="score" jdbcType="DECIMAL" property="score" />
+    <result column="display" jdbcType="VARCHAR" property="display" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="is_del" jdbcType="TINYINT" property="isDel" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, question_id, sort, type, name, score, display, remark, create_time, update_time, 
+    is_del
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.ht.bean.po.HtQuestionOptionExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_ht_question_option
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_ht_question_option
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_ht_question_option
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.ht.bean.po.HtQuestionOptionExample">
+    delete from t_ht_question_option
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.ht.bean.po.HtQuestionOption">
+    insert into t_ht_question_option (id, question_id, sort, 
+      type, name, score, 
+      display, remark, create_time, 
+      update_time, is_del)
+    values (#{id,jdbcType=BIGINT}, #{questionId,jdbcType=BIGINT}, #{sort,jdbcType=INTEGER}, 
+      #{type,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{score,jdbcType=DECIMAL}, 
+      #{display,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.ht.bean.po.HtQuestionOption">
+    insert into t_ht_question_option
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="questionId != null">
+        question_id,
+      </if>
+      <if test="sort != null">
+        sort,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="score != null">
+        score,
+      </if>
+      <if test="display != null">
+        display,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="isDel != null">
+        is_del,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="questionId != null">
+        #{questionId,jdbcType=BIGINT},
+      </if>
+      <if test="sort != null">
+        #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="score != null">
+        #{score,jdbcType=DECIMAL},
+      </if>
+      <if test="display != null">
+        #{display,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="isDel != null">
+        #{isDel,jdbcType=TINYINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.ht.bean.po.HtQuestionOptionExample" resultType="java.lang.Long">
+    select count(*) from t_ht_question_option
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_ht_question_option
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.questionId != null">
+        question_id = #{record.questionId,jdbcType=BIGINT},
+      </if>
+      <if test="record.sort != null">
+        sort = #{record.sort,jdbcType=INTEGER},
+      </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.score != null">
+        score = #{record.score,jdbcType=DECIMAL},
+      </if>
+      <if test="record.display != null">
+        display = #{record.display,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.isDel != null">
+        is_del = #{record.isDel,jdbcType=TINYINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_ht_question_option
+    set id = #{record.id,jdbcType=BIGINT},
+      question_id = #{record.questionId,jdbcType=BIGINT},
+      sort = #{record.sort,jdbcType=INTEGER},
+      type = #{record.type,jdbcType=VARCHAR},
+      name = #{record.name,jdbcType=VARCHAR},
+      score = #{record.score,jdbcType=DECIMAL},
+      display = #{record.display,jdbcType=VARCHAR},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      is_del = #{record.isDel,jdbcType=TINYINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.ht.bean.po.HtQuestionOption">
+    update t_ht_question_option
+    <set>
+      <if test="questionId != null">
+        question_id = #{questionId,jdbcType=BIGINT},
+      </if>
+      <if test="sort != null">
+        sort = #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="type != null">
+        type = #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="score != null">
+        score = #{score,jdbcType=DECIMAL},
+      </if>
+      <if test="display != null">
+        display = #{display,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="isDel != null">
+        is_del = #{isDel,jdbcType=TINYINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.ht.bean.po.HtQuestionOption">
+    update t_ht_question_option
+    set question_id = #{questionId,jdbcType=BIGINT},
+      sort = #{sort,jdbcType=INTEGER},
+      type = #{type,jdbcType=VARCHAR},
+      name = #{name,jdbcType=VARCHAR},
+      score = #{score,jdbcType=DECIMAL},
+      display = #{display,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      is_del = #{isDel,jdbcType=TINYINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
 </mapper>

pom.xml

@@ -14,6 +14,7 @@
 <!--        <module>mt</module>-->
         <module>health</module>
 <!--        <module>ct</module>-->
+        <module>question</module>
     </modules>
 
     <groupId>com.ccsens</groupId>

question/pom.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ccsenscloud</artifactId>
+        <groupId>com.ccsens</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>question</artifactId>
+    <dependencies>
+        <!--cloud 工具类-->
+        <dependency>
+            <artifactId>cloudutil</artifactId>
+            <groupId>com.ccsens</groupId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <!--util 工具类-->
+        <dependency>
+            <artifactId>util</artifactId>
+            <groupId>com.ccsens</groupId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.mybatis.generator</groupId>
+                <artifactId>mybatis-generator-maven-plugin</artifactId>
+                <version>1.3.7</version>
+                <configuration>
+                    <configurationFile>${basedir}/src/main/resources/mbg.xml</configurationFile>
+                    <overwrite>true</overwrite>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>mysql</groupId>
+                        <artifactId>mysql-connector-java</artifactId>
+                        <version>5.1.34</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.ccsens.question.QuestionApplication</mainClass>
+                    <!--<skip>true</skip>-->
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+
+</project>

question/src/main/java/com/ccsens/question/QuestionApplication.java

@@ -0,0 +1,25 @@
+package com.ccsens.question;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+
+@MapperScan(basePackages = {"com.ccsens.question.persist.*"})
+@ServletComponentScan
+@EnableAsync
+//开启断路器功能
+@EnableCircuitBreaker
+@EnableFeignClients(basePackages = "com.ccsens.cloudutil.feign")
+@SpringBootApplication(scanBasePackages = "com.ccsens")
+public class QuestionApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(QuestionApplication.class, args);
+    }
+
+}

question/src/main/java/com/ccsens/question/annotation/DoctorAudit.java

@@ -0,0 +1,14 @@
+package com.ccsens.question.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 医生是否审核通过
+ * @author: wuHuiJuan
+ * @create: 2019/11/21 10:47
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface DoctorAudit {
+}

question/src/main/java/com/ccsens/question/api/DoctorController.java

@@ -0,0 +1,132 @@
+package com.ccsens.question.api;
+
+
+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.question.annotation.DoctorAudit;
+import com.ccsens.question.bean.dto.DoctorDto;
+import com.ccsens.question.bean.vo.DoctorVo;
+import com.ccsens.question.bean.vo.PatientReportVo;
+import com.ccsens.question.service.IDoctorService;
+import com.ccsens.util.CodeEnum;
+import com.ccsens.util.JsonResponse;
+import com.ccsens.util.bean.dto.QueryDto;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @program: ptpro
+ * @description:
+ * @author: wu huijuan
+ * @create: 2019/10/24 17:03
+ */
+@Slf4j
+@Api(tags = "资格认证/审核",value = "医生进行资格认证和资格审核")
+@RestController
+public class DoctorController {
+
+    @Autowired
+    private IDoctorService doctorService;
+
+
+
+
+    @MustLogin
+    @ApiOperation(value = "资格认证",notes = "医生提交基本信息进行资格认证")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "医生基本信息", required = true)
+    })
+    @RequestMapping(value = "/doctorSubmit", method = RequestMethod.POST)
+    public JsonResponse doctorSubmit(@RequestBody @ApiParam @Valid QueryDto<DoctorDto.Submit> params) {
+        log.info("资格认证参数：{}", params);
+        DoctorDto.Submit submit = params.getParam();
+        return  doctorService.doctorSubmit(submit, params.getUserId());
+    }
+
+
+    @MustLogin
+    @DoctorAudit
+    @ApiOperation(value = "资格认证列表",notes = "医生资格认证列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "医生查询条件", required = true)
+    })
+    @RequestMapping(value = "/queryDoctors", method = RequestMethod.POST)
+    public JsonResponse<PageInfo<DoctorVo.Query>> queryDoctors(@RequestBody @ApiParam @Valid QueryDto<DoctorDto.Query> params) {
+        log.info("资格认证列表：{}", params);
+        PageInfo<DoctorVo.Query> dtos = doctorService.queryDoctors(params.getParam(), params.getUserId());
+        return  JsonResponse.newInstance().ok(CodeEnum.SUCCESS, dtos);
+    }
+
+    @MustLogin
+    @DoctorAudit
+    @ApiOperation(value = "资格审核",notes = "医生资格审核 通过/拒绝")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "医生基本信息", required = true)
+    })
+    @RequestMapping(value = "/doctorAudit", method = RequestMethod.POST)
+    public JsonResponse doctorAudit(@RequestBody @ApiParam @Valid QueryDto<DoctorDto.Audit> params) throws Exception {
+
+        log.info("资格审核：{}", params);
+        DoctorDto.Audit audit = params.getParam();
+        CodeEnum codeEnum = doctorService.doctorAudit(audit, params.getUserId());
+        log.info("审核结果：{}", codeEnum);
+        return JsonResponse.newInstance().ok(codeEnum);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "查询医生资格审核状态",notes = "查询医生资格审核状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "医生查询条件", required = true)
+    })
+    @RequestMapping(value = "/queryDoctorStatus", method = RequestMethod.POST)
+    public JsonResponse<DoctorVo.Query> queryDoctorStatus(@RequestBody @ApiParam QueryDto params) {
+        log.info("资格认证列表：{}", params);
+        DoctorVo.Query dtos = doctorService.queryDoctorStatus(params.getUserId());
+        if (dtos == null) {
+            return JsonResponse.newInstance().ok(CodeEnum.DOCTOR_NOT_SUBMIT);
+        }
+        return  JsonResponse.newInstance().ok(dtos);
+    }
+
+    @MustLogin
+    @DoctorAudit
+    @ApiOperation(value = "分享编辑病友信息",notes = "分享编辑病友信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "分享编辑病友信息", required = true)
+    })
+    @RequestMapping(value="/patientFillShare", method = RequestMethod.POST)
+    public JsonResponse<PatientReportVo.Export> patientFillShare(@RequestBody @ApiParam @Valid QueryDto params) throws Exception {
+        log.info("查询其他信息请求参数：{}", params);
+        Long userId = params.getUserId();
+        String path = doctorService.getShareUrl(userId);
+        PatientReportVo.Export export = new PatientReportVo.Export();
+        export.setPath(path);
+        log.info("{}分享路径:{}", userId, export);
+        return JsonResponse.newInstance().ok(export);
+    }
+
+
+
+    @MustLogin
+    @DoctorAudit
+    @ApiOperation(value = "查询下属医生信息",notes = "查询下属医生信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "查询下属医生信息", required = true)
+    })
+    @RequestMapping(value="/querySubordinate", method = RequestMethod.POST)
+    public JsonResponse<List<DoctorVo.Subordinate>> queryAllSubordinate(@RequestBody @ApiParam @Valid QueryDto params) {
+        log.info("查询下属信息请求参数：{}", params);
+        Long userId = params.getUserId();
+        List<DoctorVo.Subordinate> subordinates = doctorService.queryAllSubordinate(userId);
+        log.info("{}查询下属返回结果:{}", userId, subordinates);
+        return JsonResponse.newInstance().ok(subordinates);
+    }
+}

question/src/main/java/com/ccsens/question/api/FileController.java

@@ -0,0 +1,41 @@
+package com.ccsens.question.api;
+
+import cn.hutool.core.date.DateUtil;
+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.question.bean.dto.FileDto;
+import com.ccsens.question.bean.vo.FileVo;
+import com.ccsens.util.Base64FileUtil;
+import com.ccsens.util.JsonResponse;
+import com.ccsens.util.PropUtil;
+import com.ccsens.util.bean.dto.QueryDto;
+import io.swagger.annotations.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ * @description:
+ * @author: wuHuiJuan
+ * @create: 2019/12/17 18:03
+ */
+@Slf4j
+@Api(tags = "文件上传",value = "文件上传")
+@RestController
+public class FileController {
+    @MustLogin
+    @ApiOperation(value = "测评试题查询",notes = "测评试题查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "测评试题查询信息", required = true)
+    })
+    @RequestMapping(value="/saveFile", method = RequestMethod.POST)
+    public JsonResponse<FileVo.Save> saveFile(@RequestBody @ApiParam @Valid QueryDto<FileDto.Save> queryDto) throws Exception {
+        String path = Base64FileUtil.base64ToFile(queryDto.getParam().getBase64(), PropUtil.path, "/file/" + DateUtil.today() + "/");
+        FileVo.Save save = new FileVo.Save();
+        save.setPath(PropUtil.imgDomain + path);
+        return JsonResponse.newInstance().ok(save);
+    }
+}

question/src/main/java/com/ccsens/question/api/ImportController.java

@@ -0,0 +1,213 @@
+package com.ccsens.question.api;
+
+import com.ccsens.question.service.IImportService;
+import com.ccsens.question.uitl.Constant;
+import com.ccsens.util.JsonResponse;
+import com.ccsens.util.UploadFileUtil_Servlet3;
+import com.ccsens.util.WebConstant;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.Part;
+import java.io.File;
+
+
+/**
+ * @program: ptpro
+ * @description: 医疗测评数据导入
+ * @author: wu huijuan
+ * @create: 2019/10/21 09:51
+ */
+
+@Slf4j
+@Api(tags = "数据导入",value = "导入医疗项目相关数据")
+@RestController
+public class ImportController {
+
+    @Autowired
+    private IImportService importService;
+
+    /**
+     *@Description:
+     *@Param:
+     *@return: com.ccsens.ptpro.util.JsonResponse
+     *@Author: wuhuijuan
+     *@date: 2019/10/21 10:04
+     */
+    @ApiOperation(value = "导入医疗项目相关数据",notes = "文件大小不能超过20M，支持后缀:.xls|.xlsx")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "医疗项目表", required = true, paramType = "form",dataType = "__file")
+    })
+    @RequestMapping(value = "/importBase", method = RequestMethod.POST)
+    public JsonResponse importAll(@RequestParam(required = true) Part file) throws Exception{
+
+        long time1 = System.currentTimeMillis();
+        //1.上传文件
+        String allowedExts = "xls,xlsx";
+        String dir = WebConstant.UPLOAD_PROJECT_WBS + File.separator;
+        String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExts, dir);
+        File execlFile = new File(dir+path);
+        long time2 = System.currentTimeMillis();
+        log.info("解析文件耗时：{}", (time2 - time1));
+        importService.importPosition(execlFile, 0);
+        long time3 = System.currentTimeMillis();
+        log.info("导入职务耗时：{}", (time3 - time2));
+        importService.importTitle(execlFile, 1);
+        long time4 = System.currentTimeMillis();
+        log.info("导入职称耗时：{}", (time4 - time3));
+        importService.importReport(execlFile, 2);
+        long time5 = System.currentTimeMillis();
+        log.info("导入报告单耗时：{}", (time5 - time4));
+        importService.importQuestion(execlFile, Constant.Ht.Question.ALL);
+        return JsonResponse.newInstance().ok();
+    }
+
+    /**
+     *@Description:
+     *@Param:
+     *@return: com.ccsens.ptpro.util.JsonResponse
+     *@Author: wuhuijuan
+     *@date: 2019/10/21 10:04
+     */
+    @ApiOperation(value = "单独导入报告单类型",notes = "文件大小不能超过20M，支持后缀:.xls|.xlsx")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "医疗项目表", required = true, paramType = "form",dataType = "__file")
+    })
+    @RequestMapping(value = "/importReportType", method = RequestMethod.POST)
+    public JsonResponse importReportType(@RequestParam(required = true) Part file) throws Exception{
+
+        long time1 = System.currentTimeMillis();
+        //1.上传文件
+        String allowedExts = "xls,xlsx";
+        String dir = WebConstant.UPLOAD_PROJECT_WBS + File.separator;
+        String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExts, dir);
+        File execlFile = new File(dir+path);
+        long time2 = System.currentTimeMillis();
+        log.info("解析文件耗时：{}", (time2 - time1));
+//        importService.importPosition(execlFile, 0);
+//        long time3 = System.currentTimeMillis();
+//        log.info("导入职务耗时：{}", (time3 - time2));
+//        importService.importTitle(execlFile, 1);
+        long time4 = System.currentTimeMillis();
+//        log.info("导入职称耗时：{}", (time4 - time3));
+        importService.importReport(execlFile, 2);
+        long time5 = System.currentTimeMillis();
+        log.info("导入报告单耗时：{}", (time5 - time4));
+//        importService.importQuestion(execlFile, Constant.Ht.Question.ALL);
+        return JsonResponse.newInstance().ok();
+    }
+
+
+    /**
+     *@Description:
+     *@Param:
+     *@return: com.ccsens.ptpro.util.JsonResponse
+     *@Author: wuhuijuan
+     *@date: 2020/5/14 11:21
+     */
+    @ApiOperation(value = "导入importMoca",notes = "文件大小不能超过20M，支持后缀:.xls|.xlsx")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "医疗项目表", required = true, paramType = "form",dataType = "__file")
+    })
+    @RequestMapping(value = "/importMoca", method = RequestMethod.POST)
+    public JsonResponse importMoca(@RequestParam(required = true) Part file) throws Exception{
+
+        long time1 = System.currentTimeMillis();
+        //1.上传文件
+        String allowedExts = "xls,xlsx";
+        String dir = WebConstant.UPLOAD_PROJECT_WBS + File.separator;
+        String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExts, dir);
+        File execlFile = new File(dir+path);
+        long time2 = System.currentTimeMillis();
+        importService.importQuestion(execlFile, Constant.Ht.Report.MOCA);
+        log.info("导入moca");
+        return JsonResponse.newInstance().ok();
+    }
+
+    /**
+     *@Description:
+     *@Param:
+     *@return: com.ccsens.ptpro.util.JsonResponse
+     *@Author: wuhuijuan
+     *@date: 2020/5/14 11:21
+     */
+    @ApiOperation(value = "导入importMoca",notes = "文件大小不能超过20M，支持后缀:.xls|.xlsx")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "医疗项目表", required = true, paramType = "form",dataType = "__file")
+    })
+    @RequestMapping(value = "/importMMSE", method = RequestMethod.POST)
+    public JsonResponse importMMSE(@RequestParam(required = true) Part file) throws Exception{
+
+        long time1 = System.currentTimeMillis();
+        //1.上传文件
+        String allowedExts = "xls,xlsx";
+        String dir = WebConstant.UPLOAD_PROJECT_WBS + File.separator;
+        String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExts, dir);
+        File execlFile = new File(dir+path);
+        long time2 = System.currentTimeMillis();
+        importService.importQuestion(execlFile, Constant.Ht.Report.MMSE);
+        log.info("导入mmse");
+        return JsonResponse.newInstance().ok();
+    }
+
+    /**
+     *@Description:
+     *@Param:
+     *@return: com.ccsens.ptpro.util.JsonResponse
+     *@Author: wuhuijuan
+     *@date: 2020/5/14 11:21
+     */
+    @ApiOperation(value = "导入importRey",notes = "文件大小不能超过20M，支持后缀:.xls|.xlsx")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "医疗项目表", required = true, paramType = "form",dataType = "__file")
+    })
+    @RequestMapping(value = "/importRey", method = RequestMethod.POST)
+    public JsonResponse importRey(@RequestParam(required = true) Part file) throws Exception{
+
+        long time1 = System.currentTimeMillis();
+        //1.上传文件
+        String allowedExts = "xls,xlsx";
+        String dir = WebConstant.UPLOAD_PROJECT_WBS + File.separator;
+        String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExts, dir);
+        File execlFile = new File(dir+path);
+        long time2 = System.currentTimeMillis();
+        importService.importQuestion(execlFile, Constant.Ht.Report.REY);
+        log.info("导入Rey");
+        return JsonResponse.newInstance().ok();
+    }
+
+
+    /**
+     *@Description:
+     *@Param:
+     *@return: com.ccsens.ptpro.util.JsonResponse
+     *@Author: wuhuijuan
+     *@date: 2020/5/14 11:21
+     */
+    @ApiOperation(value = "导入importXFXPD",notes = "文件大小不能超过20M，支持后缀:.xls|.xlsx")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "医疗项目表", required = true, paramType = "form",dataType = "__file")
+    })
+    @RequestMapping(value = "/importXFXPD", method = RequestMethod.POST)
+    public JsonResponse importXFXPD(@RequestParam(required = true) Part file) throws Exception{
+
+        long time1 = System.currentTimeMillis();
+        //1.上传文件
+        String allowedExts = "xls,xlsx";
+        String dir = WebConstant.UPLOAD_PROJECT_WBS + File.separator;
+        String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExts, dir);
+        File execlFile = new File(dir+path);
+        long time2 = System.currentTimeMillis();
+        importService.importQuestion(execlFile, Constant.Ht.Report.XFXPD);
+        log.info("导入XFXPD");
+        return JsonResponse.newInstance().ok();
+    }
+}

question/src/main/java/com/ccsens/question/api/IndexController.java

@@ -0,0 +1,50 @@
+package com.ccsens.question.api;
+
+import com.ccsens.cloudutil.bean.QueryParam;
+import com.ccsens.cloudutil.feign.TallFeignClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.configurationprocessor.json.JSONException;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * @description:
+ * @author: wuHuiJuan
+ * @create: 2019/11/26 15:01
+ */
+@RestController
+public class IndexController {
+
+//    @Autowired
+//    private RestTemplate restTemplate;
+    @Autowired
+    private TallFeignClient tallFeignClient;
+
+    @RequestMapping("get/{id}")
+    public String get(@PathVariable("id") Long id) throws JSONException {
+
+//        return restTemplate.getForObject("http://tall/getPort", String.class);
+
+        Map t = new HashMap();
+        t.put("name","zs");
+        t.put("age",1);
+        QueryParam json = new QueryParam();
+        json.setT(t);
+        json.setUserId(id);
+        String s = tallFeignClient.get(json);
+//        String s = tallFeignClient.index();
+        return s;
+
+    }
+
+    @RequestMapping({"","/","/index"})
+    public String index(){
+        return "hello ht" ;
+    }
+
+}

question/src/main/java/com/ccsens/question/api/PatientController.java

@@ -0,0 +1,163 @@
+package com.ccsens.question.api;
+
+import cn.hutool.core.util.IdcardUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.question.annotation.DoctorAudit;
+import com.ccsens.question.bean.dto.PatientDto;
+import com.ccsens.question.bean.po.HtPatient;
+import com.ccsens.question.bean.vo.PatientVo;
+import com.ccsens.question.service.IPatientService;
+import com.ccsens.util.CodeEnum;
+import com.ccsens.util.JsonResponse;
+import com.ccsens.util.bean.dto.QueryDto;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @program: ptpro
+ * @description: 病人信息查询及编辑
+ * @author: wu huijuan
+ * @create: 2019/10/28 17:48
+ */
+@Slf4j
+@Api(tags = "病友信息",value = "病友信息查询/编辑")
+@RestController
+public class PatientController {
+
+    @Autowired
+    private IPatientService patientService;
+
+
+    @MustLogin
+    @ApiOperation(value = "查询医生录入的病人信息",notes = "查询医生录入的病人信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "分页条件", required = true)
+    })
+    @RequestMapping(value="/queryByRecordId", method = RequestMethod.POST)
+    public JsonResponse<PageInfo<PatientVo.Query>> queryByRecordId(@RequestBody @ApiParam @Valid QueryDto<PatientDto.Recorder> params){
+        log.info("查询医生记录的病人信息：{}", params);
+        PageInfo<PatientVo.Query> pageInfo = patientService.queryByRecorder(params.getParam(), params.getUserId());
+        log.info("查询医生记录的病人信息结果：{}", pageInfo);
+        return JsonResponse.newInstance().ok(pageInfo);
+    }
+
+
+    /**
+     *@Description:
+     * @param params
+     *@return: com.ccsens.ptpro.util.JsonResponse
+     *@Author: wuhuijuan
+     *@date: 2019/10/29 9:24
+     */
+    @MustLogin
+    @DoctorAudit
+    @ApiOperation(value = "基础信息查询",notes = "病友基础信息查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "病友基础信息", required = true)
+    })
+    @RequestMapping(value="/queryPatient", method = RequestMethod.POST)
+    public JsonResponse<PatientVo.Query> query(@RequestBody @ApiParam @Valid QueryDto<PatientDto.Query> params) {
+        log.info("病友信息查询：{}", params);
+        PatientDto.Query patient = params.getParam();
+
+        List<HtPatient> patients = patientService.selectPatient(patient);
+        log.info("病友查询结果：{}", patients);
+        return JsonResponse.newInstance().ok(PatientVo.Query.copy(patients, params.getUserId()));
+    }
+
+    /**
+     *@Description:病人基本信息编辑，返回病人ID
+     *          1.为用户注册账号 2有则修改，无则添加
+     * @param params
+     *@return: com.ccsens.ptpro.util.JsonResponse
+     *@Author: wuhuijuan
+     *@date: 2019/10/30 9:27
+     */
+    @MustLogin
+    @DoctorAudit
+    @ApiOperation(value = "基础信息编辑",notes = "病友基础信息编辑")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "病友基础信息", required = true)
+    })
+    @RequestMapping(value="/editPatient", method = RequestMethod.POST)
+    public JsonResponse<PatientVo.Edit> edit(@RequestBody @ApiParam @Valid QueryDto<PatientDto.Edit>params) {
+        log.info("病友信息编辑：{}", params);
+        PatientDto.Edit patient = params.getParam();
+        if(StringUtils.isEmpty(patient.getMobile()) || StringUtils.isEmpty(patient.getName())) {
+            log.info("手机号或名字为空");
+            return JsonResponse.newInstance().ok(CodeEnum.PARAM_NULL);
+        }
+        //校验身份证格式
+        if (patient.getId() == null) {
+            if (StringUtils.isEmpty(patient.getIdcard())) {
+                return JsonResponse.newInstance().ok(CodeEnum.PARAM_NULL);
+            }
+            if (!IdcardUtil.isValidCard(patient.getIdcard())){
+                return JsonResponse.newInstance().ok(CodeEnum.ID_CARD_ERROR);
+            }
+        } else if (StringUtils.isEmpty(patient.getIdcard()) || patient.getIdcard().contains("*")) {
+            patient.setIdcard(null);
+        }
+        //设置记录值
+//        patient.setRecorder(patient.getId() == null ? Constant.Ht.NUMBER_DEFAULT : params.getUserId());
+        long id = patientService.editPatient(patient.copy(), params.getUserId());
+        log.info("病友编辑结果：{}", id);
+        if (id <= 0) {
+            log.info("病友编辑失败");
+            return JsonResponse.newInstance().ok(CodeEnum.PARAM_ERROR);
+        }
+        PatientVo.Edit idModel = new PatientVo.Edit();
+        idModel.setId(id);
+        return JsonResponse.newInstance().ok(idModel);
+    }
+
+    @MustLogin
+    @DoctorAudit
+    @ApiOperation(value = "病友其他信息查询",notes = "病友其他信息查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "病友其他信息查询", required = true)
+    })
+    @RequestMapping(value="/queryPatientOtherMsg", method = RequestMethod.POST)
+    public JsonResponse queryPatientOtherMsg(@RequestBody @ApiParam @Valid QueryDto<PatientDto.QueryOtherMsg> params) {
+        log.info("查询其他信息请求参数：{}", params);
+        List list = patientService.queryPatientOtherMsg(params.getParam(), params.getUserId());
+        JSONArray array = JSONObject.parseArray(JSONObject.toJSONString(list));
+        String key = "recorder";
+        for (Object obj: array) {
+            JSONObject json = (JSONObject) obj;
+            boolean isNotRecorder = json.get(key) != null
+                    && json.getLongValue(key) != 0
+                    && json.getLongValue(key) != params.getUserId().longValue();
+            json.put("modifyAuth", isNotRecorder ? 0 : 1);
+        }
+        return JsonResponse.newInstance().ok(array);
+    }
+
+    @MustLogin
+    @DoctorAudit
+    @ApiOperation(value = "编辑其他病友信息",notes = "编辑其他病友信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "编辑其他病友信息", required = true)
+    })
+    @RequestMapping(value="/editPatientOtherMsg", method = RequestMethod.POST)
+    public JsonResponse editPatientOtherMsg(@RequestBody @ApiParam @Valid QueryDto<PatientDto.EditOtherMsg> params) {
+        log.info("查询其他信息请求参数：{}", params);
+        long id = patientService.editPatientOtherMsg(params.getParam(), params.getUserId());
+        JSONObject json = new JSONObject();
+        json.put("id", id);
+        return JsonResponse.newInstance().ok(CodeEnum.SUCCESS, json);
+    }
+
+}

question/src/main/java/com/ccsens/question/api/PatientReportController.java

@@ -0,0 +1,265 @@
+package com.ccsens.question.api;
+
+
+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.question.annotation.DoctorAudit;
+import com.ccsens.question.bean.dto.PatientReportDto;
+import com.ccsens.question.bean.po.HtDoctor;
+import com.ccsens.question.bean.vo.PatientReportVo;
+import com.ccsens.question.service.IPatientReportService;
+import com.ccsens.question.uitl.Constant;
+import com.ccsens.util.CodeEnum;
+import com.ccsens.util.JsonResponse;
+import com.ccsens.util.bean.dto.QueryDto;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @program: ptpro
+ * @description:病人报告单
+ * @author: wu huijuan
+ * @create: 2019/10/30 16:22
+ */
+@Slf4j
+@Api(tags = "报告单信息",value = "报告单生成，查看，编辑，生成文件等")
+@RestController
+public class PatientReportController {
+
+    @Autowired
+    private IPatientReportService patientReportService;
+
+    @MustLogin
+    @DoctorAudit
+    @ApiOperation(value = "忽略未完成的报告单",notes = "忽略未完成的报告单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "报告单信息", required = true)
+    })
+    @RequestMapping(value="/ignoreComplete", method = RequestMethod.POST)
+    public JsonResponse ignoreComplete(@RequestBody @ApiParam @Valid QueryDto<PatientReportDto.Ignore> dto){
+        log.info("忽略未完成的报告单：{}", dto);
+        patientReportService.ignoreComplete(dto.getParam(), dto.getUserId());
+        log.info("忽略未完成的报告单已完成");
+        return JsonResponse.newInstance().ok();
+    }
+
+    @MustLogin
+    @DoctorAudit
+    @ApiOperation(value = "检查是否有未完成的报告单",notes = "检查是否有未完成的报告单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "报告单信息", required = true)
+    })
+    @RequestMapping(value="/checkComplete", method = RequestMethod.POST)
+    public JsonResponse<PatientReportVo.Complete> checkComplete(@RequestBody @ApiParam @Valid QueryDto dto){
+        log.info("检查是否有未完成的报告单：{}", dto);
+        PatientReportVo.Complete complete = patientReportService.checkComplete(dto.getUserId());
+        log.info("检查是否有未完成的报告单返回：{}", complete);
+        return JsonResponse.newInstance().ok(complete);
+    }
+
+    @MustLogin
+    @DoctorAudit
+    @ApiOperation(value = "生成报告单",notes = "生成报告单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "报告单信息", required = true)
+    })
+    @RequestMapping(value="/generatePatientReport", method = RequestMethod.POST)
+    public JsonResponse<PatientReportVo.Generate> generate(@RequestBody @ApiParam @Valid QueryDto<PatientReportDto.Generate> dto){
+        log.info("生成报告单请求参数：{}", dto);
+        PatientReportDto.Generate patientReport = dto.getParam();
+        if (patientReport == null || patientReport.getPatientId() == null || patientReport.getPatientId() == 0) {
+            return JsonResponse.newInstance().ok(CodeEnum.PARAM_NULL);
+        }
+        //TODO 判断病友是否和当前医院绑定，未绑定，进行绑定
+        JsonResponse<PatientReportVo.Generate> response = patientReportService.generatePatientReport(patientReport, dto.getUserId());
+        log.info("生成病友报告单返回：{}", response);
+        return response;
+    }
+    @MustLogin
+    @DoctorAudit
+    @ApiOperation(value = "编辑报告单",notes = "编辑报告单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "编辑报告单信息", required = true)
+    })
+    @RequestMapping(value="/editPatientReport", method = RequestMethod.POST)
+    public JsonResponse edit(@RequestBody @ApiParam @Valid QueryDto<PatientReportDto.Edit> param){
+
+        //编辑报告单信息
+        log.info("编辑报告单：{}", param);
+        CodeEnum codeEnum = patientReportService.editPatientReport(param.getParam(), param.getUserId());
+        log.info("编辑报告单结果：{}", codeEnum);
+        return JsonResponse.newInstance().ok(codeEnum);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "查询报告单列表",notes = "根据病人ID/医生ID查询报告单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "编辑报告单信息", required = true)
+    })
+    @RequestMapping(value="/queryReports", method = RequestMethod.POST)
+    public JsonResponse<PageInfo<PatientReportVo.ReportName>> queryReports(@RequestBody @ApiParam @Valid QueryDto<PatientReportDto.QueryReports> param){
+
+        //编辑报告单信息
+        log.info("查询报告单列表：{}", param);
+        PageInfo<PatientReportVo.ReportName> reportNamePageInfo = patientReportService.queryReports(param.getParam(), param.getUserId());
+        log.info("查询报告单结果：{}", reportNamePageInfo);
+        return JsonResponse.newInstance().ok(reportNamePageInfo);
+    }
+
+    @ApiOperation(value = "查询报告单详情",notes = "根据病人ID查询报告单详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "查询报告单详情", required = true)
+    })
+    @RequestMapping(value="/queryReportDetail", method = RequestMethod.POST)
+    public JsonResponse<PatientReportVo.ReprotDetail> queryReportDetail(@RequestBody @ApiParam @Valid QueryDto<PatientReportDto.QueryDetail> param){
+        //查询报告单信息
+        log.info("查询报告单详情：{}", param);
+        PatientReportVo.ReprotDetail detail = patientReportService.queryReportDetail(param.getParam(), param.getUserId());
+        log.info("查询报告单详情结果：{}", detail);
+        return JsonResponse.newInstance().ok(detail);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "查询医生对报告单的权限",notes = "查询医生对报告单的权限")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "报告单ID", required = true)
+    })
+    @RequestMapping(value="/queryAuthority", method = RequestMethod.POST)
+    public JsonResponse<PatientReportVo.Authority> queryAuthority(@RequestBody @ApiParam @Valid QueryDto<PatientReportDto.Authority> param){
+        //查询报告单信息
+        log.info("查询医生对报告单的权限：{}", param);
+        PatientReportVo.Authority authority = patientReportService.queryReportAuthority(param.getParam(), param.getUserId());
+        log.info("查询医生对报告单的权限结果：{}", authority);
+        return JsonResponse.newInstance().ok(authority);
+    }
+
+    @ApiOperation(value = "导出报告单",notes = "导出报告单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "导出报告单", required = true)
+    })
+    @RequestMapping(value="/exportReport", method = RequestMethod.POST)
+    public JsonResponse<PatientReportVo.Export> exportReport(@RequestBody @ApiParam @Valid QueryDto<PatientReportDto.QueryDetail> param){
+        //查询报告单信息
+        log.info("查询报告单详情：{}", param);
+        String path = patientReportService.exportReport(param.getParam(), param.getUserId());
+        log.info("文件路径:{}", path);
+        PatientReportVo.Export export = new PatientReportVo.Export();
+        export.setPath(path);
+        return JsonResponse.newInstance().ok(export);
+    }
+
+    @ApiOperation(value = "分享报告单",notes = "分享报告单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "分享报告单", required = true)
+    })
+    @RequestMapping(value="/shareReport", method = RequestMethod.POST)
+    public JsonResponse<PatientReportVo.Export> shareReport(@RequestBody @ApiParam @Valid QueryDto<PatientReportDto.QueryDetail> param) throws IOException {
+        //查询报告单信息
+        log.info("查询报告单详情：{}", param);
+        String path = patientReportService.generateQRCode(param.getParam(), param.getUserId());
+        log.info("文件路径:{}", path);
+        PatientReportVo.Export export = new PatientReportVo.Export();
+        export.setPath(path);
+
+        return JsonResponse.newInstance().ok(export);
+    }
+
+    @MustLogin
+    @DoctorAudit
+    @ApiOperation(value = "查询下属医生的报告单列表",notes = "根据医生ID查询报告单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "查询下属医生的报告单列表", required = true)
+    })
+    @RequestMapping(value="/querySubordinateReports", method = RequestMethod.POST)
+    public JsonResponse<PageInfo<PatientReportVo.ReportName>> querySubordinateReports(@RequestBody @ApiParam @Valid QueryDto<PatientReportDto.Doctor> param){
+
+        //编辑报告单信息
+        log.info("查询某个医生的报告单列表：{}", param);
+        HtDoctor doctor = (HtDoctor) param.getOtherMsg().get(Constant.Ht.DOCTOR_PARAM);
+        PageInfo<PatientReportVo.ReportName> reportNamePageInfo = patientReportService.queryDoctorReports(param.getParam(), doctor, param.getUserId());
+        log.info("查询某个医生的报告单结果：{}", reportNamePageInfo);
+        return JsonResponse.newInstance().ok(reportNamePageInfo);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "管理员查询报告单列表",notes = "管理员查询报告单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "管理员查询报告单列表", required = true)
+    })
+    @RequestMapping(value="/queryAllReports", method = RequestMethod.POST)
+    public JsonResponse<PageInfo<PatientReportVo.ReportName>> queryAllReports(@RequestBody @ApiParam @Valid QueryDto<PatientReportDto.AdminQueryReport> param){
+
+        //编辑报告单信息
+        log.info("管理员查询报告单列表请求参数：{}", param);
+        HtDoctor doctor = (HtDoctor) param.getOtherMsg().get(Constant.Ht.DOCTOR_PARAM);
+        PageInfo<PatientReportVo.ReportName> reportNamePageInfo = patientReportService.queryAllReports(param.getParam(),  param.getUserId());
+        log.info("管理员查询报告单列表结果：{}", reportNamePageInfo);
+        return JsonResponse.newInstance().ok(reportNamePageInfo);
+    }
+
+
+    @MustLogin
+    @ApiOperation(value = "根据临床诊断统计",notes = "根据临床诊断统计")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "根据临床诊断统计", required = true)
+    })
+    @RequestMapping(value="/countByClinicalDiagnosis", method = RequestMethod.POST)
+    public JsonResponse<PatientReportVo.ClinicalDiagnosis> countByClinicalDiagnosis(@RequestBody @ApiParam @Valid QueryDto<PatientReportDto.ClinicalDiagnosis> param){
+
+        //编辑报告单信息
+        log.info("根据临床诊断统计请求参数：{}", param);
+        List<PatientReportVo.ClinicalDiagnosis> list = patientReportService.countByClinicalDiagnosis(param.getParam(), param.getUserId());
+        log.info("根据临床诊断统计结果：{}", list);
+        return JsonResponse.newInstance().ok(list);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "根据年龄+性别统计",notes = "根据年龄+性别统计")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "根据年龄+性别统计", required = true)
+    })
+    @RequestMapping(value="/countBySexAndAge", method = RequestMethod.POST)
+    public JsonResponse<PatientReportVo.AgeAndSexGroup> countBySexAndAge(@RequestBody @ApiParam @Valid QueryDto<PatientReportDto.AgeAndSex> param){
+        log.info("根据临床诊断统计请求参数：{}", param);
+        List<PatientReportVo.AgeAndSexGroup> reportNamePageInfo = patientReportService.countBySexAndAge(param.getParam(),  param.getUserId());
+        log.info("根据临床诊断统计结果：{}", reportNamePageInfo);
+        return JsonResponse.newInstance().ok(reportNamePageInfo);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "根据日期统计",notes = "根据日期统计")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "根据日期统计", required = true)
+    })
+    @RequestMapping(value="/countByDay", method = RequestMethod.POST)
+    public JsonResponse<PatientReportVo.Day> countByDay(@RequestBody @ApiParam @Valid QueryDto<PatientReportDto.Day> param){
+        log.info("根据临床诊断统计请求参数：{}", param);
+        List<PatientReportVo.Day> reportNamePageInfo = patientReportService.countByDay(param.getParam(),  param.getUserId());
+        log.info("根据临床诊断统计结果：{}", reportNamePageInfo);
+        return JsonResponse.newInstance().ok(reportNamePageInfo);
+    }
+
+    @MustLogin
+    @DoctorAudit
+    @ApiOperation(value = "查询报告单详细答题信息",notes = "根据报告单id和测评类型，查看报告单的详细信息")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value="/queryReportAnswer", method = RequestMethod.POST)
+    public JsonResponse<List<PatientReportVo.ReportDetailAnswer>> queryReportAnswer(@RequestBody @ApiParam @Valid QueryDto<PatientReportDto.QueryReportAnswer> param){
+        log.info("查询报告单详细答题信息：{}", param);
+        List<PatientReportVo.ReportDetailAnswer> reportDetailAnswers = patientReportService.queryReportAnswer(param.getParam(),  param.getUserId());
+        log.info("查询报告单详细答题信息完成");
+        return JsonResponse.newInstance().ok(reportDetailAnswers);
+    }
+
+
+}

question/src/main/java/com/ccsens/question/api/PatientReportSearchController.java

@@ -0,0 +1,58 @@
+package com.ccsens.question.api;
+
+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.question.bean.dto.PatientReportSearchDto;
+import com.ccsens.question.bean.vo.PatientReportSearchVo;
+import com.ccsens.question.service.IPatientReportService;
+import com.ccsens.util.JsonResponse;
+import com.ccsens.util.bean.dto.QueryDto;
+import io.swagger.annotations.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: whj
+ * @time: 2021/3/10 15:03
+ */
+@Slf4j
+@Api(tags = "报告单搜索",value = "报告单搜索条件，搜索")
+@RestController
+@RequestMapping("/patientReport")
+public class PatientReportSearchController {
+    @Resource
+    private IPatientReportService patientReportService;
+
+    @MustLogin
+    @ApiOperation(value = "查询搜索条件",notes = "whj 查询搜索条件")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "查询搜索条件", required = true)
+    })
+    @RequestMapping(value="/searchParam", method = RequestMethod.POST)
+    public JsonResponse<PatientReportSearchVo.SearchParam> searchParam(@RequestBody @ApiParam @Valid QueryDto<PatientReportSearchDto.SearchParam> dto){
+        log.info("查询搜索条件：{}", dto);
+        List<PatientReportSearchVo.SearchParam> params = patientReportService.searchParam(dto.getParam());
+        log.info("查询搜索条件已完成：{}", params);
+        return JsonResponse.newInstance().ok(params);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "根据条件搜索报告单",notes = "whj 搜索报告单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "查询搜索条件", required = true)
+    })
+    @RequestMapping(value="/search", method = RequestMethod.POST)
+    public JsonResponse<PatientReportSearchVo.Search> search(@RequestBody @ApiParam @Valid QueryDto<PatientReportSearchDto.SearchList> dto){
+        log.info("搜索报告单：{}", dto);
+        List<PatientReportSearchVo.Search> params = patientReportService.search(dto.getParam());
+        log.info("搜索报告单已完成");
+        return JsonResponse.newInstance().ok(params);
+    }
+}

question/src/main/java/com/ccsens/question/api/PositionController.java

@@ -0,0 +1,57 @@
+package com.ccsens.question.api;
+
+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.question.bean.dto.PositionDto;
+import com.ccsens.question.bean.vo.PositionVo;
+import com.ccsens.question.service.IPositionService;
+import com.ccsens.util.JsonResponse;
+import com.ccsens.util.bean.dto.QueryDto;
+import io.swagger.annotations.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @description: 查询职务职称
+ * @author: wu huijuan
+ * @create: 2019/11/19 16:19
+ */
+@Slf4j
+@Api(tags = "部门 和 职称",value = "查询部门/职称")
+@RestController
+public class PositionController {
+
+    @Autowired
+    private IPositionService positionService;
+
+    @MustLogin
+    @ApiOperation(value = "医院/部门/职务查询",notes = "医院/部门/职务查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "医院/部门/职务查询", required = true)
+    })
+    @RequestMapping(value="/queryPosition", method = RequestMethod.POST)
+    public JsonResponse<List<PositionVo.Position>> queryPosition(@RequestBody @ApiParam @Valid QueryDto<PositionDto.Position> params){
+        log.info("查询职务：{}", params);
+        List<PositionVo.Position> positions = positionService.queryPosition(params.getParam(), params.getUserId());
+        return JsonResponse.newInstance().ok(positions);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "职称查询",notes = "职称查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "职称查询", required = true)
+    })
+    @RequestMapping(value="/queryTitle", method = RequestMethod.POST)
+    public JsonResponse<List<PositionVo.Title>> queryTitle(){
+        log.info("查询职称");
+        List<PositionVo.Title> titles = positionService.queryTitles();
+        return JsonResponse.newInstance().ok(titles);
+    }
+
+}

question/src/main/java/com/ccsens/question/api/QuestionController.java

@@ -0,0 +1,133 @@
+package com.ccsens.question.api;
+
+
+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.question.annotation.DoctorAudit;
+import com.ccsens.question.bean.dto.QuestionDto;
+import com.ccsens.question.bean.vo.QuestionVo;
+import com.ccsens.question.service.IQuestionService;
+import com.ccsens.util.CodeEnum;
+import com.ccsens.util.JsonResponse;
+import com.ccsens.util.NotSupportedFileTypeException;
+import com.ccsens.util.bean.dto.QueryDto;
+import io.swagger.annotations.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: wu huijuan
+ * @create: 2019/11/08 15:33
+ */
+@Slf4j
+@Api(tags = "测评题目信息",value = "测评题目查询等")
+@RestController
+public class QuestionController {
+
+    @Autowired
+    private IQuestionService questionService;
+
+    @MustLogin
+    @DoctorAudit
+    @ApiOperation(value = "测评试题查询",notes = "测评试题查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "测评试题查询信息", required = true)
+    })
+    @RequestMapping(value="/queryQuestion", method = RequestMethod.POST)
+    public JsonResponse<QuestionVo.Query> query(@RequestBody @ApiParam @Valid QueryDto<QuestionDto.Query> queryDto){
+        log.info("查询试题：{}", queryDto);
+
+        QuestionVo.Query query = questionService.queryQuestion(queryDto.getParam(), queryDto.getUserId());
+        log.info("查询试题结果：{}", query);
+        return JsonResponse.newInstance().ok(query);
+    }
+
+    @MustLogin
+    @DoctorAudit
+    @ApiOperation(value = "通过报告单和试题id查询试题的答案",notes = "测评试题查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "测评试题查询信息", required = true)
+    })
+    @RequestMapping(value="/optionJson", method = RequestMethod.POST)
+    public JsonResponse<List<QuestionVo.OptionJson>> queryOptionJson(@RequestBody @ApiParam @Valid QueryDto<QuestionDto.QueryPatientCanvas> queryDto){
+        log.info("查询试题：{}", queryDto);
+
+        List<QuestionVo.OptionJson> optionJsonList = questionService.queryOptionJson(queryDto.getParam(), queryDto.getUserId());
+        log.info("查询试题结果：{}", optionJsonList);
+        return JsonResponse.newInstance().ok(optionJsonList);
+    }
+
+    @MustLogin
+    @DoctorAudit
+    @ApiOperation(value = "保存试题得分",notes = "保存试题得分")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "json", value = "试题得分情况", required = true)
+    })
+    @RequestMapping(value="/saveScore", method = RequestMethod.POST)
+    public JsonResponse saveScore(@RequestBody @ApiParam @Valid QueryDto<QuestionDto.Score> queryDto) throws IOException, NotSupportedFileTypeException {
+        log.info("保存试题得分：{}", queryDto);
+        CodeEnum codeEnum = questionService.saveScore(queryDto.getParam(), queryDto.getUserId());
+        log.info("保存试题得分结果：{}", codeEnum);
+        return JsonResponse.newInstance().ok(codeEnum);
+    }
+
+    @MustLogin
+    @DoctorAudit
+    @ApiOperation(value = "保存用户画图信息",notes = "zy:保存画板信息画图轨迹等")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value="/saveCanvas", method = RequestMethod.POST)
+    public JsonResponse<List<QuestionVo.PatientCanvas>> saveCanvas(@RequestBody @ApiParam @Valid QueryDto<QuestionDto.SavePatientCanvas> queryDto) throws IOException, NotSupportedFileTypeException {
+        log.info("保存用户画图信息");
+        List<QuestionVo.PatientCanvas> patientCanvas = questionService.saveCanvas(queryDto.getParam(), queryDto.getUserId());
+        log.info("保存用户画图信息成功后返回");
+        return JsonResponse.newInstance().ok(patientCanvas);
+    }
+
+    @MustLogin
+    @DoctorAudit
+    @ApiOperation(value = "查看用户画图信息",notes = "zy:查看画板信息画图轨迹等")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value="/queryCanvas", method = RequestMethod.POST)
+    public JsonResponse<List<QuestionVo.PatientCanvas>> queryCanvas(@RequestBody @ApiParam @Valid QueryDto<QuestionDto.QueryPatientCanvas> queryDto) throws IOException, NotSupportedFileTypeException {
+        log.info("查看用户画图信息");
+        List<QuestionVo.PatientCanvas> patientCanvas = questionService.getCanvas(queryDto.getParam(), queryDto.getUserId());
+        log.info("查看用户画图信息成功");
+        return JsonResponse.newInstance().ok(patientCanvas);
+    }
+
+    @MustLogin
+    @DoctorAudit
+    @ApiOperation(value = "删除画图轨迹",notes = "zy:删除画图的轨迹，可以一次删除多条")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value="/delCanvas", method = RequestMethod.POST)
+    public JsonResponse delCanvas(@RequestBody @ApiParam @Valid QueryDto<QuestionDto.DelPatientCanvas> queryDto) throws IOException, NotSupportedFileTypeException {
+        log.info("删除画图轨迹");
+        questionService.delCanvas(queryDto.getParam(), queryDto.getUserId());
+        log.info("删除画图轨迹成功");
+        return JsonResponse.newInstance().ok();
+    }
+
+    @MustLogin
+    @DoctorAudit
+    @ApiOperation(value = "根据上级code查询测评类型",notes = "zy:删除画图的轨迹，可以一次删除多条")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value="/queryReportCode", method = RequestMethod.POST)
+    public JsonResponse<List<QuestionVo.ReportCode>> queryReportCode(@RequestBody @ApiParam @Valid QueryDto<QuestionDto.QueryReportCode> queryDto) throws IOException, NotSupportedFileTypeException {
+        log.info("根据上级code查询测评类型:{}",queryDto);
+        List<QuestionVo.ReportCode> reportCodeList = questionService.queryReportCode(queryDto.getParam(), queryDto.getUserId());
+        log.info("查询测评类型:{}",reportCodeList);
+        return JsonResponse.newInstance().ok(reportCodeList);
+    }
+}

question/src/main/java/com/ccsens/question/aspect/DoctorAuditAspect.java

@@ -0,0 +1,60 @@
+package com.ccsens.question.aspect;
+
+import com.ccsens.question.bean.po.HtDoctor;
+import com.ccsens.question.bean.po.HtDoctorExample;
+import com.ccsens.question.persist.mapper.HtDoctorMapper;
+import com.ccsens.question.uitl.Constant;
+import com.ccsens.util.CodeEnum;
+import com.ccsens.util.JsonResponse;
+import com.ccsens.util.bean.dto.QueryDto;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 判断医生是否审核通过
+ * @author: wuHuiJuan
+ * @create: 2019/11/21 10:51
+ */
+@Order(2)
+@Slf4j
+@Aspect
+@Component
+public class DoctorAuditAspect {
+
+    @Resource
+    private HtDoctorMapper htDoctorMapper;
+
+//    @Pointcut("@annotation(com.ccsens.question.annotation.DoctorAudit)")
+//    public void doctorAuditAdvice(){}
+//    @Around("doctorAuditAdvice()")
+//    public Object around(ProceedingJoinPoint pjp) throws Throwable {
+//
+//        Object[] args = pjp.getArgs();
+//        QueryDto dto = (QueryDto) args[0];
+//        Long userId = dto.getUserId();
+//        HtDoctorExample doctorExample = new HtDoctorExample();
+//        doctorExample.createCriteria().andUserIdEqualTo(userId).andAuditStateEqualTo(Constant.Ht.Doctor.CHECK_SUCCESS);
+//        List<HtDoctor> doctors = htDoctorMapper.selectByExample(doctorExample);
+//        if (CollectionUtils.isEmpty(doctors)) {
+//            log.info("{}没有审核信息", userId);
+//            return JsonResponse.newInstance().ok(CodeEnum.AUDIT_NOT_PASS);
+//        }
+//
+//        Map<String, Object> map = dto.getOtherMsg();
+//        map.put(Constant.Ht.DOCTOR_PARAM, doctors.get(0));
+//        Object result =pjp.proceed();
+//
+//        return result;
+//    }
+
+}

question/src/main/java/com/ccsens/question/bean/dto/DoctorDto.java

@@ -0,0 +1,80 @@
+package com.ccsens.question.bean.dto;
+
+import com.ccsens.question.bean.po.HtDoctor;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.beans.BeanUtils;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @program: ptpro
+ * @description:
+ * @author: wu huijuan
+ * @create: 2019/10/31 10:35
+ */
+public class DoctorDto {
+    @ApiModel("DoctorDtoSubmit")
+    @Data
+    public static class Submit{
+        @ApiModelProperty("职务ID")
+        @NotNull(message = "职务不能为空")
+        private Long positionId;
+        @ApiModelProperty("职称ID")
+        @NotNull(message = "职称不能为空")
+        private Long titleId;
+        @ApiModelProperty("姓名")
+        @NotNull(message = "姓名不能为空")
+        private String name;
+        @ApiModelProperty("性别（0：男 1：女）")
+        @NotNull(message = "性别不能为空")
+        @Min(value = 0, message = "请选择正确的性别")
+        @Max(value = 1, message = "请选择正确的性别")
+        private Byte sex;
+        @ApiModelProperty("年龄")
+        @NotNull(message = "年龄不能为空")
+        @Min(value = 0, message = "请输入正确年龄")
+        @Max(value = 150, message = "请输入正确年龄")
+        private Integer age;
+
+        public HtDoctor copy() {
+            HtDoctor doctor = new HtDoctor();
+            BeanUtils.copyProperties(this, doctor);
+            return doctor;
+        }
+    }
+
+
+
+    @ApiModel("DoctorDtoAudit")
+    @Data
+    public static class Audit{
+        @ApiModelProperty("待审核医生ID")
+        @NotNull(message="被审核医生信息不能为空")
+        private Long doctorId;
+        @ApiModelProperty("审核状态  1：审核通过 2：审核失败")
+        @NotNull(message = "医生审核状态不能为空")
+        private Byte auditState;
+    }
+
+    @ApiModel("DoctorDtoQuery")
+    @Data
+    public static class Query{
+        @ApiModelProperty("名字")
+        private String name;
+        @ApiModelProperty("职称ID")
+        private Long titleId;
+        @ApiModelProperty("医院/科室/职务ID")
+        private Long positionId;
+        @ApiModelProperty("第几页")
+        @Min(value = 1)
+        private int pageNum = 1;
+        @ApiModelProperty("每页多少条")
+        @Min(value = 1)
+        @Max(value=100)
+        private int pageSize = 10;
+    }
+}

question/src/main/java/com/ccsens/question/bean/dto/FileDto.java

@@ -0,0 +1,24 @@
+package com.ccsens.question.bean.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @description:
+ * @author: wuHuiJuan
+ * @create: 2019/12/17 18:05
+ */
+public class FileDto {
+
+    @ApiModel("FileDtoSave")
+    @Data
+    public static class Save{
+
+        @ApiModelProperty("文件base64字符串")
+        @NotNull(message = "文件内容不允许为空")
+        private String base64;
+    }
+}

question/src/main/java/com/ccsens/question/bean/dto/PatientDto.java

@@ -0,0 +1,146 @@
+package com.ccsens.question.bean.dto;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ccsens.question.bean.po.HtPatient;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.beans.BeanUtils;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @program: ptpro
+ * @description: 病人相关接口请求参数
+ * @author: wu huijuan
+ * @create: 2019/10/31 09:28
+ */
+public class PatientDto {
+
+    @ApiModel("PatientDtoRecorder")
+    @Data
+    public static class Recorder{
+        @ApiModelProperty("第几页")
+        @Min(value = 1)
+        private int pageNum = 1;
+        @ApiModelProperty("每页多少条")
+        @Min(value = 1)
+        @Max(value=100)
+        private int pageSize = 10;
+    }
+
+    @ApiModel("PatientDtoQuery")
+    @Data
+    public static class Query{
+        @ApiModelProperty("报告单ID")
+        private Long reportId;
+        @ApiModelProperty("病人ID")
+        private Long id;
+        @ApiModelProperty("病人名字")
+        private String name;
+        @ApiModelProperty("病人门诊号")
+        private String patientNumber;
+        @ApiModelProperty("病人住院号")
+        private String hospitalNumber;
+        @ApiModelProperty("病人身份证号")
+        private String idcard;
+    }
+
+    @Data
+    @ApiModel("PatientDtoEdit")
+    public static class Edit{
+        @ApiModelProperty("病人id")
+        private Long id;
+        @ApiModelProperty("病人用户id")
+        private Long userId;
+        @NotNull(message = "请填写名字")
+        @ApiModelProperty("病人名字")
+        private String name;
+        @ApiModelProperty("病人门诊号")
+        private String patientNumber;
+        @ApiModelProperty("病人住院号")
+        private String hospitalNumber;
+        @NotNull(message="请填写身份证号")
+        @ApiModelProperty("病人身份证号")
+        private String idcard;
+        @NotNull(message = "请选择性别")
+        @ApiModelProperty("性别（0：男 1：女）")
+        private Byte sex;
+        @NotNull(message = "请选择婚姻状况")
+        @ApiModelProperty("婚姻状况（1：未婚2：已婚 3：离异 4：分居 5：丧偶 6：同居 7：其他 ）")
+        private Byte maritalStatus;
+        @NotNull(message = "请选择教育程度")
+        @ApiModelProperty("教育程度（1：文盲 2：小学 3：初中 4：高中 5：大学 6：大学以上 7：其他）")
+        private Byte educationalStatus;
+        @NotNull(message = "请选择受教育时间")
+        @ApiModelProperty("受教育时间（年或月）")
+        private String educationalStatusUnit;
+        @ApiModelProperty("民族")
+        private String nation;
+        @ApiModelProperty("籍贯")
+        private String nativePlace;
+        @NotNull(message="请选择职业")
+        @ApiModelProperty("职业（1：农林牧渔水利生产人员 2：教师 3：医务工作者 4：专业技术人员 5：生产、运输设备操作人员及有关人员6：商业、服务业人员7：国家机关、事业单位、企业负责人8：国家机关、事业单位、企业办事人员和有关人员9：军人 10：媒体、文体类工作人员 11：在校学生 12：未就业 13：家务 14：其他")
+        private Byte career;
+        @NotNull(message="请填写生育数量")
+        @ApiModelProperty("生育数量")
+        private Integer birthNumber;
+        @ApiModelProperty("绝经年龄（女）")
+        private Integer menopauseAge;
+        @NotNull(message="请填写联系人")
+        @ApiModelProperty("联系人")
+        private String contact;
+        @NotNull(message = "请填写手机")
+        @ApiModelProperty("手机")
+        private String mobile;
+        @ApiModelProperty("电话")
+        private String phone;
+        @ApiModelProperty("省份")
+        private String province;
+        @ApiModelProperty("城市")
+        private String city;
+        @ApiModelProperty("住址")
+        private String address;
+        @ApiModelProperty("住所（1：自己家中 2：养老院 3：其他）")
+        private Byte domicile;
+        @ApiModelProperty("独立生活能力（1：能够独立生活 2：需要他人帮助完成复杂活动 3：需要他人帮助完成基本活动 4：完全依赖他人生活 5：未知 6：其他）")
+        private Byte independentLivingSkills;
+        @ApiModelProperty("居住状态（1：独居 2：与配偶或对象或子女 3：与亲戚或朋友居住）")
+        private Byte dwellingState;
+        @ApiModelProperty("备注")
+        private String remark;
+        @ApiModelProperty("第一次录入人ID")
+        private Long recorder;
+
+        /**复制当前的对象为HtPatient*/
+        public HtPatient copy(){
+            HtPatient patient = new HtPatient();
+            BeanUtils.copyProperties(this, patient);
+            return patient;
+        }
+    }
+
+    @Data
+    @ApiModel("PatientDtoQueryOtherMsg")
+    public static class QueryOtherMsg {
+        @ApiModelProperty("病人id")
+        @NotNull(message = "病人ID不能为空")
+        private Long patientId;
+        @ApiModelProperty("类型")
+        @NotNull(message="查询类型不能为空")
+        private String queryType;
+    }
+
+    @Data
+    @ApiModel("PatientDtoEditOtherMsg")
+    public static class EditOtherMsg {
+        @ApiModelProperty("病人其他信息")
+        @NotNull(message="病人其他信息不能为空")
+        private JSONObject model;
+        @ApiModelProperty("类型")
+        @NotNull(message="病人类型不能为空")
+        private String editType;
+    }
+}

question/src/main/java/com/ccsens/question/bean/dto/PatientReportDto.java

@@ -0,0 +1,186 @@
+package com.ccsens.question.bean.dto;
+
+import com.ccsens.question.bean.po.HtPatientReport;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.beans.BeanUtils;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @program: ptpro
+ * @description: 报告单请求参数
+ * @author: wu huijuan
+ * @create: 2019/10/31 10:22
+ */
+public class PatientReportDto {
+
+    @Data
+    @ApiModel("忽略未完成的报告单")
+    public static class Ignore{
+        @ApiModelProperty("病人报告单ID")
+        @NotNull(message = "病人报告单ID不能为空")
+        private Long id;
+    }
+
+    @ApiModel("PatientReportDtoGenerate")
+    @Data
+    public static class Generate{
+        @ApiModelProperty("病人ID")
+        @NotNull(message = "病人ID不能为空")
+        private Long patientId;
+    }
+
+    @ApiModel("PatientReportDtoEdit")
+    @Data
+    public static class Edit{
+        @ApiModelProperty("初步印象")
+        @NotNull(message="初步印象不能为空")
+        private String initialImpression;
+        @ApiModelProperty("临床诊断")
+        @NotNull(message = "临床诊断不能为空")
+        private String clinicalDiagnosis;
+        @ApiModelProperty("床号")
+        private String bedNumber;
+        @ApiModelProperty("病人年龄 ")
+        private Byte patientAge;
+        @ApiModelProperty("严重程度(1:轻度 2：中度 3：重度) ")
+        private Byte pasi;
+        @ApiModelProperty("科别")
+        private String department;
+        @ApiModelProperty("病人报告单ID")
+        @NotNull(message = "报告单ID不允许为空")
+        private Long id;
+
+        public HtPatientReport copy(){
+            HtPatientReport report = new HtPatientReport();
+            BeanUtils.copyProperties(this, report);
+            report.setReportTime(System.currentTimeMillis());
+            return report;
+        }
+    }
+
+    @ApiModel("PatientReportDtoQueryReports")
+    @Data
+    public static class QueryReports{
+        @ApiModelProperty("病人ID")
+        private Long patientId;
+        @ApiModelProperty("第几页")
+        @Min(value = 1)
+        private int pageNum = 1;
+        @ApiModelProperty("每页多少条")
+        @Min(value = 1)
+        @Max(value=100)
+        private int pageSize = 10;
+    }
+
+    @ApiModel("PatientReportDtoQueryDetail")
+    @Data
+    public static class QueryDetail{
+        @ApiModelProperty("病人报告单ID")
+        @NotNull(message = "病人报告单ID不能为空")
+        private Long id;
+        @ApiModelProperty("是否需要rey 默认为0 0全部查询导出 1不导出rey 2只导出rey")
+        private int rey = 0;
+    }
+    
+
+    /**医生对报告单权限*/
+    @ApiModel("PatientReportDtoAuthority")
+    @Data
+    public static class Authority{
+        @ApiModelProperty("病人报告单ID")
+        @NotNull(message = "病人报告单ID不能为空")
+        private Long id;
+    }
+
+    @ApiModel("医生ID")
+    @Data
+    public static class Doctor{
+        @ApiModelProperty("医生ID")
+        @NotNull(message = "医生ID不能为空")
+        private Long id;
+        @ApiModelProperty("第几页")
+        @Min(value = 1)
+        private int pageNum = 1;
+        @ApiModelProperty("每页多少条")
+        @Min(value = 1)
+        @Max(value=100)
+        private int pageSize = 10;
+    }
+
+
+    @ApiModel("查询报告单")
+    @Data
+    public static class AdminQueryReport {
+        @ApiModelProperty("病人年龄-开始")
+        private Byte startAge;
+        @ApiModelProperty("病人年龄-结束")
+        private Byte endAge;
+        @ApiModelProperty("性别")
+        private Byte patientSex;
+        @ApiModelProperty("临床诊断")
+        private String clinicalDiagnosis;
+        @ApiModelProperty("严重程度")
+        private Byte pasi;
+        @ApiModelProperty("开始时间")
+        private Long startTime;
+        @ApiModelProperty("结束时间")
+        private Long endTime;
+        @ApiModelProperty("第几页")
+        @Min(value = 1)
+        private int pageNum = 1;
+        @ApiModelProperty("每页多少条")
+        @Min(value = 1)
+        @Max(value=100)
+        private int pageSize = 10;
+    }
+
+    @ApiModel("临床诊断统计请求")
+    @Data
+    public static class ClinicalDiagnosis{
+
+    }
+
+    @ApiModel("年龄性别统计请求")
+    @Data
+    public static class AgeAndSex{
+
+    }
+
+
+    @ApiModel("日期统计请求")
+    @Data
+    public static class Day {
+        @ApiModelProperty("开始时间")
+        private Long startTime;
+        @ApiModelProperty("结束时间")
+        private Long endTime;
+    }
+
+    @ApiModel("查询报告单答题信息")
+    @Data
+    public static class QueryReportAnswer {
+        @NotNull(message = "报到单id不能为空")
+        @ApiModelProperty("报告单id")
+        private Long id;
+        @NotBlank(message = "测评类型不能为空")
+        @ApiModelProperty("测评类型")
+        private String evaluationCode;
+    }
+
+    @ApiModel("查询病友画图原图")
+    @Data
+    public static class QueryQuestionImg {
+        @NotNull(message = "报到单id不能为空")
+        @ApiModelProperty("报告单id")
+        private Long id;
+        @NotNull(message = "题目id不能为空")
+        @ApiModelProperty("题目id")
+        private Long questionId;
+    }
+}

question/src/main/java/com/ccsens/question/bean/dto/PatientReportSearchDto.java

@@ -0,0 +1,38 @@
+package com.ccsens.question.bean.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: whj
+ * @time: 2021/3/10 16:21
+ */
+public class PatientReportSearchDto {
+    @Data
+    @ApiModel("搜索条件-请求参数")
+    public static class SearchParam{
+        @ApiModelProperty("查询类型")
+        @NotEmpty(message = "请输入查询报告单类型")
+        private String parentCode;
+    }
+
+    @Data
+    @ApiModel("搜索报告单参数列表-请求")
+    public static class SearchList {
+        private List<Search> codes;
+    }
+
+    @Data
+    @ApiModel("搜索报告单参数-请求")
+    public static class Search {
+        @NotEmpty(message="请选择查询类型")
+        private String code;
+        private Integer start;
+        private Integer end;
+    }
+}

question/src/main/java/com/ccsens/question/bean/dto/PositionDto.java

@@ -0,0 +1,21 @@
+package com.ccsens.question.bean.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:职务和职称
+ * @author: wu huijuan
+ * @create: 2019/11/19 16:24
+ */
+public class PositionDto {
+    @ApiModel("PositionDtoPosition")
+    @Data
+    public static class Position {
+        @ApiModelProperty("上级部门ID 为空，默认查所有医院")
+        private Long superiorDepartmentId;
+    }
+
+
+}

question/src/main/java/com/ccsens/question/bean/dto/QuestionDto.java

@@ -0,0 +1,122 @@
+package com.ccsens.question.bean.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: wu huijuan
+ * @create: 2019/11/08 15:37
+ */
+public class QuestionDto {
+
+    @Data
+    @ApiModel("QuestionDtoQuery")
+    public static class Query{
+
+        @ApiModelProperty("病人报告单ID")
+        private Long patientReportId;
+        @ApiModelProperty("测评类型")
+        @NotNull(message = "测评类型不能为空")
+        private String code;
+        @ApiModelProperty("题号")
+        @NotNull(message = "题号不能为空")
+        private int num;
+    }
+
+    @Data
+    @ApiModel("QuestionDtoScore")
+    public static class Score{
+        @ApiModelProperty("病人报告单ID")
+        private Long patientReportId;
+        @ApiModelProperty("试题ID")
+        @NotNull(message = "试题ID不能为空")
+        private Long questionId;
+        @ApiModelProperty("选项集合")
+        private List<Option> options;
+        @ApiModelProperty("病友画图或录音")
+        private String path;
+    }
+    @Data
+    @ApiModel("QuestionDtoOption")
+    public static class Option{
+        @NotNull(message = "选项ID不能为空")
+        @ApiModelProperty("选项ID")
+        private Long id;
+        @ApiModelProperty("答题时间")
+        private Long answerTime;
+    }
+
+    @Data
+    @ApiModel("添加画图的信息")
+    public static class SavePatientCanvas{
+        @NotNull(message = "选项ID不能为空")
+        @ApiModelProperty("报告单id")
+        private Long patientReportId;
+        @NotNull(message = "测评试题id不能为空")
+        @ApiModelProperty("测评试题id")
+        private Long questionId;
+        @ApiModelProperty("打开画板时间")
+        private Long openCanvasTime;
+        @ApiModelProperty("开始画图时间")
+        private Long beginTime;
+        @ApiModelProperty("轨迹，每个字符串是一条轨迹，轨迹内格式（x,y,time;x,y,time;.....）")
+        private List<String> points;
+        @ApiModelProperty("画板大小")
+        private Canvas canvas;
+        @ApiModelProperty("笔触信息")
+        private CanvasLine line;
+        @ApiModelProperty("超出占比")
+        private String beyondProportion;
+    }
+    @Data
+    @ApiModel("画板信息")
+    public static class Canvas{
+        @ApiModelProperty("画板宽")
+        private Integer width;
+        @ApiModelProperty("画板高")
+        private Integer height;
+    }
+    @Data
+    @ApiModel("笔触信息")
+    public static class CanvasLine{
+        @ApiModelProperty("笔触颜色")
+        private String color;
+        @ApiModelProperty("笔触粗细")
+        private Integer width;
+    }
+
+    @Data
+    @ApiModel("查找画图的信息")
+    public static class QueryPatientCanvas{
+        @NotNull(message = "选项ID不能为空")
+        @ApiModelProperty("报告单id")
+        private Long patientReportId;
+        @NotNull(message = "测评试题id不能为空")
+        @ApiModelProperty("测评试题id")
+        private Long questionId;
+    }
+
+    @Data
+    @ApiModel("删除画图笔画")
+    public static class DelPatientCanvas{
+        @ApiModelProperty("轨迹的id")
+        private List<Long> pointId;
+    }
+
+    @Data
+    @ApiModel("查询测试类型")
+    public static class QueryReportCode{
+        @NotBlank(message = "上级code不能为空")
+        @ApiModelProperty("上级code")
+        private String code;
+        @ApiModelProperty("是否显示报告单 0:否 1:是，默认为是")
+        private byte showReport = 1;
+    }
+
+}

question/src/main/java/com/ccsens/question/bean/po/HtDoctor.java

@@ -0,0 +1,172 @@
+package com.ccsens.question.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class HtDoctor implements Serializable {
+    private Long id;
+
+    private Long userId;
+
+    private Long positionId;
+
+    private Long titleId;
+
+    private String name;
+
+    private Byte sex;
+
+    private Integer age;
+
+    private Long auditorId;
+
+    private Byte auditState;
+
+    private String remark;
+
+    private String sharePatientEdit;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Byte isDel;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getPositionId() {
+        return positionId;
+    }
+
+    public void setPositionId(Long positionId) {
+        this.positionId = positionId;
+    }
+
+    public Long getTitleId() {
+        return titleId;
+    }
+
+    public void setTitleId(Long titleId) {
+        this.titleId = titleId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public Byte getSex() {
+        return sex;
+    }
+
+    public void setSex(Byte sex) {
+        this.sex = sex;
+    }
+
+    public Integer getAge() {
+        return age;
+    }
+
+    public void setAge(Integer age) {
+        this.age = age;
+    }
+
+    public Long getAuditorId() {
+        return auditorId;
+    }
+
+    public void setAuditorId(Long auditorId) {
+        this.auditorId = auditorId;
+    }
+
+    public Byte getAuditState() {
+        return auditState;
+    }
+
+    public void setAuditState(Byte auditState) {
+        this.auditState = auditState;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public String getSharePatientEdit() {
+        return sharePatientEdit;
+    }
+
+    public void setSharePatientEdit(String sharePatientEdit) {
+        this.sharePatientEdit = sharePatientEdit == null ? null : sharePatientEdit.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Byte isDel) {
+        this.isDel = isDel;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", userId=").append(userId);
+        sb.append(", positionId=").append(positionId);
+        sb.append(", titleId=").append(titleId);
+        sb.append(", name=").append(name);
+        sb.append(", sex=").append(sex);
+        sb.append(", age=").append(age);
+        sb.append(", auditorId=").append(auditorId);
+        sb.append(", auditState=").append(auditState);
+        sb.append(", remark=").append(remark);
+        sb.append(", sharePatientEdit=").append(sharePatientEdit);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", isDel=").append(isDel);
+        sb.append("]");
+        return sb.toString();
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtDoctorAudit.java

@@ -0,0 +1,95 @@
+package com.ccsens.question.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class HtDoctorAudit implements Serializable {
+    private Long id;
+
+    private Long doctorId;
+
+    private Long auditorId;
+
+    private String remark;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Byte isDel;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getDoctorId() {
+        return doctorId;
+    }
+
+    public void setDoctorId(Long doctorId) {
+        this.doctorId = doctorId;
+    }
+
+    public Long getAuditorId() {
+        return auditorId;
+    }
+
+    public void setAuditorId(Long auditorId) {
+        this.auditorId = auditorId;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Byte isDel) {
+        this.isDel = isDel;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", doctorId=").append(doctorId);
+        sb.append(", auditorId=").append(auditorId);
+        sb.append(", remark=").append(remark);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", isDel=").append(isDel);
+        sb.append("]");
+        return sb.toString();
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtDoctorAuditExample.java

@@ -0,0 +1,631 @@
+package com.ccsens.question.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class HtDoctorAuditExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public HtDoctorAuditExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andDoctorIdIsNull() {
+            addCriterion("doctor_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDoctorIdIsNotNull() {
+            addCriterion("doctor_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDoctorIdEqualTo(Long value) {
+            addCriterion("doctor_id =", value, "doctorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDoctorIdNotEqualTo(Long value) {
+            addCriterion("doctor_id <>", value, "doctorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDoctorIdGreaterThan(Long value) {
+            addCriterion("doctor_id >", value, "doctorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDoctorIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("doctor_id >=", value, "doctorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDoctorIdLessThan(Long value) {
+            addCriterion("doctor_id <", value, "doctorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDoctorIdLessThanOrEqualTo(Long value) {
+            addCriterion("doctor_id <=", value, "doctorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDoctorIdIn(List<Long> values) {
+            addCriterion("doctor_id in", values, "doctorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDoctorIdNotIn(List<Long> values) {
+            addCriterion("doctor_id not in", values, "doctorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDoctorIdBetween(Long value1, Long value2) {
+            addCriterion("doctor_id between", value1, value2, "doctorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDoctorIdNotBetween(Long value1, Long value2) {
+            addCriterion("doctor_id not between", value1, value2, "doctorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditorIdIsNull() {
+            addCriterion("auditor_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditorIdIsNotNull() {
+            addCriterion("auditor_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditorIdEqualTo(Long value) {
+            addCriterion("auditor_id =", value, "auditorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditorIdNotEqualTo(Long value) {
+            addCriterion("auditor_id <>", value, "auditorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditorIdGreaterThan(Long value) {
+            addCriterion("auditor_id >", value, "auditorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditorIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("auditor_id >=", value, "auditorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditorIdLessThan(Long value) {
+            addCriterion("auditor_id <", value, "auditorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditorIdLessThanOrEqualTo(Long value) {
+            addCriterion("auditor_id <=", value, "auditorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditorIdIn(List<Long> values) {
+            addCriterion("auditor_id in", values, "auditorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditorIdNotIn(List<Long> values) {
+            addCriterion("auditor_id not in", values, "auditorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditorIdBetween(Long value1, Long value2) {
+            addCriterion("auditor_id between", value1, value2, "auditorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditorIdNotBetween(Long value1, Long value2) {
+            addCriterion("auditor_id not between", value1, value2, "auditorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNull() {
+            addCriterion("remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNotNull() {
+            addCriterion("remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkEqualTo(String value) {
+            addCriterion("remark =", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotEqualTo(String value) {
+            addCriterion("remark <>", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThan(String value) {
+            addCriterion("remark >", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("remark >=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThan(String value) {
+            addCriterion("remark <", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThanOrEqualTo(String value) {
+            addCriterion("remark <=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLike(String value) {
+            addCriterion("remark like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotLike(String value) {
+            addCriterion("remark not like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIn(List<String> values) {
+            addCriterion("remark in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotIn(List<String> values) {
+            addCriterion("remark not in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkBetween(String value1, String value2) {
+            addCriterion("remark between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotBetween(String value1, String value2) {
+            addCriterion("remark not between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelIsNull() {
+            addCriterion("is_del is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelIsNotNull() {
+            addCriterion("is_del is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelEqualTo(Byte value) {
+            addCriterion("is_del =", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelNotEqualTo(Byte value) {
+            addCriterion("is_del <>", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelGreaterThan(Byte value) {
+            addCriterion("is_del >", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelGreaterThanOrEqualTo(Byte value) {
+            addCriterion("is_del >=", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelLessThan(Byte value) {
+            addCriterion("is_del <", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelLessThanOrEqualTo(Byte value) {
+            addCriterion("is_del <=", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelIn(List<Byte> values) {
+            addCriterion("is_del in", values, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelNotIn(List<Byte> values) {
+            addCriterion("is_del not in", values, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelBetween(Byte value1, Byte value2) {
+            addCriterion("is_del between", value1, value2, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelNotBetween(Byte value1, Byte value2) {
+            addCriterion("is_del not between", value1, value2, "isDel");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtOperationLog.java

@@ -0,0 +1,128 @@
+package com.ccsens.question.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class HtOperationLog implements Serializable {
+    private Long id;
+
+    private Long userId;
+
+    private Byte type;
+
+    private String tableName;
+
+    private String dataId;
+
+    private String content;
+
+    private String remark;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Byte isDel;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Byte getType() {
+        return type;
+    }
+
+    public void setType(Byte type) {
+        this.type = type;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName == null ? null : tableName.trim();
+    }
+
+    public String getDataId() {
+        return dataId;
+    }
+
+    public void setDataId(String dataId) {
+        this.dataId = dataId == null ? null : dataId.trim();
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content == null ? null : content.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Byte isDel) {
+        this.isDel = isDel;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", userId=").append(userId);
+        sb.append(", type=").append(type);
+        sb.append(", tableName=").append(tableName);
+        sb.append(", dataId=").append(dataId);
+        sb.append(", content=").append(content);
+        sb.append(", remark=").append(remark);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", isDel=").append(isDel);
+        sb.append("]");
+        return sb.toString();
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtOperationLogExample.java

@@ -0,0 +1,841 @@
+package com.ccsens.question.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class HtOperationLogExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public HtOperationLogExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNull() {
+            addCriterion("user_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNotNull() {
+            addCriterion("user_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdEqualTo(Long value) {
+            addCriterion("user_id =", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotEqualTo(Long value) {
+            addCriterion("user_id <>", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThan(Long value) {
+            addCriterion("user_id >", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("user_id >=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThan(Long value) {
+            addCriterion("user_id <", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThanOrEqualTo(Long value) {
+            addCriterion("user_id <=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIn(List<Long> values) {
+            addCriterion("user_id in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotIn(List<Long> values) {
+            addCriterion("user_id not in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdBetween(Long value1, Long value2) {
+            addCriterion("user_id between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotBetween(Long value1, Long value2) {
+            addCriterion("user_id not between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNull() {
+            addCriterion("type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(Byte value) {
+            addCriterion("type =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(Byte value) {
+            addCriterion("type <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(Byte value) {
+            addCriterion("type >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(Byte value) {
+            addCriterion("type >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(Byte value) {
+            addCriterion("type <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(Byte value) {
+            addCriterion("type <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<Byte> values) {
+            addCriterion("type in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<Byte> values) {
+            addCriterion("type not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(Byte value1, Byte value2) {
+            addCriterion("type between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(Byte value1, Byte value2) {
+            addCriterion("type not between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameIsNull() {
+            addCriterion("table_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameIsNotNull() {
+            addCriterion("table_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameEqualTo(String value) {
+            addCriterion("table_name =", value, "tableName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameNotEqualTo(String value) {
+            addCriterion("table_name <>", value, "tableName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameGreaterThan(String value) {
+            addCriterion("table_name >", value, "tableName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameGreaterThanOrEqualTo(String value) {
+            addCriterion("table_name >=", value, "tableName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameLessThan(String value) {
+            addCriterion("table_name <", value, "tableName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameLessThanOrEqualTo(String value) {
+            addCriterion("table_name <=", value, "tableName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameLike(String value) {
+            addCriterion("table_name like", value, "tableName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameNotLike(String value) {
+            addCriterion("table_name not like", value, "tableName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameIn(List<String> values) {
+            addCriterion("table_name in", values, "tableName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameNotIn(List<String> values) {
+            addCriterion("table_name not in", values, "tableName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameBetween(String value1, String value2) {
+            addCriterion("table_name between", value1, value2, "tableName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameNotBetween(String value1, String value2) {
+            addCriterion("table_name not between", value1, value2, "tableName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdIsNull() {
+            addCriterion("data_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdIsNotNull() {
+            addCriterion("data_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdEqualTo(String value) {
+            addCriterion("data_id =", value, "dataId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdNotEqualTo(String value) {
+            addCriterion("data_id <>", value, "dataId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdGreaterThan(String value) {
+            addCriterion("data_id >", value, "dataId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdGreaterThanOrEqualTo(String value) {
+            addCriterion("data_id >=", value, "dataId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdLessThan(String value) {
+            addCriterion("data_id <", value, "dataId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdLessThanOrEqualTo(String value) {
+            addCriterion("data_id <=", value, "dataId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdLike(String value) {
+            addCriterion("data_id like", value, "dataId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdNotLike(String value) {
+            addCriterion("data_id not like", value, "dataId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdIn(List<String> values) {
+            addCriterion("data_id in", values, "dataId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdNotIn(List<String> values) {
+            addCriterion("data_id not in", values, "dataId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdBetween(String value1, String value2) {
+            addCriterion("data_id between", value1, value2, "dataId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdNotBetween(String value1, String value2) {
+            addCriterion("data_id not between", value1, value2, "dataId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentIsNull() {
+            addCriterion("content is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentIsNotNull() {
+            addCriterion("content is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentEqualTo(String value) {
+            addCriterion("content =", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentNotEqualTo(String value) {
+            addCriterion("content <>", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentGreaterThan(String value) {
+            addCriterion("content >", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentGreaterThanOrEqualTo(String value) {
+            addCriterion("content >=", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentLessThan(String value) {
+            addCriterion("content <", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentLessThanOrEqualTo(String value) {
+            addCriterion("content <=", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentLike(String value) {
+            addCriterion("content like", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentNotLike(String value) {
+            addCriterion("content not like", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentIn(List<String> values) {
+            addCriterion("content in", values, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentNotIn(List<String> values) {
+            addCriterion("content not in", values, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentBetween(String value1, String value2) {
+            addCriterion("content between", value1, value2, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentNotBetween(String value1, String value2) {
+            addCriterion("content not between", value1, value2, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNull() {
+            addCriterion("remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNotNull() {
+            addCriterion("remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkEqualTo(String value) {
+            addCriterion("remark =", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotEqualTo(String value) {
+            addCriterion("remark <>", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThan(String value) {
+            addCriterion("remark >", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("remark >=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThan(String value) {
+            addCriterion("remark <", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThanOrEqualTo(String value) {
+            addCriterion("remark <=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLike(String value) {
+            addCriterion("remark like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotLike(String value) {
+            addCriterion("remark not like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIn(List<String> values) {
+            addCriterion("remark in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotIn(List<String> values) {
+            addCriterion("remark not in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkBetween(String value1, String value2) {
+            addCriterion("remark between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotBetween(String value1, String value2) {
+            addCriterion("remark not between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelIsNull() {
+            addCriterion("is_del is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelIsNotNull() {
+            addCriterion("is_del is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelEqualTo(Byte value) {
+            addCriterion("is_del =", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelNotEqualTo(Byte value) {
+            addCriterion("is_del <>", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelGreaterThan(Byte value) {
+            addCriterion("is_del >", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelGreaterThanOrEqualTo(Byte value) {
+            addCriterion("is_del >=", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelLessThan(Byte value) {
+            addCriterion("is_del <", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelLessThanOrEqualTo(Byte value) {
+            addCriterion("is_del <=", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelIn(List<Byte> values) {
+            addCriterion("is_del in", values, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelNotIn(List<Byte> values) {
+            addCriterion("is_del not in", values, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelBetween(Byte value1, Byte value2) {
+            addCriterion("is_del between", value1, value2, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelNotBetween(Byte value1, Byte value2) {
+            addCriterion("is_del not between", value1, value2, "isDel");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtPatient.java

@@ -0,0 +1,337 @@
+package com.ccsens.question.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class HtPatient implements Serializable {
+    private Long id;
+
+    private Long userId;
+
+    private String name;
+
+    private String patientNumber;
+
+    private String hospitalNumber;
+
+    private String idcard;
+
+    private Byte sex;
+
+    private Byte maritalStatus;
+
+    private Byte educationalStatus;
+
+    private String educationalStatusUnit;
+
+    private String nation;
+
+    private String nativePlace;
+
+    private Byte career;
+
+    private Integer birthNumber;
+
+    private Integer menopauseAge;
+
+    private String contact;
+
+    private String mobile;
+
+    private String phone;
+
+    private String province;
+
+    private String city;
+
+    private String address;
+
+    private Byte domicile;
+
+    private Byte independentLivingSkills;
+
+    private Byte dwellingState;
+
+    private String remark;
+
+    private Long recorder;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Byte isDel;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getPatientNumber() {
+        return patientNumber;
+    }
+
+    public void setPatientNumber(String patientNumber) {
+        this.patientNumber = patientNumber == null ? null : patientNumber.trim();
+    }
+
+    public String getHospitalNumber() {
+        return hospitalNumber;
+    }
+
+    public void setHospitalNumber(String hospitalNumber) {
+        this.hospitalNumber = hospitalNumber == null ? null : hospitalNumber.trim();
+    }
+
+    public String getIdcard() {
+        return idcard;
+    }
+
+    public void setIdcard(String idcard) {
+        this.idcard = idcard == null ? null : idcard.trim();
+    }
+
+    public Byte getSex() {
+        return sex;
+    }
+
+    public void setSex(Byte sex) {
+        this.sex = sex;
+    }
+
+    public Byte getMaritalStatus() {
+        return maritalStatus;
+    }
+
+    public void setMaritalStatus(Byte maritalStatus) {
+        this.maritalStatus = maritalStatus;
+    }
+
+    public Byte getEducationalStatus() {
+        return educationalStatus;
+    }
+
+    public void setEducationalStatus(Byte educationalStatus) {
+        this.educationalStatus = educationalStatus;
+    }
+
+    public String getEducationalStatusUnit() {
+        return educationalStatusUnit;
+    }
+
+    public void setEducationalStatusUnit(String educationalStatusUnit) {
+        this.educationalStatusUnit = educationalStatusUnit == null ? null : educationalStatusUnit.trim();
+    }
+
+    public String getNation() {
+        return nation;
+    }
+
+    public void setNation(String nation) {
+        this.nation = nation == null ? null : nation.trim();
+    }
+
+    public String getNativePlace() {
+        return nativePlace;
+    }
+
+    public void setNativePlace(String nativePlace) {
+        this.nativePlace = nativePlace == null ? null : nativePlace.trim();
+    }
+
+    public Byte getCareer() {
+        return career;
+    }
+
+    public void setCareer(Byte career) {
+        this.career = career;
+    }
+
+    public Integer getBirthNumber() {
+        return birthNumber;
+    }
+
+    public void setBirthNumber(Integer birthNumber) {
+        this.birthNumber = birthNumber;
+    }
+
+    public Integer getMenopauseAge() {
+        return menopauseAge;
+    }
+
+    public void setMenopauseAge(Integer menopauseAge) {
+        this.menopauseAge = menopauseAge;
+    }
+
+    public String getContact() {
+        return contact;
+    }
+
+    public void setContact(String contact) {
+        this.contact = contact == null ? null : contact.trim();
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile == null ? null : mobile.trim();
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone == null ? null : phone.trim();
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province == null ? null : province.trim();
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city == null ? null : city.trim();
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address == null ? null : address.trim();
+    }
+
+    public Byte getDomicile() {
+        return domicile;
+    }
+
+    public void setDomicile(Byte domicile) {
+        this.domicile = domicile;
+    }
+
+    public Byte getIndependentLivingSkills() {
+        return independentLivingSkills;
+    }
+
+    public void setIndependentLivingSkills(Byte independentLivingSkills) {
+        this.independentLivingSkills = independentLivingSkills;
+    }
+
+    public Byte getDwellingState() {
+        return dwellingState;
+    }
+
+    public void setDwellingState(Byte dwellingState) {
+        this.dwellingState = dwellingState;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Long getRecorder() {
+        return recorder;
+    }
+
+    public void setRecorder(Long recorder) {
+        this.recorder = recorder;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Byte isDel) {
+        this.isDel = isDel;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", userId=").append(userId);
+        sb.append(", name=").append(name);
+        sb.append(", patientNumber=").append(patientNumber);
+        sb.append(", hospitalNumber=").append(hospitalNumber);
+        sb.append(", idcard=").append(idcard);
+        sb.append(", sex=").append(sex);
+        sb.append(", maritalStatus=").append(maritalStatus);
+        sb.append(", educationalStatus=").append(educationalStatus);
+        sb.append(", educationalStatusUnit=").append(educationalStatusUnit);
+        sb.append(", nation=").append(nation);
+        sb.append(", nativePlace=").append(nativePlace);
+        sb.append(", career=").append(career);
+        sb.append(", birthNumber=").append(birthNumber);
+        sb.append(", menopauseAge=").append(menopauseAge);
+        sb.append(", contact=").append(contact);
+        sb.append(", mobile=").append(mobile);
+        sb.append(", phone=").append(phone);
+        sb.append(", province=").append(province);
+        sb.append(", city=").append(city);
+        sb.append(", address=").append(address);
+        sb.append(", domicile=").append(domicile);
+        sb.append(", independentLivingSkills=").append(independentLivingSkills);
+        sb.append(", dwellingState=").append(dwellingState);
+        sb.append(", remark=").append(remark);
+        sb.append(", recorder=").append(recorder);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", isDel=").append(isDel);
+        sb.append("]");
+        return sb.toString();
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtPatientAcp.java

@@ -0,0 +1,205 @@
+package com.ccsens.question.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class HtPatientAcp implements Serializable {
+    private Long id;
+
+    private Long patientId;
+
+    private String ct;
+
+    private String mri;
+
+    private String hcy;
+
+    private String vb12;
+
+    private String folicAcid;
+
+    private String tt3;
+
+    private String tt4;
+
+    private String tsh;
+
+    private String remark;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Byte isDel;
+
+    private Long recorder;
+
+    private String ta1;
+
+    private String tpt;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getPatientId() {
+        return patientId;
+    }
+
+    public void setPatientId(Long patientId) {
+        this.patientId = patientId;
+    }
+
+    public String getCt() {
+        return ct;
+    }
+
+    public void setCt(String ct) {
+        this.ct = ct == null ? null : ct.trim();
+    }
+
+    public String getMri() {
+        return mri;
+    }
+
+    public void setMri(String mri) {
+        this.mri = mri == null ? null : mri.trim();
+    }
+
+    public String getHcy() {
+        return hcy;
+    }
+
+    public void setHcy(String hcy) {
+        this.hcy = hcy == null ? null : hcy.trim();
+    }
+
+    public String getVb12() {
+        return vb12;
+    }
+
+    public void setVb12(String vb12) {
+        this.vb12 = vb12 == null ? null : vb12.trim();
+    }
+
+    public String getFolicAcid() {
+        return folicAcid;
+    }
+
+    public void setFolicAcid(String folicAcid) {
+        this.folicAcid = folicAcid == null ? null : folicAcid.trim();
+    }
+
+    public String getTt3() {
+        return tt3;
+    }
+
+    public void setTt3(String tt3) {
+        this.tt3 = tt3 == null ? null : tt3.trim();
+    }
+
+    public String getTt4() {
+        return tt4;
+    }
+
+    public void setTt4(String tt4) {
+        this.tt4 = tt4 == null ? null : tt4.trim();
+    }
+
+    public String getTsh() {
+        return tsh;
+    }
+
+    public void setTsh(String tsh) {
+        this.tsh = tsh == null ? null : tsh.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Byte isDel) {
+        this.isDel = isDel;
+    }
+
+    public Long getRecorder() {
+        return recorder;
+    }
+
+    public void setRecorder(Long recorder) {
+        this.recorder = recorder;
+    }
+
+    public String getTa1() {
+        return ta1;
+    }
+
+    public void setTa1(String ta1) {
+        this.ta1 = ta1 == null ? null : ta1.trim();
+    }
+
+    public String getTpt() {
+        return tpt;
+    }
+
+    public void setTpt(String tpt) {
+        this.tpt = tpt == null ? null : tpt.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", patientId=").append(patientId);
+        sb.append(", ct=").append(ct);
+        sb.append(", mri=").append(mri);
+        sb.append(", hcy=").append(hcy);
+        sb.append(", vb12=").append(vb12);
+        sb.append(", folicAcid=").append(folicAcid);
+        sb.append(", tt3=").append(tt3);
+        sb.append(", tt4=").append(tt4);
+        sb.append(", tsh=").append(tsh);
+        sb.append(", remark=").append(remark);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", isDel=").append(isDel);
+        sb.append(", recorder=").append(recorder);
+        sb.append(", ta1=").append(ta1);
+        sb.append(", tpt=").append(tpt);
+        sb.append("]");
+        return sb.toString();
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtPatientBody.java

@@ -0,0 +1,183 @@
+package com.ccsens.question.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class HtPatientBody implements Serializable {
+    private Long id;
+
+    private Long patientId;
+
+    private String height;
+
+    private String weight;
+
+    private String waistline;
+
+    private String bloodPressureShrink;
+
+    private String bloodPressureDiastole;
+
+    private String restingHeartRate;
+
+    private Byte vision;
+
+    private Byte auditory;
+
+    private String remark;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Byte isDel;
+
+    private Long recorder;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getPatientId() {
+        return patientId;
+    }
+
+    public void setPatientId(Long patientId) {
+        this.patientId = patientId;
+    }
+
+    public String getHeight() {
+        return height;
+    }
+
+    public void setHeight(String height) {
+        this.height = height == null ? null : height.trim();
+    }
+
+    public String getWeight() {
+        return weight;
+    }
+
+    public void setWeight(String weight) {
+        this.weight = weight == null ? null : weight.trim();
+    }
+
+    public String getWaistline() {
+        return waistline;
+    }
+
+    public void setWaistline(String waistline) {
+        this.waistline = waistline == null ? null : waistline.trim();
+    }
+
+    public String getBloodPressureShrink() {
+        return bloodPressureShrink;
+    }
+
+    public void setBloodPressureShrink(String bloodPressureShrink) {
+        this.bloodPressureShrink = bloodPressureShrink == null ? null : bloodPressureShrink.trim();
+    }
+
+    public String getBloodPressureDiastole() {
+        return bloodPressureDiastole;
+    }
+
+    public void setBloodPressureDiastole(String bloodPressureDiastole) {
+        this.bloodPressureDiastole = bloodPressureDiastole == null ? null : bloodPressureDiastole.trim();
+    }
+
+    public String getRestingHeartRate() {
+        return restingHeartRate;
+    }
+
+    public void setRestingHeartRate(String restingHeartRate) {
+        this.restingHeartRate = restingHeartRate == null ? null : restingHeartRate.trim();
+    }
+
+    public Byte getVision() {
+        return vision;
+    }
+
+    public void setVision(Byte vision) {
+        this.vision = vision;
+    }
+
+    public Byte getAuditory() {
+        return auditory;
+    }
+
+    public void setAuditory(Byte auditory) {
+        this.auditory = auditory;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Byte isDel) {
+        this.isDel = isDel;
+    }
+
+    public Long getRecorder() {
+        return recorder;
+    }
+
+    public void setRecorder(Long recorder) {
+        this.recorder = recorder;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", patientId=").append(patientId);
+        sb.append(", height=").append(height);
+        sb.append(", weight=").append(weight);
+        sb.append(", waistline=").append(waistline);
+        sb.append(", bloodPressureShrink=").append(bloodPressureShrink);
+        sb.append(", bloodPressureDiastole=").append(bloodPressureDiastole);
+        sb.append(", restingHeartRate=").append(restingHeartRate);
+        sb.append(", vision=").append(vision);
+        sb.append(", auditory=").append(auditory);
+        sb.append(", remark=").append(remark);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", isDel=").append(isDel);
+        sb.append(", recorder=").append(recorder);
+        sb.append("]");
+        return sb.toString();
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtPatientCanvas.java

@@ -0,0 +1,161 @@
+package com.ccsens.question.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class HtPatientCanvas implements Serializable {
+    private Long id;
+
+    private Long patientReportId;
+
+    private Long questionId;
+
+    private Long beginTime;
+
+    private Integer canvasWidth;
+
+    private Integer canvasHeight;
+
+    private String lineColor;
+
+    private Integer lineWidth;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Byte isDel;
+
+    private Long openCanvasTime;
+
+    private String beyondProportion;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getPatientReportId() {
+        return patientReportId;
+    }
+
+    public void setPatientReportId(Long patientReportId) {
+        this.patientReportId = patientReportId;
+    }
+
+    public Long getQuestionId() {
+        return questionId;
+    }
+
+    public void setQuestionId(Long questionId) {
+        this.questionId = questionId;
+    }
+
+    public Long getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(Long beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public Integer getCanvasWidth() {
+        return canvasWidth;
+    }
+
+    public void setCanvasWidth(Integer canvasWidth) {
+        this.canvasWidth = canvasWidth;
+    }
+
+    public Integer getCanvasHeight() {
+        return canvasHeight;
+    }
+
+    public void setCanvasHeight(Integer canvasHeight) {
+        this.canvasHeight = canvasHeight;
+    }
+
+    public String getLineColor() {
+        return lineColor;
+    }
+
+    public void setLineColor(String lineColor) {
+        this.lineColor = lineColor == null ? null : lineColor.trim();
+    }
+
+    public Integer getLineWidth() {
+        return lineWidth;
+    }
+
+    public void setLineWidth(Integer lineWidth) {
+        this.lineWidth = lineWidth;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Byte isDel) {
+        this.isDel = isDel;
+    }
+
+    public Long getOpenCanvasTime() {
+        return openCanvasTime;
+    }
+
+    public void setOpenCanvasTime(Long openCanvasTime) {
+        this.openCanvasTime = openCanvasTime;
+    }
+
+    public String getBeyondProportion() {
+        return beyondProportion;
+    }
+
+    public void setBeyondProportion(String beyondProportion) {
+        this.beyondProportion = beyondProportion == null ? null : beyondProportion.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", patientReportId=").append(patientReportId);
+        sb.append(", questionId=").append(questionId);
+        sb.append(", beginTime=").append(beginTime);
+        sb.append(", canvasWidth=").append(canvasWidth);
+        sb.append(", canvasHeight=").append(canvasHeight);
+        sb.append(", lineColor=").append(lineColor);
+        sb.append(", lineWidth=").append(lineWidth);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", isDel=").append(isDel);
+        sb.append(", openCanvasTime=").append(openCanvasTime);
+        sb.append(", beyondProportion=").append(beyondProportion);
+        sb.append("]");
+        return sb.toString();
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtPatientCanvasLine.java

@@ -0,0 +1,84 @@
+package com.ccsens.question.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class HtPatientCanvasLine implements Serializable {
+    private Long id;
+
+    private Long patientCanvasId;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Byte isDel;
+
+    private String points;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getPatientCanvasId() {
+        return patientCanvasId;
+    }
+
+    public void setPatientCanvasId(Long patientCanvasId) {
+        this.patientCanvasId = patientCanvasId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Byte isDel) {
+        this.isDel = isDel;
+    }
+
+    public String getPoints() {
+        return points;
+    }
+
+    public void setPoints(String points) {
+        this.points = points == null ? null : points.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", patientCanvasId=").append(patientCanvasId);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", isDel=").append(isDel);
+        sb.append(", points=").append(points);
+        sb.append("]");
+        return sb.toString();
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtPatientCanvasLineExample.java

@@ -0,0 +1,501 @@
+package com.ccsens.question.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class HtPatientCanvasLineExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public HtPatientCanvasLineExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientCanvasIdIsNull() {
+            addCriterion("patient_canvas_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientCanvasIdIsNotNull() {
+            addCriterion("patient_canvas_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientCanvasIdEqualTo(Long value) {
+            addCriterion("patient_canvas_id =", value, "patientCanvasId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientCanvasIdNotEqualTo(Long value) {
+            addCriterion("patient_canvas_id <>", value, "patientCanvasId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientCanvasIdGreaterThan(Long value) {
+            addCriterion("patient_canvas_id >", value, "patientCanvasId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientCanvasIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("patient_canvas_id >=", value, "patientCanvasId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientCanvasIdLessThan(Long value) {
+            addCriterion("patient_canvas_id <", value, "patientCanvasId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientCanvasIdLessThanOrEqualTo(Long value) {
+            addCriterion("patient_canvas_id <=", value, "patientCanvasId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientCanvasIdIn(List<Long> values) {
+            addCriterion("patient_canvas_id in", values, "patientCanvasId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientCanvasIdNotIn(List<Long> values) {
+            addCriterion("patient_canvas_id not in", values, "patientCanvasId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientCanvasIdBetween(Long value1, Long value2) {
+            addCriterion("patient_canvas_id between", value1, value2, "patientCanvasId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientCanvasIdNotBetween(Long value1, Long value2) {
+            addCriterion("patient_canvas_id not between", value1, value2, "patientCanvasId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelIsNull() {
+            addCriterion("is_del is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelIsNotNull() {
+            addCriterion("is_del is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelEqualTo(Byte value) {
+            addCriterion("is_del =", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelNotEqualTo(Byte value) {
+            addCriterion("is_del <>", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelGreaterThan(Byte value) {
+            addCriterion("is_del >", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelGreaterThanOrEqualTo(Byte value) {
+            addCriterion("is_del >=", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelLessThan(Byte value) {
+            addCriterion("is_del <", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelLessThanOrEqualTo(Byte value) {
+            addCriterion("is_del <=", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelIn(List<Byte> values) {
+            addCriterion("is_del in", values, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelNotIn(List<Byte> values) {
+            addCriterion("is_del not in", values, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelBetween(Byte value1, Byte value2) {
+            addCriterion("is_del between", value1, value2, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelNotBetween(Byte value1, Byte value2) {
+            addCriterion("is_del not between", value1, value2, "isDel");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtPatientFamily.java

@@ -0,0 +1,161 @@
+package com.ccsens.question.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class HtPatientFamily implements Serializable {
+    private Long id;
+
+    private Long patientId;
+
+    private String name;
+
+    private Byte age;
+
+    private Byte sex;
+
+    private Byte educationalStatus;
+
+    private Byte relation;
+
+    private Byte isLiveTogether;
+
+    private String remark;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Byte isDel;
+
+    private Long recorder;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getPatientId() {
+        return patientId;
+    }
+
+    public void setPatientId(Long patientId) {
+        this.patientId = patientId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public Byte getAge() {
+        return age;
+    }
+
+    public void setAge(Byte age) {
+        this.age = age;
+    }
+
+    public Byte getSex() {
+        return sex;
+    }
+
+    public void setSex(Byte sex) {
+        this.sex = sex;
+    }
+
+    public Byte getEducationalStatus() {
+        return educationalStatus;
+    }
+
+    public void setEducationalStatus(Byte educationalStatus) {
+        this.educationalStatus = educationalStatus;
+    }
+
+    public Byte getRelation() {
+        return relation;
+    }
+
+    public void setRelation(Byte relation) {
+        this.relation = relation;
+    }
+
+    public Byte getIsLiveTogether() {
+        return isLiveTogether;
+    }
+
+    public void setIsLiveTogether(Byte isLiveTogether) {
+        this.isLiveTogether = isLiveTogether;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Byte isDel) {
+        this.isDel = isDel;
+    }
+
+    public Long getRecorder() {
+        return recorder;
+    }
+
+    public void setRecorder(Long recorder) {
+        this.recorder = recorder;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", patientId=").append(patientId);
+        sb.append(", name=").append(name);
+        sb.append(", age=").append(age);
+        sb.append(", sex=").append(sex);
+        sb.append(", educationalStatus=").append(educationalStatus);
+        sb.append(", relation=").append(relation);
+        sb.append(", isLiveTogether=").append(isLiveTogether);
+        sb.append(", remark=").append(remark);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", isDel=").append(isDel);
+        sb.append(", recorder=").append(recorder);
+        sb.append("]");
+        return sb.toString();
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtPatientFamilyIllness.java

@@ -0,0 +1,150 @@
+package com.ccsens.question.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class HtPatientFamilyIllness implements Serializable {
+    private Long id;
+
+    private Long patientId;
+
+    private String name;
+
+    private String relation;
+
+    private String diagnose;
+
+    private Integer onsetAge;
+
+    private Integer nowAge;
+
+    private String remark;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Byte isDel;
+
+    private Long recorder;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getPatientId() {
+        return patientId;
+    }
+
+    public void setPatientId(Long patientId) {
+        this.patientId = patientId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getRelation() {
+        return relation;
+    }
+
+    public void setRelation(String relation) {
+        this.relation = relation == null ? null : relation.trim();
+    }
+
+    public String getDiagnose() {
+        return diagnose;
+    }
+
+    public void setDiagnose(String diagnose) {
+        this.diagnose = diagnose == null ? null : diagnose.trim();
+    }
+
+    public Integer getOnsetAge() {
+        return onsetAge;
+    }
+
+    public void setOnsetAge(Integer onsetAge) {
+        this.onsetAge = onsetAge;
+    }
+
+    public Integer getNowAge() {
+        return nowAge;
+    }
+
+    public void setNowAge(Integer nowAge) {
+        this.nowAge = nowAge;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Byte isDel) {
+        this.isDel = isDel;
+    }
+
+    public Long getRecorder() {
+        return recorder;
+    }
+
+    public void setRecorder(Long recorder) {
+        this.recorder = recorder;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", patientId=").append(patientId);
+        sb.append(", name=").append(name);
+        sb.append(", relation=").append(relation);
+        sb.append(", diagnose=").append(diagnose);
+        sb.append(", onsetAge=").append(onsetAge);
+        sb.append(", nowAge=").append(nowAge);
+        sb.append(", remark=").append(remark);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", isDel=").append(isDel);
+        sb.append(", recorder=").append(recorder);
+        sb.append("]");
+        return sb.toString();
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtPatientFamilyIllnessExample.java

@@ -0,0 +1,961 @@
+package com.ccsens.question.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class HtPatientFamilyIllnessExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public HtPatientFamilyIllnessExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientIdIsNull() {
+            addCriterion("patient_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientIdIsNotNull() {
+            addCriterion("patient_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientIdEqualTo(Long value) {
+            addCriterion("patient_id =", value, "patientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientIdNotEqualTo(Long value) {
+            addCriterion("patient_id <>", value, "patientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientIdGreaterThan(Long value) {
+            addCriterion("patient_id >", value, "patientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("patient_id >=", value, "patientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientIdLessThan(Long value) {
+            addCriterion("patient_id <", value, "patientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientIdLessThanOrEqualTo(Long value) {
+            addCriterion("patient_id <=", value, "patientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientIdIn(List<Long> values) {
+            addCriterion("patient_id in", values, "patientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientIdNotIn(List<Long> values) {
+            addCriterion("patient_id not in", values, "patientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientIdBetween(Long value1, Long value2) {
+            addCriterion("patient_id between", value1, value2, "patientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientIdNotBetween(Long value1, Long value2) {
+            addCriterion("patient_id not between", value1, value2, "patientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationIsNull() {
+            addCriterion("relation is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationIsNotNull() {
+            addCriterion("relation is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationEqualTo(String value) {
+            addCriterion("relation =", value, "relation");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationNotEqualTo(String value) {
+            addCriterion("relation <>", value, "relation");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationGreaterThan(String value) {
+            addCriterion("relation >", value, "relation");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationGreaterThanOrEqualTo(String value) {
+            addCriterion("relation >=", value, "relation");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationLessThan(String value) {
+            addCriterion("relation <", value, "relation");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationLessThanOrEqualTo(String value) {
+            addCriterion("relation <=", value, "relation");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationLike(String value) {
+            addCriterion("relation like", value, "relation");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationNotLike(String value) {
+            addCriterion("relation not like", value, "relation");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationIn(List<String> values) {
+            addCriterion("relation in", values, "relation");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationNotIn(List<String> values) {
+            addCriterion("relation not in", values, "relation");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationBetween(String value1, String value2) {
+            addCriterion("relation between", value1, value2, "relation");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationNotBetween(String value1, String value2) {
+            addCriterion("relation not between", value1, value2, "relation");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseIsNull() {
+            addCriterion("diagnose is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseIsNotNull() {
+            addCriterion("diagnose is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseEqualTo(String value) {
+            addCriterion("diagnose =", value, "diagnose");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseNotEqualTo(String value) {
+            addCriterion("diagnose <>", value, "diagnose");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseGreaterThan(String value) {
+            addCriterion("diagnose >", value, "diagnose");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseGreaterThanOrEqualTo(String value) {
+            addCriterion("diagnose >=", value, "diagnose");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseLessThan(String value) {
+            addCriterion("diagnose <", value, "diagnose");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseLessThanOrEqualTo(String value) {
+            addCriterion("diagnose <=", value, "diagnose");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseLike(String value) {
+            addCriterion("diagnose like", value, "diagnose");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseNotLike(String value) {
+            addCriterion("diagnose not like", value, "diagnose");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseIn(List<String> values) {
+            addCriterion("diagnose in", values, "diagnose");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseNotIn(List<String> values) {
+            addCriterion("diagnose not in", values, "diagnose");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseBetween(String value1, String value2) {
+            addCriterion("diagnose between", value1, value2, "diagnose");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseNotBetween(String value1, String value2) {
+            addCriterion("diagnose not between", value1, value2, "diagnose");
+            return (Criteria) this;
+        }
+
+        public Criteria andOnsetAgeIsNull() {
+            addCriterion("onset_age is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOnsetAgeIsNotNull() {
+            addCriterion("onset_age is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOnsetAgeEqualTo(Integer value) {
+            addCriterion("onset_age =", value, "onsetAge");
+            return (Criteria) this;
+        }
+
+        public Criteria andOnsetAgeNotEqualTo(Integer value) {
+            addCriterion("onset_age <>", value, "onsetAge");
+            return (Criteria) this;
+        }
+
+        public Criteria andOnsetAgeGreaterThan(Integer value) {
+            addCriterion("onset_age >", value, "onsetAge");
+            return (Criteria) this;
+        }
+
+        public Criteria andOnsetAgeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("onset_age >=", value, "onsetAge");
+            return (Criteria) this;
+        }
+
+        public Criteria andOnsetAgeLessThan(Integer value) {
+            addCriterion("onset_age <", value, "onsetAge");
+            return (Criteria) this;
+        }
+
+        public Criteria andOnsetAgeLessThanOrEqualTo(Integer value) {
+            addCriterion("onset_age <=", value, "onsetAge");
+            return (Criteria) this;
+        }
+
+        public Criteria andOnsetAgeIn(List<Integer> values) {
+            addCriterion("onset_age in", values, "onsetAge");
+            return (Criteria) this;
+        }
+
+        public Criteria andOnsetAgeNotIn(List<Integer> values) {
+            addCriterion("onset_age not in", values, "onsetAge");
+            return (Criteria) this;
+        }
+
+        public Criteria andOnsetAgeBetween(Integer value1, Integer value2) {
+            addCriterion("onset_age between", value1, value2, "onsetAge");
+            return (Criteria) this;
+        }
+
+        public Criteria andOnsetAgeNotBetween(Integer value1, Integer value2) {
+            addCriterion("onset_age not between", value1, value2, "onsetAge");
+            return (Criteria) this;
+        }
+
+        public Criteria andNowAgeIsNull() {
+            addCriterion("now_age is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNowAgeIsNotNull() {
+            addCriterion("now_age is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNowAgeEqualTo(Integer value) {
+            addCriterion("now_age =", value, "nowAge");
+            return (Criteria) this;
+        }
+
+        public Criteria andNowAgeNotEqualTo(Integer value) {
+            addCriterion("now_age <>", value, "nowAge");
+            return (Criteria) this;
+        }
+
+        public Criteria andNowAgeGreaterThan(Integer value) {
+            addCriterion("now_age >", value, "nowAge");
+            return (Criteria) this;
+        }
+
+        public Criteria andNowAgeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("now_age >=", value, "nowAge");
+            return (Criteria) this;
+        }
+
+        public Criteria andNowAgeLessThan(Integer value) {
+            addCriterion("now_age <", value, "nowAge");
+            return (Criteria) this;
+        }
+
+        public Criteria andNowAgeLessThanOrEqualTo(Integer value) {
+            addCriterion("now_age <=", value, "nowAge");
+            return (Criteria) this;
+        }
+
+        public Criteria andNowAgeIn(List<Integer> values) {
+            addCriterion("now_age in", values, "nowAge");
+            return (Criteria) this;
+        }
+
+        public Criteria andNowAgeNotIn(List<Integer> values) {
+            addCriterion("now_age not in", values, "nowAge");
+            return (Criteria) this;
+        }
+
+        public Criteria andNowAgeBetween(Integer value1, Integer value2) {
+            addCriterion("now_age between", value1, value2, "nowAge");
+            return (Criteria) this;
+        }
+
+        public Criteria andNowAgeNotBetween(Integer value1, Integer value2) {
+            addCriterion("now_age not between", value1, value2, "nowAge");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNull() {
+            addCriterion("remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNotNull() {
+            addCriterion("remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkEqualTo(String value) {
+            addCriterion("remark =", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotEqualTo(String value) {
+            addCriterion("remark <>", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThan(String value) {
+            addCriterion("remark >", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("remark >=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThan(String value) {
+            addCriterion("remark <", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThanOrEqualTo(String value) {
+            addCriterion("remark <=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLike(String value) {
+            addCriterion("remark like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotLike(String value) {
+            addCriterion("remark not like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIn(List<String> values) {
+            addCriterion("remark in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotIn(List<String> values) {
+            addCriterion("remark not in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkBetween(String value1, String value2) {
+            addCriterion("remark between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotBetween(String value1, String value2) {
+            addCriterion("remark not between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelIsNull() {
+            addCriterion("is_del is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelIsNotNull() {
+            addCriterion("is_del is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelEqualTo(Byte value) {
+            addCriterion("is_del =", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelNotEqualTo(Byte value) {
+            addCriterion("is_del <>", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelGreaterThan(Byte value) {
+            addCriterion("is_del >", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelGreaterThanOrEqualTo(Byte value) {
+            addCriterion("is_del >=", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelLessThan(Byte value) {
+            addCriterion("is_del <", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelLessThanOrEqualTo(Byte value) {
+            addCriterion("is_del <=", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelIn(List<Byte> values) {
+            addCriterion("is_del in", values, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelNotIn(List<Byte> values) {
+            addCriterion("is_del not in", values, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelBetween(Byte value1, Byte value2) {
+            addCriterion("is_del between", value1, value2, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelNotBetween(Byte value1, Byte value2) {
+            addCriterion("is_del not between", value1, value2, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorderIsNull() {
+            addCriterion("recorder is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorderIsNotNull() {
+            addCriterion("recorder is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorderEqualTo(Long value) {
+            addCriterion("recorder =", value, "recorder");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorderNotEqualTo(Long value) {
+            addCriterion("recorder <>", value, "recorder");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorderGreaterThan(Long value) {
+            addCriterion("recorder >", value, "recorder");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorderGreaterThanOrEqualTo(Long value) {
+            addCriterion("recorder >=", value, "recorder");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorderLessThan(Long value) {
+            addCriterion("recorder <", value, "recorder");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorderLessThanOrEqualTo(Long value) {
+            addCriterion("recorder <=", value, "recorder");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorderIn(List<Long> values) {
+            addCriterion("recorder in", values, "recorder");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorderNotIn(List<Long> values) {
+            addCriterion("recorder not in", values, "recorder");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorderBetween(Long value1, Long value2) {
+            addCriterion("recorder between", value1, value2, "recorder");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorderNotBetween(Long value1, Long value2) {
+            addCriterion("recorder not between", value1, value2, "recorder");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtPatientFollowUp.java

@@ -0,0 +1,128 @@
+package com.ccsens.question.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class HtPatientFollowUp implements Serializable {
+    private Long id;
+
+    private Long patientId;
+
+    private Date followUpDatetime;
+
+    private Integer followUpTimes;
+
+    private Long recorder;
+
+    private Long diagnose;
+
+    private String remark;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Byte isDel;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getPatientId() {
+        return patientId;
+    }
+
+    public void setPatientId(Long patientId) {
+        this.patientId = patientId;
+    }
+
+    public Date getFollowUpDatetime() {
+        return followUpDatetime;
+    }
+
+    public void setFollowUpDatetime(Date followUpDatetime) {
+        this.followUpDatetime = followUpDatetime;
+    }
+
+    public Integer getFollowUpTimes() {
+        return followUpTimes;
+    }
+
+    public void setFollowUpTimes(Integer followUpTimes) {
+        this.followUpTimes = followUpTimes;
+    }
+
+    public Long getRecorder() {
+        return recorder;
+    }
+
+    public void setRecorder(Long recorder) {
+        this.recorder = recorder;
+    }
+
+    public Long getDiagnose() {
+        return diagnose;
+    }
+
+    public void setDiagnose(Long diagnose) {
+        this.diagnose = diagnose;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Byte isDel) {
+        this.isDel = isDel;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", patientId=").append(patientId);
+        sb.append(", followUpDatetime=").append(followUpDatetime);
+        sb.append(", followUpTimes=").append(followUpTimes);
+        sb.append(", recorder=").append(recorder);
+        sb.append(", diagnose=").append(diagnose);
+        sb.append(", remark=").append(remark);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", isDel=").append(isDel);
+        sb.append("]");
+        return sb.toString();
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtPatientFollowUpExample.java

@@ -0,0 +1,811 @@
+package com.ccsens.question.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class HtPatientFollowUpExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public HtPatientFollowUpExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientIdIsNull() {
+            addCriterion("patient_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientIdIsNotNull() {
+            addCriterion("patient_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientIdEqualTo(Long value) {
+            addCriterion("patient_id =", value, "patientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientIdNotEqualTo(Long value) {
+            addCriterion("patient_id <>", value, "patientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientIdGreaterThan(Long value) {
+            addCriterion("patient_id >", value, "patientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("patient_id >=", value, "patientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientIdLessThan(Long value) {
+            addCriterion("patient_id <", value, "patientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientIdLessThanOrEqualTo(Long value) {
+            addCriterion("patient_id <=", value, "patientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientIdIn(List<Long> values) {
+            addCriterion("patient_id in", values, "patientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientIdNotIn(List<Long> values) {
+            addCriterion("patient_id not in", values, "patientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientIdBetween(Long value1, Long value2) {
+            addCriterion("patient_id between", value1, value2, "patientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientIdNotBetween(Long value1, Long value2) {
+            addCriterion("patient_id not between", value1, value2, "patientId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFollowUpDatetimeIsNull() {
+            addCriterion("follow_up_datetime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFollowUpDatetimeIsNotNull() {
+            addCriterion("follow_up_datetime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFollowUpDatetimeEqualTo(Date value) {
+            addCriterion("follow_up_datetime =", value, "followUpDatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFollowUpDatetimeNotEqualTo(Date value) {
+            addCriterion("follow_up_datetime <>", value, "followUpDatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFollowUpDatetimeGreaterThan(Date value) {
+            addCriterion("follow_up_datetime >", value, "followUpDatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFollowUpDatetimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("follow_up_datetime >=", value, "followUpDatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFollowUpDatetimeLessThan(Date value) {
+            addCriterion("follow_up_datetime <", value, "followUpDatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFollowUpDatetimeLessThanOrEqualTo(Date value) {
+            addCriterion("follow_up_datetime <=", value, "followUpDatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFollowUpDatetimeIn(List<Date> values) {
+            addCriterion("follow_up_datetime in", values, "followUpDatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFollowUpDatetimeNotIn(List<Date> values) {
+            addCriterion("follow_up_datetime not in", values, "followUpDatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFollowUpDatetimeBetween(Date value1, Date value2) {
+            addCriterion("follow_up_datetime between", value1, value2, "followUpDatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFollowUpDatetimeNotBetween(Date value1, Date value2) {
+            addCriterion("follow_up_datetime not between", value1, value2, "followUpDatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFollowUpTimesIsNull() {
+            addCriterion("follow_up_times is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFollowUpTimesIsNotNull() {
+            addCriterion("follow_up_times is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFollowUpTimesEqualTo(Integer value) {
+            addCriterion("follow_up_times =", value, "followUpTimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andFollowUpTimesNotEqualTo(Integer value) {
+            addCriterion("follow_up_times <>", value, "followUpTimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andFollowUpTimesGreaterThan(Integer value) {
+            addCriterion("follow_up_times >", value, "followUpTimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andFollowUpTimesGreaterThanOrEqualTo(Integer value) {
+            addCriterion("follow_up_times >=", value, "followUpTimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andFollowUpTimesLessThan(Integer value) {
+            addCriterion("follow_up_times <", value, "followUpTimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andFollowUpTimesLessThanOrEqualTo(Integer value) {
+            addCriterion("follow_up_times <=", value, "followUpTimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andFollowUpTimesIn(List<Integer> values) {
+            addCriterion("follow_up_times in", values, "followUpTimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andFollowUpTimesNotIn(List<Integer> values) {
+            addCriterion("follow_up_times not in", values, "followUpTimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andFollowUpTimesBetween(Integer value1, Integer value2) {
+            addCriterion("follow_up_times between", value1, value2, "followUpTimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andFollowUpTimesNotBetween(Integer value1, Integer value2) {
+            addCriterion("follow_up_times not between", value1, value2, "followUpTimes");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorderIsNull() {
+            addCriterion("recorder is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorderIsNotNull() {
+            addCriterion("recorder is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorderEqualTo(Long value) {
+            addCriterion("recorder =", value, "recorder");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorderNotEqualTo(Long value) {
+            addCriterion("recorder <>", value, "recorder");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorderGreaterThan(Long value) {
+            addCriterion("recorder >", value, "recorder");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorderGreaterThanOrEqualTo(Long value) {
+            addCriterion("recorder >=", value, "recorder");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorderLessThan(Long value) {
+            addCriterion("recorder <", value, "recorder");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorderLessThanOrEqualTo(Long value) {
+            addCriterion("recorder <=", value, "recorder");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorderIn(List<Long> values) {
+            addCriterion("recorder in", values, "recorder");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorderNotIn(List<Long> values) {
+            addCriterion("recorder not in", values, "recorder");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorderBetween(Long value1, Long value2) {
+            addCriterion("recorder between", value1, value2, "recorder");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorderNotBetween(Long value1, Long value2) {
+            addCriterion("recorder not between", value1, value2, "recorder");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseIsNull() {
+            addCriterion("diagnose is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseIsNotNull() {
+            addCriterion("diagnose is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseEqualTo(Long value) {
+            addCriterion("diagnose =", value, "diagnose");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseNotEqualTo(Long value) {
+            addCriterion("diagnose <>", value, "diagnose");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseGreaterThan(Long value) {
+            addCriterion("diagnose >", value, "diagnose");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseGreaterThanOrEqualTo(Long value) {
+            addCriterion("diagnose >=", value, "diagnose");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseLessThan(Long value) {
+            addCriterion("diagnose <", value, "diagnose");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseLessThanOrEqualTo(Long value) {
+            addCriterion("diagnose <=", value, "diagnose");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseIn(List<Long> values) {
+            addCriterion("diagnose in", values, "diagnose");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseNotIn(List<Long> values) {
+            addCriterion("diagnose not in", values, "diagnose");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseBetween(Long value1, Long value2) {
+            addCriterion("diagnose between", value1, value2, "diagnose");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiagnoseNotBetween(Long value1, Long value2) {
+            addCriterion("diagnose not between", value1, value2, "diagnose");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNull() {
+            addCriterion("remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNotNull() {
+            addCriterion("remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkEqualTo(String value) {
+            addCriterion("remark =", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotEqualTo(String value) {
+            addCriterion("remark <>", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThan(String value) {
+            addCriterion("remark >", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("remark >=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThan(String value) {
+            addCriterion("remark <", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThanOrEqualTo(String value) {
+            addCriterion("remark <=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLike(String value) {
+            addCriterion("remark like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotLike(String value) {
+            addCriterion("remark not like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIn(List<String> values) {
+            addCriterion("remark in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotIn(List<String> values) {
+            addCriterion("remark not in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkBetween(String value1, String value2) {
+            addCriterion("remark between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotBetween(String value1, String value2) {
+            addCriterion("remark not between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelIsNull() {
+            addCriterion("is_del is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelIsNotNull() {
+            addCriterion("is_del is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelEqualTo(Byte value) {
+            addCriterion("is_del =", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelNotEqualTo(Byte value) {
+            addCriterion("is_del <>", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelGreaterThan(Byte value) {
+            addCriterion("is_del >", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelGreaterThanOrEqualTo(Byte value) {
+            addCriterion("is_del >=", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelLessThan(Byte value) {
+            addCriterion("is_del <", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelLessThanOrEqualTo(Byte value) {
+            addCriterion("is_del <=", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelIn(List<Byte> values) {
+            addCriterion("is_del in", values, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelNotIn(List<Byte> values) {
+            addCriterion("is_del not in", values, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelBetween(Byte value1, Byte value2) {
+            addCriterion("is_del between", value1, value2, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelNotBetween(Byte value1, Byte value2) {
+            addCriterion("is_del not between", value1, value2, "isDel");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtPatientIllnessHistory.java

@@ -0,0 +1,370 @@
+package com.ccsens.question.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class HtPatientIllnessHistory implements Serializable {
+    private Long id;
+
+    private Long patientId;
+
+    private Byte cardiacArrestHistory;
+
+    private Byte angina;
+
+    private Byte mi;
+
+    private Byte atrialFibrillation;
+
+    private Byte chf;
+
+    private Byte otherCardiovascularDiseases;
+
+    private Byte wuis;
+
+    private Byte hcvd;
+
+    private Byte parkinsonDisease;
+
+    private Byte epilepsy;
+
+    private Byte brainTrauma;
+
+    private Byte hypertension;
+
+    private Byte diabetes;
+
+    private Byte hlp;
+
+    private Byte hyperhomocysteinemia;
+
+    private Byte vb12Deficiency;
+
+    private Byte thyroidDisease;
+
+    private Byte copd;
+
+    private Byte asthma;
+
+    private Byte insomnia;
+
+    private Byte sleepSuspend;
+
+    private Byte ckd;
+
+    private Byte rheumatoid;
+
+    private Byte depression;
+
+    private Integer generalAnesthesiaSurgery;
+
+    private String remark;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Byte isDel;
+
+    private Long recorder;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getPatientId() {
+        return patientId;
+    }
+
+    public void setPatientId(Long patientId) {
+        this.patientId = patientId;
+    }
+
+    public Byte getCardiacArrestHistory() {
+        return cardiacArrestHistory;
+    }
+
+    public void setCardiacArrestHistory(Byte cardiacArrestHistory) {
+        this.cardiacArrestHistory = cardiacArrestHistory;
+    }
+
+    public Byte getAngina() {
+        return angina;
+    }
+
+    public void setAngina(Byte angina) {
+        this.angina = angina;
+    }
+
+    public Byte getMi() {
+        return mi;
+    }
+
+    public void setMi(Byte mi) {
+        this.mi = mi;
+    }
+
+    public Byte getAtrialFibrillation() {
+        return atrialFibrillation;
+    }
+
+    public void setAtrialFibrillation(Byte atrialFibrillation) {
+        this.atrialFibrillation = atrialFibrillation;
+    }
+
+    public Byte getChf() {
+        return chf;
+    }
+
+    public void setChf(Byte chf) {
+        this.chf = chf;
+    }
+
+    public Byte getOtherCardiovascularDiseases() {
+        return otherCardiovascularDiseases;
+    }
+
+    public void setOtherCardiovascularDiseases(Byte otherCardiovascularDiseases) {
+        this.otherCardiovascularDiseases = otherCardiovascularDiseases;
+    }
+
+    public Byte getWuis() {
+        return wuis;
+    }
+
+    public void setWuis(Byte wuis) {
+        this.wuis = wuis;
+    }
+
+    public Byte getHcvd() {
+        return hcvd;
+    }
+
+    public void setHcvd(Byte hcvd) {
+        this.hcvd = hcvd;
+    }
+
+    public Byte getParkinsonDisease() {
+        return parkinsonDisease;
+    }
+
+    public void setParkinsonDisease(Byte parkinsonDisease) {
+        this.parkinsonDisease = parkinsonDisease;
+    }
+
+    public Byte getEpilepsy() {
+        return epilepsy;
+    }
+
+    public void setEpilepsy(Byte epilepsy) {
+        this.epilepsy = epilepsy;
+    }
+
+    public Byte getBrainTrauma() {
+        return brainTrauma;
+    }
+
+    public void setBrainTrauma(Byte brainTrauma) {
+        this.brainTrauma = brainTrauma;
+    }
+
+    public Byte getHypertension() {
+        return hypertension;
+    }
+
+    public void setHypertension(Byte hypertension) {
+        this.hypertension = hypertension;
+    }
+
+    public Byte getDiabetes() {
+        return diabetes;
+    }
+
+    public void setDiabetes(Byte diabetes) {
+        this.diabetes = diabetes;
+    }
+
+    public Byte getHlp() {
+        return hlp;
+    }
+
+    public void setHlp(Byte hlp) {
+        this.hlp = hlp;
+    }
+
+    public Byte getHyperhomocysteinemia() {
+        return hyperhomocysteinemia;
+    }
+
+    public void setHyperhomocysteinemia(Byte hyperhomocysteinemia) {
+        this.hyperhomocysteinemia = hyperhomocysteinemia;
+    }
+
+    public Byte getVb12Deficiency() {
+        return vb12Deficiency;
+    }
+
+    public void setVb12Deficiency(Byte vb12Deficiency) {
+        this.vb12Deficiency = vb12Deficiency;
+    }
+
+    public Byte getThyroidDisease() {
+        return thyroidDisease;
+    }
+
+    public void setThyroidDisease(Byte thyroidDisease) {
+        this.thyroidDisease = thyroidDisease;
+    }
+
+    public Byte getCopd() {
+        return copd;
+    }
+
+    public void setCopd(Byte copd) {
+        this.copd = copd;
+    }
+
+    public Byte getAsthma() {
+        return asthma;
+    }
+
+    public void setAsthma(Byte asthma) {
+        this.asthma = asthma;
+    }
+
+    public Byte getInsomnia() {
+        return insomnia;
+    }
+
+    public void setInsomnia(Byte insomnia) {
+        this.insomnia = insomnia;
+    }
+
+    public Byte getSleepSuspend() {
+        return sleepSuspend;
+    }
+
+    public void setSleepSuspend(Byte sleepSuspend) {
+        this.sleepSuspend = sleepSuspend;
+    }
+
+    public Byte getCkd() {
+        return ckd;
+    }
+
+    public void setCkd(Byte ckd) {
+        this.ckd = ckd;
+    }
+
+    public Byte getRheumatoid() {
+        return rheumatoid;
+    }
+
+    public void setRheumatoid(Byte rheumatoid) {
+        this.rheumatoid = rheumatoid;
+    }
+
+    public Byte getDepression() {
+        return depression;
+    }
+
+    public void setDepression(Byte depression) {
+        this.depression = depression;
+    }
+
+    public Integer getGeneralAnesthesiaSurgery() {
+        return generalAnesthesiaSurgery;
+    }
+
+    public void setGeneralAnesthesiaSurgery(Integer generalAnesthesiaSurgery) {
+        this.generalAnesthesiaSurgery = generalAnesthesiaSurgery;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Byte isDel) {
+        this.isDel = isDel;
+    }
+
+    public Long getRecorder() {
+        return recorder;
+    }
+
+    public void setRecorder(Long recorder) {
+        this.recorder = recorder;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", patientId=").append(patientId);
+        sb.append(", cardiacArrestHistory=").append(cardiacArrestHistory);
+        sb.append(", angina=").append(angina);
+        sb.append(", mi=").append(mi);
+        sb.append(", atrialFibrillation=").append(atrialFibrillation);
+        sb.append(", chf=").append(chf);
+        sb.append(", otherCardiovascularDiseases=").append(otherCardiovascularDiseases);
+        sb.append(", wuis=").append(wuis);
+        sb.append(", hcvd=").append(hcvd);
+        sb.append(", parkinsonDisease=").append(parkinsonDisease);
+        sb.append(", epilepsy=").append(epilepsy);
+        sb.append(", brainTrauma=").append(brainTrauma);
+        sb.append(", hypertension=").append(hypertension);
+        sb.append(", diabetes=").append(diabetes);
+        sb.append(", hlp=").append(hlp);
+        sb.append(", hyperhomocysteinemia=").append(hyperhomocysteinemia);
+        sb.append(", vb12Deficiency=").append(vb12Deficiency);
+        sb.append(", thyroidDisease=").append(thyroidDisease);
+        sb.append(", copd=").append(copd);
+        sb.append(", asthma=").append(asthma);
+        sb.append(", insomnia=").append(insomnia);
+        sb.append(", sleepSuspend=").append(sleepSuspend);
+        sb.append(", ckd=").append(ckd);
+        sb.append(", rheumatoid=").append(rheumatoid);
+        sb.append(", depression=").append(depression);
+        sb.append(", generalAnesthesiaSurgery=").append(generalAnesthesiaSurgery);
+        sb.append(", remark=").append(remark);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", isDel=").append(isDel);
+        sb.append(", recorder=").append(recorder);
+        sb.append("]");
+        return sb.toString();
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtPatientParentIllness.java

@@ -0,0 +1,249 @@
+package com.ccsens.question.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class HtPatientParentIllness implements Serializable {
+    private Long id;
+
+    private Long patientId;
+
+    private Byte memory;
+
+    private Byte language;
+
+    private Byte space;
+
+    private Byte emotion;
+
+    private Byte depression;
+
+    private Byte illusion;
+
+    private Byte delusion;
+
+    private Byte derepression;
+
+    private Byte irritable;
+
+    private Byte personalityChanges;
+
+    private Byte exercise;
+
+    private Byte firstIllness;
+
+    private Byte reason;
+
+    private Byte changeForm;
+
+    private String remark;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Byte isDel;
+
+    private Long recorder;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getPatientId() {
+        return patientId;
+    }
+
+    public void setPatientId(Long patientId) {
+        this.patientId = patientId;
+    }
+
+    public Byte getMemory() {
+        return memory;
+    }
+
+    public void setMemory(Byte memory) {
+        this.memory = memory;
+    }
+
+    public Byte getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(Byte language) {
+        this.language = language;
+    }
+
+    public Byte getSpace() {
+        return space;
+    }
+
+    public void setSpace(Byte space) {
+        this.space = space;
+    }
+
+    public Byte getEmotion() {
+        return emotion;
+    }
+
+    public void setEmotion(Byte emotion) {
+        this.emotion = emotion;
+    }
+
+    public Byte getDepression() {
+        return depression;
+    }
+
+    public void setDepression(Byte depression) {
+        this.depression = depression;
+    }
+
+    public Byte getIllusion() {
+        return illusion;
+    }
+
+    public void setIllusion(Byte illusion) {
+        this.illusion = illusion;
+    }
+
+    public Byte getDelusion() {
+        return delusion;
+    }
+
+    public void setDelusion(Byte delusion) {
+        this.delusion = delusion;
+    }
+
+    public Byte getDerepression() {
+        return derepression;
+    }
+
+    public void setDerepression(Byte derepression) {
+        this.derepression = derepression;
+    }
+
+    public Byte getIrritable() {
+        return irritable;
+    }
+
+    public void setIrritable(Byte irritable) {
+        this.irritable = irritable;
+    }
+
+    public Byte getPersonalityChanges() {
+        return personalityChanges;
+    }
+
+    public void setPersonalityChanges(Byte personalityChanges) {
+        this.personalityChanges = personalityChanges;
+    }
+
+    public Byte getExercise() {
+        return exercise;
+    }
+
+    public void setExercise(Byte exercise) {
+        this.exercise = exercise;
+    }
+
+    public Byte getFirstIllness() {
+        return firstIllness;
+    }
+
+    public void setFirstIllness(Byte firstIllness) {
+        this.firstIllness = firstIllness;
+    }
+
+    public Byte getReason() {
+        return reason;
+    }
+
+    public void setReason(Byte reason) {
+        this.reason = reason;
+    }
+
+    public Byte getChangeForm() {
+        return changeForm;
+    }
+
+    public void setChangeForm(Byte changeForm) {
+        this.changeForm = changeForm;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Byte isDel) {
+        this.isDel = isDel;
+    }
+
+    public Long getRecorder() {
+        return recorder;
+    }
+
+    public void setRecorder(Long recorder) {
+        this.recorder = recorder;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", patientId=").append(patientId);
+        sb.append(", memory=").append(memory);
+        sb.append(", language=").append(language);
+        sb.append(", space=").append(space);
+        sb.append(", emotion=").append(emotion);
+        sb.append(", depression=").append(depression);
+        sb.append(", illusion=").append(illusion);
+        sb.append(", delusion=").append(delusion);
+        sb.append(", derepression=").append(derepression);
+        sb.append(", irritable=").append(irritable);
+        sb.append(", personalityChanges=").append(personalityChanges);
+        sb.append(", exercise=").append(exercise);
+        sb.append(", firstIllness=").append(firstIllness);
+        sb.append(", reason=").append(reason);
+        sb.append(", changeForm=").append(changeForm);
+        sb.append(", remark=").append(remark);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", isDel=").append(isDel);
+        sb.append(", recorder=").append(recorder);
+        sb.append("]");
+        return sb.toString();
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtPatientPersional.java

@@ -0,0 +1,326 @@
+package com.ccsens.question.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class HtPatientPersional implements Serializable {
+    private Long id;
+
+    private Long patientId;
+
+    private Byte smokingHistory;
+
+    private Integer smokingYear;
+
+    private Integer smokingAmount;
+
+    private Byte smokingQuit;
+
+    private Integer smokingQuitYear;
+
+    private Byte drinkHistory;
+
+    private Integer drinkYear;
+
+    private String drinkType;
+
+    private Integer drinkAmount;
+
+    private Byte teaCoffeeHistory;
+
+    private Integer teaCoffeeYear;
+
+    private String teaCoffeeType;
+
+    private Byte teaCoffeeFrequency;
+
+    private Byte teaCoffeeQuit;
+
+    private Integer teaCoffeeQuitYear;
+
+    private String dietaryHabit;
+
+    private Byte workoutTime;
+
+    private Integer sleepTime;
+
+    private Byte snore;
+
+    private String remark;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Byte isDel;
+
+    private Long recorder;
+
+    private Byte drinkQuit;
+
+    private Integer drinkQuitYear;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getPatientId() {
+        return patientId;
+    }
+
+    public void setPatientId(Long patientId) {
+        this.patientId = patientId;
+    }
+
+    public Byte getSmokingHistory() {
+        return smokingHistory;
+    }
+
+    public void setSmokingHistory(Byte smokingHistory) {
+        this.smokingHistory = smokingHistory;
+    }
+
+    public Integer getSmokingYear() {
+        return smokingYear;
+    }
+
+    public void setSmokingYear(Integer smokingYear) {
+        this.smokingYear = smokingYear;
+    }
+
+    public Integer getSmokingAmount() {
+        return smokingAmount;
+    }
+
+    public void setSmokingAmount(Integer smokingAmount) {
+        this.smokingAmount = smokingAmount;
+    }
+
+    public Byte getSmokingQuit() {
+        return smokingQuit;
+    }
+
+    public void setSmokingQuit(Byte smokingQuit) {
+        this.smokingQuit = smokingQuit;
+    }
+
+    public Integer getSmokingQuitYear() {
+        return smokingQuitYear;
+    }
+
+    public void setSmokingQuitYear(Integer smokingQuitYear) {
+        this.smokingQuitYear = smokingQuitYear;
+    }
+
+    public Byte getDrinkHistory() {
+        return drinkHistory;
+    }
+
+    public void setDrinkHistory(Byte drinkHistory) {
+        this.drinkHistory = drinkHistory;
+    }
+
+    public Integer getDrinkYear() {
+        return drinkYear;
+    }
+
+    public void setDrinkYear(Integer drinkYear) {
+        this.drinkYear = drinkYear;
+    }
+
+    public String getDrinkType() {
+        return drinkType;
+    }
+
+    public void setDrinkType(String drinkType) {
+        this.drinkType = drinkType == null ? null : drinkType.trim();
+    }
+
+    public Integer getDrinkAmount() {
+        return drinkAmount;
+    }
+
+    public void setDrinkAmount(Integer drinkAmount) {
+        this.drinkAmount = drinkAmount;
+    }
+
+    public Byte getTeaCoffeeHistory() {
+        return teaCoffeeHistory;
+    }
+
+    public void setTeaCoffeeHistory(Byte teaCoffeeHistory) {
+        this.teaCoffeeHistory = teaCoffeeHistory;
+    }
+
+    public Integer getTeaCoffeeYear() {
+        return teaCoffeeYear;
+    }
+
+    public void setTeaCoffeeYear(Integer teaCoffeeYear) {
+        this.teaCoffeeYear = teaCoffeeYear;
+    }
+
+    public String getTeaCoffeeType() {
+        return teaCoffeeType;
+    }
+
+    public void setTeaCoffeeType(String teaCoffeeType) {
+        this.teaCoffeeType = teaCoffeeType == null ? null : teaCoffeeType.trim();
+    }
+
+    public Byte getTeaCoffeeFrequency() {
+        return teaCoffeeFrequency;
+    }
+
+    public void setTeaCoffeeFrequency(Byte teaCoffeeFrequency) {
+        this.teaCoffeeFrequency = teaCoffeeFrequency;
+    }
+
+    public Byte getTeaCoffeeQuit() {
+        return teaCoffeeQuit;
+    }
+
+    public void setTeaCoffeeQuit(Byte teaCoffeeQuit) {
+        this.teaCoffeeQuit = teaCoffeeQuit;
+    }
+
+    public Integer getTeaCoffeeQuitYear() {
+        return teaCoffeeQuitYear;
+    }
+
+    public void setTeaCoffeeQuitYear(Integer teaCoffeeQuitYear) {
+        this.teaCoffeeQuitYear = teaCoffeeQuitYear;
+    }
+
+    public String getDietaryHabit() {
+        return dietaryHabit;
+    }
+
+    public void setDietaryHabit(String dietaryHabit) {
+        this.dietaryHabit = dietaryHabit == null ? null : dietaryHabit.trim();
+    }
+
+    public Byte getWorkoutTime() {
+        return workoutTime;
+    }
+
+    public void setWorkoutTime(Byte workoutTime) {
+        this.workoutTime = workoutTime;
+    }
+
+    public Integer getSleepTime() {
+        return sleepTime;
+    }
+
+    public void setSleepTime(Integer sleepTime) {
+        this.sleepTime = sleepTime;
+    }
+
+    public Byte getSnore() {
+        return snore;
+    }
+
+    public void setSnore(Byte snore) {
+        this.snore = snore;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Byte isDel) {
+        this.isDel = isDel;
+    }
+
+    public Long getRecorder() {
+        return recorder;
+    }
+
+    public void setRecorder(Long recorder) {
+        this.recorder = recorder;
+    }
+
+    public Byte getDrinkQuit() {
+        return drinkQuit;
+    }
+
+    public void setDrinkQuit(Byte drinkQuit) {
+        this.drinkQuit = drinkQuit;
+    }
+
+    public Integer getDrinkQuitYear() {
+        return drinkQuitYear;
+    }
+
+    public void setDrinkQuitYear(Integer drinkQuitYear) {
+        this.drinkQuitYear = drinkQuitYear;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", patientId=").append(patientId);
+        sb.append(", smokingHistory=").append(smokingHistory);
+        sb.append(", smokingYear=").append(smokingYear);
+        sb.append(", smokingAmount=").append(smokingAmount);
+        sb.append(", smokingQuit=").append(smokingQuit);
+        sb.append(", smokingQuitYear=").append(smokingQuitYear);
+        sb.append(", drinkHistory=").append(drinkHistory);
+        sb.append(", drinkYear=").append(drinkYear);
+        sb.append(", drinkType=").append(drinkType);
+        sb.append(", drinkAmount=").append(drinkAmount);
+        sb.append(", teaCoffeeHistory=").append(teaCoffeeHistory);
+        sb.append(", teaCoffeeYear=").append(teaCoffeeYear);
+        sb.append(", teaCoffeeType=").append(teaCoffeeType);
+        sb.append(", teaCoffeeFrequency=").append(teaCoffeeFrequency);
+        sb.append(", teaCoffeeQuit=").append(teaCoffeeQuit);
+        sb.append(", teaCoffeeQuitYear=").append(teaCoffeeQuitYear);
+        sb.append(", dietaryHabit=").append(dietaryHabit);
+        sb.append(", workoutTime=").append(workoutTime);
+        sb.append(", sleepTime=").append(sleepTime);
+        sb.append(", snore=").append(snore);
+        sb.append(", remark=").append(remark);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", isDel=").append(isDel);
+        sb.append(", recorder=").append(recorder);
+        sb.append(", drinkQuit=").append(drinkQuit);
+        sb.append(", drinkQuitYear=").append(drinkQuitYear);
+        sb.append("]");
+        return sb.toString();
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtPatientQuestionRecord.java

@@ -0,0 +1,128 @@
+package com.ccsens.question.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class HtPatientQuestionRecord implements Serializable {
+    private Long id;
+
+    private Long patientReportId;
+
+    private Long questionId;
+
+    private String recordType;
+
+    private String recordValue;
+
+    private Long recordTime;
+
+    private String remark;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Byte isDel;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getPatientReportId() {
+        return patientReportId;
+    }
+
+    public void setPatientReportId(Long patientReportId) {
+        this.patientReportId = patientReportId;
+    }
+
+    public Long getQuestionId() {
+        return questionId;
+    }
+
+    public void setQuestionId(Long questionId) {
+        this.questionId = questionId;
+    }
+
+    public String getRecordType() {
+        return recordType;
+    }
+
+    public void setRecordType(String recordType) {
+        this.recordType = recordType == null ? null : recordType.trim();
+    }
+
+    public String getRecordValue() {
+        return recordValue;
+    }
+
+    public void setRecordValue(String recordValue) {
+        this.recordValue = recordValue == null ? null : recordValue.trim();
+    }
+
+    public Long getRecordTime() {
+        return recordTime;
+    }
+
+    public void setRecordTime(Long recordTime) {
+        this.recordTime = recordTime;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Byte isDel) {
+        this.isDel = isDel;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", patientReportId=").append(patientReportId);
+        sb.append(", questionId=").append(questionId);
+        sb.append(", recordType=").append(recordType);
+        sb.append(", recordValue=").append(recordValue);
+        sb.append(", recordTime=").append(recordTime);
+        sb.append(", remark=").append(remark);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", isDel=").append(isDel);
+        sb.append("]");
+        return sb.toString();
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtPatientQuestionRecordExample.java

@@ -0,0 +1,831 @@
+package com.ccsens.question.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class HtPatientQuestionRecordExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public HtPatientQuestionRecordExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientReportIdIsNull() {
+            addCriterion("patient_report_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientReportIdIsNotNull() {
+            addCriterion("patient_report_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientReportIdEqualTo(Long value) {
+            addCriterion("patient_report_id =", value, "patientReportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientReportIdNotEqualTo(Long value) {
+            addCriterion("patient_report_id <>", value, "patientReportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientReportIdGreaterThan(Long value) {
+            addCriterion("patient_report_id >", value, "patientReportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientReportIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("patient_report_id >=", value, "patientReportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientReportIdLessThan(Long value) {
+            addCriterion("patient_report_id <", value, "patientReportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientReportIdLessThanOrEqualTo(Long value) {
+            addCriterion("patient_report_id <=", value, "patientReportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientReportIdIn(List<Long> values) {
+            addCriterion("patient_report_id in", values, "patientReportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientReportIdNotIn(List<Long> values) {
+            addCriterion("patient_report_id not in", values, "patientReportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientReportIdBetween(Long value1, Long value2) {
+            addCriterion("patient_report_id between", value1, value2, "patientReportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPatientReportIdNotBetween(Long value1, Long value2) {
+            addCriterion("patient_report_id not between", value1, value2, "patientReportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionIdIsNull() {
+            addCriterion("question_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionIdIsNotNull() {
+            addCriterion("question_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionIdEqualTo(Long value) {
+            addCriterion("question_id =", value, "questionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionIdNotEqualTo(Long value) {
+            addCriterion("question_id <>", value, "questionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionIdGreaterThan(Long value) {
+            addCriterion("question_id >", value, "questionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("question_id >=", value, "questionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionIdLessThan(Long value) {
+            addCriterion("question_id <", value, "questionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionIdLessThanOrEqualTo(Long value) {
+            addCriterion("question_id <=", value, "questionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionIdIn(List<Long> values) {
+            addCriterion("question_id in", values, "questionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionIdNotIn(List<Long> values) {
+            addCriterion("question_id not in", values, "questionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionIdBetween(Long value1, Long value2) {
+            addCriterion("question_id between", value1, value2, "questionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionIdNotBetween(Long value1, Long value2) {
+            addCriterion("question_id not between", value1, value2, "questionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTypeIsNull() {
+            addCriterion("record_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTypeIsNotNull() {
+            addCriterion("record_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTypeEqualTo(String value) {
+            addCriterion("record_type =", value, "recordType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTypeNotEqualTo(String value) {
+            addCriterion("record_type <>", value, "recordType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTypeGreaterThan(String value) {
+            addCriterion("record_type >", value, "recordType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("record_type >=", value, "recordType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTypeLessThan(String value) {
+            addCriterion("record_type <", value, "recordType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTypeLessThanOrEqualTo(String value) {
+            addCriterion("record_type <=", value, "recordType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTypeLike(String value) {
+            addCriterion("record_type like", value, "recordType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTypeNotLike(String value) {
+            addCriterion("record_type not like", value, "recordType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTypeIn(List<String> values) {
+            addCriterion("record_type in", values, "recordType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTypeNotIn(List<String> values) {
+            addCriterion("record_type not in", values, "recordType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTypeBetween(String value1, String value2) {
+            addCriterion("record_type between", value1, value2, "recordType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTypeNotBetween(String value1, String value2) {
+            addCriterion("record_type not between", value1, value2, "recordType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordValueIsNull() {
+            addCriterion("record_value is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordValueIsNotNull() {
+            addCriterion("record_value is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordValueEqualTo(String value) {
+            addCriterion("record_value =", value, "recordValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordValueNotEqualTo(String value) {
+            addCriterion("record_value <>", value, "recordValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordValueGreaterThan(String value) {
+            addCriterion("record_value >", value, "recordValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordValueGreaterThanOrEqualTo(String value) {
+            addCriterion("record_value >=", value, "recordValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordValueLessThan(String value) {
+            addCriterion("record_value <", value, "recordValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordValueLessThanOrEqualTo(String value) {
+            addCriterion("record_value <=", value, "recordValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordValueLike(String value) {
+            addCriterion("record_value like", value, "recordValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordValueNotLike(String value) {
+            addCriterion("record_value not like", value, "recordValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordValueIn(List<String> values) {
+            addCriterion("record_value in", values, "recordValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordValueNotIn(List<String> values) {
+            addCriterion("record_value not in", values, "recordValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordValueBetween(String value1, String value2) {
+            addCriterion("record_value between", value1, value2, "recordValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordValueNotBetween(String value1, String value2) {
+            addCriterion("record_value not between", value1, value2, "recordValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTimeIsNull() {
+            addCriterion("record_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTimeIsNotNull() {
+            addCriterion("record_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTimeEqualTo(Long value) {
+            addCriterion("record_time =", value, "recordTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTimeNotEqualTo(Long value) {
+            addCriterion("record_time <>", value, "recordTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTimeGreaterThan(Long value) {
+            addCriterion("record_time >", value, "recordTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("record_time >=", value, "recordTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTimeLessThan(Long value) {
+            addCriterion("record_time <", value, "recordTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTimeLessThanOrEqualTo(Long value) {
+            addCriterion("record_time <=", value, "recordTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTimeIn(List<Long> values) {
+            addCriterion("record_time in", values, "recordTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTimeNotIn(List<Long> values) {
+            addCriterion("record_time not in", values, "recordTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTimeBetween(Long value1, Long value2) {
+            addCriterion("record_time between", value1, value2, "recordTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordTimeNotBetween(Long value1, Long value2) {
+            addCriterion("record_time not between", value1, value2, "recordTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNull() {
+            addCriterion("remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNotNull() {
+            addCriterion("remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkEqualTo(String value) {
+            addCriterion("remark =", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotEqualTo(String value) {
+            addCriterion("remark <>", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThan(String value) {
+            addCriterion("remark >", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("remark >=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThan(String value) {
+            addCriterion("remark <", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThanOrEqualTo(String value) {
+            addCriterion("remark <=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLike(String value) {
+            addCriterion("remark like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotLike(String value) {
+            addCriterion("remark not like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIn(List<String> values) {
+            addCriterion("remark in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotIn(List<String> values) {
+            addCriterion("remark not in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkBetween(String value1, String value2) {
+            addCriterion("remark between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotBetween(String value1, String value2) {
+            addCriterion("remark not between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelIsNull() {
+            addCriterion("is_del is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelIsNotNull() {
+            addCriterion("is_del is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelEqualTo(Byte value) {
+            addCriterion("is_del =", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelNotEqualTo(Byte value) {
+            addCriterion("is_del <>", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelGreaterThan(Byte value) {
+            addCriterion("is_del >", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelGreaterThanOrEqualTo(Byte value) {
+            addCriterion("is_del >=", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelLessThan(Byte value) {
+            addCriterion("is_del <", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelLessThanOrEqualTo(Byte value) {
+            addCriterion("is_del <=", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelIn(List<Byte> values) {
+            addCriterion("is_del in", values, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelNotIn(List<Byte> values) {
+            addCriterion("is_del not in", values, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelBetween(Byte value1, Byte value2) {
+            addCriterion("is_del between", value1, value2, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelNotBetween(Byte value1, Byte value2) {
+            addCriterion("is_del not between", value1, value2, "isDel");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtPatientReport.java

@@ -0,0 +1,293 @@
+package com.ccsens.question.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class HtPatientReport implements Serializable {
+    private Long id;
+
+    private String name;
+
+    private Long patientId;
+
+    private String patientIdcard;
+
+    private Byte patientAge;
+
+    private Long doctorId;
+
+    private String serialNumber;
+
+    private String initialImpression;
+
+    private String clinicalDiagnosis;
+
+    private Byte pasi;
+
+    private String department;
+
+    private String bedNumber;
+
+    private Long reportTime;
+
+    private Long checkTime;
+
+    private String evaluationCode;
+
+    private String url;
+
+    private String qrCodeUrl;
+
+    private String remark;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Byte isDel;
+
+    private Byte showStatus;
+
+    private String hospital;
+
+    private Byte completeStatus;
+
+    private Long userId;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public Long getPatientId() {
+        return patientId;
+    }
+
+    public void setPatientId(Long patientId) {
+        this.patientId = patientId;
+    }
+
+    public String getPatientIdcard() {
+        return patientIdcard;
+    }
+
+    public void setPatientIdcard(String patientIdcard) {
+        this.patientIdcard = patientIdcard == null ? null : patientIdcard.trim();
+    }
+
+    public Byte getPatientAge() {
+        return patientAge;
+    }
+
+    public void setPatientAge(Byte patientAge) {
+        this.patientAge = patientAge;
+    }
+
+    public Long getDoctorId() {
+        return doctorId;
+    }
+
+    public void setDoctorId(Long doctorId) {
+        this.doctorId = doctorId;
+    }
+
+    public String getSerialNumber() {
+        return serialNumber;
+    }
+
+    public void setSerialNumber(String serialNumber) {
+        this.serialNumber = serialNumber == null ? null : serialNumber.trim();
+    }
+
+    public String getInitialImpression() {
+        return initialImpression;
+    }
+
+    public void setInitialImpression(String initialImpression) {
+        this.initialImpression = initialImpression == null ? null : initialImpression.trim();
+    }
+
+    public String getClinicalDiagnosis() {
+        return clinicalDiagnosis;
+    }
+
+    public void setClinicalDiagnosis(String clinicalDiagnosis) {
+        this.clinicalDiagnosis = clinicalDiagnosis == null ? null : clinicalDiagnosis.trim();
+    }
+
+    public Byte getPasi() {
+        return pasi;
+    }
+
+    public void setPasi(Byte pasi) {
+        this.pasi = pasi;
+    }
+
+    public String getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(String department) {
+        this.department = department == null ? null : department.trim();
+    }
+
+    public String getBedNumber() {
+        return bedNumber;
+    }
+
+    public void setBedNumber(String bedNumber) {
+        this.bedNumber = bedNumber == null ? null : bedNumber.trim();
+    }
+
+    public Long getReportTime() {
+        return reportTime;
+    }
+
+    public void setReportTime(Long reportTime) {
+        this.reportTime = reportTime;
+    }
+
+    public Long getCheckTime() {
+        return checkTime;
+    }
+
+    public void setCheckTime(Long checkTime) {
+        this.checkTime = checkTime;
+    }
+
+    public String getEvaluationCode() {
+        return evaluationCode;
+    }
+
+    public void setEvaluationCode(String evaluationCode) {
+        this.evaluationCode = evaluationCode == null ? null : evaluationCode.trim();
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url == null ? null : url.trim();
+    }
+
+    public String getQrCodeUrl() {
+        return qrCodeUrl;
+    }
+
+    public void setQrCodeUrl(String qrCodeUrl) {
+        this.qrCodeUrl = qrCodeUrl == null ? null : qrCodeUrl.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Byte isDel) {
+        this.isDel = isDel;
+    }
+
+    public Byte getShowStatus() {
+        return showStatus;
+    }
+
+    public void setShowStatus(Byte showStatus) {
+        this.showStatus = showStatus;
+    }
+
+    public String getHospital() {
+        return hospital;
+    }
+
+    public void setHospital(String hospital) {
+        this.hospital = hospital == null ? null : hospital.trim();
+    }
+
+    public Byte getCompleteStatus() {
+        return completeStatus;
+    }
+
+    public void setCompleteStatus(Byte completeStatus) {
+        this.completeStatus = completeStatus;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", name=").append(name);
+        sb.append(", patientId=").append(patientId);
+        sb.append(", patientIdcard=").append(patientIdcard);
+        sb.append(", patientAge=").append(patientAge);
+        sb.append(", doctorId=").append(doctorId);
+        sb.append(", serialNumber=").append(serialNumber);
+        sb.append(", initialImpression=").append(initialImpression);
+        sb.append(", clinicalDiagnosis=").append(clinicalDiagnosis);
+        sb.append(", pasi=").append(pasi);
+        sb.append(", department=").append(department);
+        sb.append(", bedNumber=").append(bedNumber);
+        sb.append(", reportTime=").append(reportTime);
+        sb.append(", checkTime=").append(checkTime);
+        sb.append(", evaluationCode=").append(evaluationCode);
+        sb.append(", url=").append(url);
+        sb.append(", qrCodeUrl=").append(qrCodeUrl);
+        sb.append(", remark=").append(remark);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", isDel=").append(isDel);
+        sb.append(", showStatus=").append(showStatus);
+        sb.append(", hospital=").append(hospital);
+        sb.append(", completeStatus=").append(completeStatus);
+        sb.append(", userId=").append(userId);
+        sb.append("]");
+        return sb.toString();
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtPatientReportRecord.java

@@ -0,0 +1,106 @@
+package com.ccsens.question.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class HtPatientReportRecord implements Serializable {
+    private Long id;
+
+    private Long reportId;
+
+    private Long doctorId;
+
+    private String content;
+
+    private String remark;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Byte isDel;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getReportId() {
+        return reportId;
+    }
+
+    public void setReportId(Long reportId) {
+        this.reportId = reportId;
+    }
+
+    public Long getDoctorId() {
+        return doctorId;
+    }
+
+    public void setDoctorId(Long doctorId) {
+        this.doctorId = doctorId;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content == null ? null : content.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Byte isDel) {
+        this.isDel = isDel;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", reportId=").append(reportId);
+        sb.append(", doctorId=").append(doctorId);
+        sb.append(", content=").append(content);
+        sb.append(", remark=").append(remark);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", isDel=").append(isDel);
+        sb.append("]");
+        return sb.toString();
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtPatientReportRecordExample.java

@@ -0,0 +1,701 @@
+package com.ccsens.question.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class HtPatientReportRecordExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public HtPatientReportRecordExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdIsNull() {
+            addCriterion("report_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdIsNotNull() {
+            addCriterion("report_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdEqualTo(Long value) {
+            addCriterion("report_id =", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotEqualTo(Long value) {
+            addCriterion("report_id <>", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdGreaterThan(Long value) {
+            addCriterion("report_id >", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("report_id >=", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdLessThan(Long value) {
+            addCriterion("report_id <", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdLessThanOrEqualTo(Long value) {
+            addCriterion("report_id <=", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdIn(List<Long> values) {
+            addCriterion("report_id in", values, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotIn(List<Long> values) {
+            addCriterion("report_id not in", values, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdBetween(Long value1, Long value2) {
+            addCriterion("report_id between", value1, value2, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotBetween(Long value1, Long value2) {
+            addCriterion("report_id not between", value1, value2, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDoctorIdIsNull() {
+            addCriterion("doctor_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDoctorIdIsNotNull() {
+            addCriterion("doctor_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDoctorIdEqualTo(Long value) {
+            addCriterion("doctor_id =", value, "doctorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDoctorIdNotEqualTo(Long value) {
+            addCriterion("doctor_id <>", value, "doctorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDoctorIdGreaterThan(Long value) {
+            addCriterion("doctor_id >", value, "doctorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDoctorIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("doctor_id >=", value, "doctorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDoctorIdLessThan(Long value) {
+            addCriterion("doctor_id <", value, "doctorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDoctorIdLessThanOrEqualTo(Long value) {
+            addCriterion("doctor_id <=", value, "doctorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDoctorIdIn(List<Long> values) {
+            addCriterion("doctor_id in", values, "doctorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDoctorIdNotIn(List<Long> values) {
+            addCriterion("doctor_id not in", values, "doctorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDoctorIdBetween(Long value1, Long value2) {
+            addCriterion("doctor_id between", value1, value2, "doctorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDoctorIdNotBetween(Long value1, Long value2) {
+            addCriterion("doctor_id not between", value1, value2, "doctorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentIsNull() {
+            addCriterion("content is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentIsNotNull() {
+            addCriterion("content is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentEqualTo(String value) {
+            addCriterion("content =", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentNotEqualTo(String value) {
+            addCriterion("content <>", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentGreaterThan(String value) {
+            addCriterion("content >", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentGreaterThanOrEqualTo(String value) {
+            addCriterion("content >=", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentLessThan(String value) {
+            addCriterion("content <", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentLessThanOrEqualTo(String value) {
+            addCriterion("content <=", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentLike(String value) {
+            addCriterion("content like", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentNotLike(String value) {
+            addCriterion("content not like", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentIn(List<String> values) {
+            addCriterion("content in", values, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentNotIn(List<String> values) {
+            addCriterion("content not in", values, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentBetween(String value1, String value2) {
+            addCriterion("content between", value1, value2, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentNotBetween(String value1, String value2) {
+            addCriterion("content not between", value1, value2, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNull() {
+            addCriterion("remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNotNull() {
+            addCriterion("remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkEqualTo(String value) {
+            addCriterion("remark =", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotEqualTo(String value) {
+            addCriterion("remark <>", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThan(String value) {
+            addCriterion("remark >", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("remark >=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThan(String value) {
+            addCriterion("remark <", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThanOrEqualTo(String value) {
+            addCriterion("remark <=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLike(String value) {
+            addCriterion("remark like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotLike(String value) {
+            addCriterion("remark not like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIn(List<String> values) {
+            addCriterion("remark in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotIn(List<String> values) {
+            addCriterion("remark not in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkBetween(String value1, String value2) {
+            addCriterion("remark between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotBetween(String value1, String value2) {
+            addCriterion("remark not between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelIsNull() {
+            addCriterion("is_del is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelIsNotNull() {
+            addCriterion("is_del is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelEqualTo(Byte value) {
+            addCriterion("is_del =", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelNotEqualTo(Byte value) {
+            addCriterion("is_del <>", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelGreaterThan(Byte value) {
+            addCriterion("is_del >", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelGreaterThanOrEqualTo(Byte value) {
+            addCriterion("is_del >=", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelLessThan(Byte value) {
+            addCriterion("is_del <", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelLessThanOrEqualTo(Byte value) {
+            addCriterion("is_del <=", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelIn(List<Byte> values) {
+            addCriterion("is_del in", values, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelNotIn(List<Byte> values) {
+            addCriterion("is_del not in", values, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelBetween(Byte value1, Byte value2) {
+            addCriterion("is_del between", value1, value2, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelNotBetween(Byte value1, Byte value2) {
+            addCriterion("is_del not between", value1, value2, "isDel");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtPatientScore.java

@@ -0,0 +1,184 @@
+package com.ccsens.question.bean.po;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class HtPatientScore implements Serializable {
+    private Long id;
+
+    private Long patientReportId;
+
+    private Long patientId;
+
+    private String questionParentCode;
+
+    private Long questionId;
+
+    private Long optionId;
+
+    private String optionName;
+
+    private BigDecimal score;
+
+    private Byte type;
+
+    private String answer;
+
+    private String remark;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Byte isDel;
+
+    private Long answerTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getPatientReportId() {
+        return patientReportId;
+    }
+
+    public void setPatientReportId(Long patientReportId) {
+        this.patientReportId = patientReportId;
+    }
+
+    public Long getPatientId() {
+        return patientId;
+    }
+
+    public void setPatientId(Long patientId) {
+        this.patientId = patientId;
+    }
+
+    public String getQuestionParentCode() {
+        return questionParentCode;
+    }
+
+    public void setQuestionParentCode(String questionParentCode) {
+        this.questionParentCode = questionParentCode == null ? null : questionParentCode.trim();
+    }
+
+    public Long getQuestionId() {
+        return questionId;
+    }
+
+    public void setQuestionId(Long questionId) {
+        this.questionId = questionId;
+    }
+
+    public Long getOptionId() {
+        return optionId;
+    }
+
+    public void setOptionId(Long optionId) {
+        this.optionId = optionId;
+    }
+
+    public String getOptionName() {
+        return optionName;
+    }
+
+    public void setOptionName(String optionName) {
+        this.optionName = optionName == null ? null : optionName.trim();
+    }
+
+    public BigDecimal getScore() {
+        return score;
+    }
+
+    public void setScore(BigDecimal score) {
+        this.score = score;
+    }
+
+    public Byte getType() {
+        return type;
+    }
+
+    public void setType(Byte type) {
+        this.type = type;
+    }
+
+    public String getAnswer() {
+        return answer;
+    }
+
+    public void setAnswer(String answer) {
+        this.answer = answer == null ? null : answer.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Byte isDel) {
+        this.isDel = isDel;
+    }
+
+    public Long getAnswerTime() {
+        return answerTime;
+    }
+
+    public void setAnswerTime(Long answerTime) {
+        this.answerTime = answerTime;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", patientReportId=").append(patientReportId);
+        sb.append(", patientId=").append(patientId);
+        sb.append(", questionParentCode=").append(questionParentCode);
+        sb.append(", questionId=").append(questionId);
+        sb.append(", optionId=").append(optionId);
+        sb.append(", optionName=").append(optionName);
+        sb.append(", score=").append(score);
+        sb.append(", type=").append(type);
+        sb.append(", answer=").append(answer);
+        sb.append(", remark=").append(remark);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", isDel=").append(isDel);
+        sb.append(", answerTime=").append(answerTime);
+        sb.append("]");
+        return sb.toString();
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtPosition.java

@@ -0,0 +1,150 @@
+package com.ccsens.question.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class HtPosition implements Serializable {
+    private Long id;
+
+    private Byte type;
+
+    private String name;
+
+    private Long superiorDepartmentId;
+
+    private Long superiorId;
+
+    private String relevancy;
+
+    private Byte hasManage;
+
+    private Byte hasAudit;
+
+    private String remark;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Byte isDel;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Byte getType() {
+        return type;
+    }
+
+    public void setType(Byte type) {
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public Long getSuperiorDepartmentId() {
+        return superiorDepartmentId;
+    }
+
+    public void setSuperiorDepartmentId(Long superiorDepartmentId) {
+        this.superiorDepartmentId = superiorDepartmentId;
+    }
+
+    public Long getSuperiorId() {
+        return superiorId;
+    }
+
+    public void setSuperiorId(Long superiorId) {
+        this.superiorId = superiorId;
+    }
+
+    public String getRelevancy() {
+        return relevancy;
+    }
+
+    public void setRelevancy(String relevancy) {
+        this.relevancy = relevancy == null ? null : relevancy.trim();
+    }
+
+    public Byte getHasManage() {
+        return hasManage;
+    }
+
+    public void setHasManage(Byte hasManage) {
+        this.hasManage = hasManage;
+    }
+
+    public Byte getHasAudit() {
+        return hasAudit;
+    }
+
+    public void setHasAudit(Byte hasAudit) {
+        this.hasAudit = hasAudit;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Byte isDel) {
+        this.isDel = isDel;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", type=").append(type);
+        sb.append(", name=").append(name);
+        sb.append(", superiorDepartmentId=").append(superiorDepartmentId);
+        sb.append(", superiorId=").append(superiorId);
+        sb.append(", relevancy=").append(relevancy);
+        sb.append(", hasManage=").append(hasManage);
+        sb.append(", hasAudit=").append(hasAudit);
+        sb.append(", remark=").append(remark);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", isDel=").append(isDel);
+        sb.append("]");
+        return sb.toString();
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtPositionExample.java

@@ -0,0 +1,951 @@
+package com.ccsens.question.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class HtPositionExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public HtPositionExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNull() {
+            addCriterion("type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(Byte value) {
+            addCriterion("type =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(Byte value) {
+            addCriterion("type <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(Byte value) {
+            addCriterion("type >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(Byte value) {
+            addCriterion("type >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(Byte value) {
+            addCriterion("type <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(Byte value) {
+            addCriterion("type <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<Byte> values) {
+            addCriterion("type in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<Byte> values) {
+            addCriterion("type not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(Byte value1, Byte value2) {
+            addCriterion("type between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(Byte value1, Byte value2) {
+            addCriterion("type not between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperiorDepartmentIdIsNull() {
+            addCriterion("superior_department_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperiorDepartmentIdIsNotNull() {
+            addCriterion("superior_department_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperiorDepartmentIdEqualTo(Long value) {
+            addCriterion("superior_department_id =", value, "superiorDepartmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperiorDepartmentIdNotEqualTo(Long value) {
+            addCriterion("superior_department_id <>", value, "superiorDepartmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperiorDepartmentIdGreaterThan(Long value) {
+            addCriterion("superior_department_id >", value, "superiorDepartmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperiorDepartmentIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("superior_department_id >=", value, "superiorDepartmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperiorDepartmentIdLessThan(Long value) {
+            addCriterion("superior_department_id <", value, "superiorDepartmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperiorDepartmentIdLessThanOrEqualTo(Long value) {
+            addCriterion("superior_department_id <=", value, "superiorDepartmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperiorDepartmentIdIn(List<Long> values) {
+            addCriterion("superior_department_id in", values, "superiorDepartmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperiorDepartmentIdNotIn(List<Long> values) {
+            addCriterion("superior_department_id not in", values, "superiorDepartmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperiorDepartmentIdBetween(Long value1, Long value2) {
+            addCriterion("superior_department_id between", value1, value2, "superiorDepartmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperiorDepartmentIdNotBetween(Long value1, Long value2) {
+            addCriterion("superior_department_id not between", value1, value2, "superiorDepartmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperiorIdIsNull() {
+            addCriterion("superior_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperiorIdIsNotNull() {
+            addCriterion("superior_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperiorIdEqualTo(Long value) {
+            addCriterion("superior_id =", value, "superiorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperiorIdNotEqualTo(Long value) {
+            addCriterion("superior_id <>", value, "superiorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperiorIdGreaterThan(Long value) {
+            addCriterion("superior_id >", value, "superiorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperiorIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("superior_id >=", value, "superiorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperiorIdLessThan(Long value) {
+            addCriterion("superior_id <", value, "superiorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperiorIdLessThanOrEqualTo(Long value) {
+            addCriterion("superior_id <=", value, "superiorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperiorIdIn(List<Long> values) {
+            addCriterion("superior_id in", values, "superiorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperiorIdNotIn(List<Long> values) {
+            addCriterion("superior_id not in", values, "superiorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperiorIdBetween(Long value1, Long value2) {
+            addCriterion("superior_id between", value1, value2, "superiorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperiorIdNotBetween(Long value1, Long value2) {
+            addCriterion("superior_id not between", value1, value2, "superiorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelevancyIsNull() {
+            addCriterion("relevancy is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelevancyIsNotNull() {
+            addCriterion("relevancy is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelevancyEqualTo(String value) {
+            addCriterion("relevancy =", value, "relevancy");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelevancyNotEqualTo(String value) {
+            addCriterion("relevancy <>", value, "relevancy");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelevancyGreaterThan(String value) {
+            addCriterion("relevancy >", value, "relevancy");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelevancyGreaterThanOrEqualTo(String value) {
+            addCriterion("relevancy >=", value, "relevancy");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelevancyLessThan(String value) {
+            addCriterion("relevancy <", value, "relevancy");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelevancyLessThanOrEqualTo(String value) {
+            addCriterion("relevancy <=", value, "relevancy");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelevancyLike(String value) {
+            addCriterion("relevancy like", value, "relevancy");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelevancyNotLike(String value) {
+            addCriterion("relevancy not like", value, "relevancy");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelevancyIn(List<String> values) {
+            addCriterion("relevancy in", values, "relevancy");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelevancyNotIn(List<String> values) {
+            addCriterion("relevancy not in", values, "relevancy");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelevancyBetween(String value1, String value2) {
+            addCriterion("relevancy between", value1, value2, "relevancy");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelevancyNotBetween(String value1, String value2) {
+            addCriterion("relevancy not between", value1, value2, "relevancy");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasManageIsNull() {
+            addCriterion("has_manage is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasManageIsNotNull() {
+            addCriterion("has_manage is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasManageEqualTo(Byte value) {
+            addCriterion("has_manage =", value, "hasManage");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasManageNotEqualTo(Byte value) {
+            addCriterion("has_manage <>", value, "hasManage");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasManageGreaterThan(Byte value) {
+            addCriterion("has_manage >", value, "hasManage");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasManageGreaterThanOrEqualTo(Byte value) {
+            addCriterion("has_manage >=", value, "hasManage");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasManageLessThan(Byte value) {
+            addCriterion("has_manage <", value, "hasManage");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasManageLessThanOrEqualTo(Byte value) {
+            addCriterion("has_manage <=", value, "hasManage");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasManageIn(List<Byte> values) {
+            addCriterion("has_manage in", values, "hasManage");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasManageNotIn(List<Byte> values) {
+            addCriterion("has_manage not in", values, "hasManage");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasManageBetween(Byte value1, Byte value2) {
+            addCriterion("has_manage between", value1, value2, "hasManage");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasManageNotBetween(Byte value1, Byte value2) {
+            addCriterion("has_manage not between", value1, value2, "hasManage");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasAuditIsNull() {
+            addCriterion("has_audit is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasAuditIsNotNull() {
+            addCriterion("has_audit is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasAuditEqualTo(Byte value) {
+            addCriterion("has_audit =", value, "hasAudit");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasAuditNotEqualTo(Byte value) {
+            addCriterion("has_audit <>", value, "hasAudit");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasAuditGreaterThan(Byte value) {
+            addCriterion("has_audit >", value, "hasAudit");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasAuditGreaterThanOrEqualTo(Byte value) {
+            addCriterion("has_audit >=", value, "hasAudit");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasAuditLessThan(Byte value) {
+            addCriterion("has_audit <", value, "hasAudit");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasAuditLessThanOrEqualTo(Byte value) {
+            addCriterion("has_audit <=", value, "hasAudit");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasAuditIn(List<Byte> values) {
+            addCriterion("has_audit in", values, "hasAudit");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasAuditNotIn(List<Byte> values) {
+            addCriterion("has_audit not in", values, "hasAudit");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasAuditBetween(Byte value1, Byte value2) {
+            addCriterion("has_audit between", value1, value2, "hasAudit");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasAuditNotBetween(Byte value1, Byte value2) {
+            addCriterion("has_audit not between", value1, value2, "hasAudit");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNull() {
+            addCriterion("remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNotNull() {
+            addCriterion("remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkEqualTo(String value) {
+            addCriterion("remark =", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotEqualTo(String value) {
+            addCriterion("remark <>", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThan(String value) {
+            addCriterion("remark >", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("remark >=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThan(String value) {
+            addCriterion("remark <", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThanOrEqualTo(String value) {
+            addCriterion("remark <=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLike(String value) {
+            addCriterion("remark like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotLike(String value) {
+            addCriterion("remark not like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIn(List<String> values) {
+            addCriterion("remark in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotIn(List<String> values) {
+            addCriterion("remark not in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkBetween(String value1, String value2) {
+            addCriterion("remark between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotBetween(String value1, String value2) {
+            addCriterion("remark not between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelIsNull() {
+            addCriterion("is_del is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelIsNotNull() {
+            addCriterion("is_del is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelEqualTo(Byte value) {
+            addCriterion("is_del =", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelNotEqualTo(Byte value) {
+            addCriterion("is_del <>", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelGreaterThan(Byte value) {
+            addCriterion("is_del >", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelGreaterThanOrEqualTo(Byte value) {
+            addCriterion("is_del >=", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelLessThan(Byte value) {
+            addCriterion("is_del <", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelLessThanOrEqualTo(Byte value) {
+            addCriterion("is_del <=", value, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelIn(List<Byte> values) {
+            addCriterion("is_del in", values, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelNotIn(List<Byte> values) {
+            addCriterion("is_del not in", values, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelBetween(Byte value1, Byte value2) {
+            addCriterion("is_del between", value1, value2, "isDel");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelNotBetween(Byte value1, Byte value2) {
+            addCriterion("is_del not between", value1, value2, "isDel");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtQuestion.java

@@ -0,0 +1,227 @@
+package com.ccsens.question.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class HtQuestion implements Serializable {
+    private Long id;
+
+    private String evaluationCode;
+
+    private String parentCode;
+
+    private Integer sort;
+
+    private String question;
+
+    private Byte type;
+
+    private String recordType;
+
+    private String recordContent;
+
+    private String relationCode;
+
+    private Byte operateType;
+
+    private Byte recodeStarttime;
+
+    private Byte timeWabei;
+
+    private Byte allowClear;
+
+    private Integer clearTimes;
+
+    private Integer timingLength;
+
+    private String remark;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Byte isDel;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getEvaluationCode() {
+        return evaluationCode;
+    }
+
+    public void setEvaluationCode(String evaluationCode) {
+        this.evaluationCode = evaluationCode == null ? null : evaluationCode.trim();
+    }
+
+    public String getParentCode() {
+        return parentCode;
+    }
+
+    public void setParentCode(String parentCode) {
+        this.parentCode = parentCode == null ? null : parentCode.trim();
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public String getQuestion() {
+        return question;
+    }
+
+    public void setQuestion(String question) {
+        this.question = question == null ? null : question.trim();
+    }
+
+    public Byte getType() {
+        return type;
+    }
+
+    public void setType(Byte type) {
+        this.type = type;
+    }
+
+    public String getRecordType() {
+        return recordType;
+    }
+
+    public void setRecordType(String recordType) {
+        this.recordType = recordType == null ? null : recordType.trim();
+    }
+
+    public String getRecordContent() {
+        return recordContent;
+    }
+
+    public void setRecordContent(String recordContent) {
+        this.recordContent = recordContent == null ? null : recordContent.trim();
+    }
+
+    public String getRelationCode() {
+        return relationCode;
+    }
+
+    public void setRelationCode(String relationCode) {
+        this.relationCode = relationCode == null ? null : relationCode.trim();
+    }
+
+    public Byte getOperateType() {
+        return operateType;
+    }
+
+    public void setOperateType(Byte operateType) {
+        this.operateType = operateType;
+    }
+
+    public Byte getRecodeStarttime() {
+        return recodeStarttime;
+    }
+
+    public void setRecodeStarttime(Byte recodeStarttime) {
+        this.recodeStarttime = recodeStarttime;
+    }
+
+    public Byte getTimeWabei() {
+        return timeWabei;
+    }
+
+    public void setTimeWabei(Byte timeWabei) {
+        this.timeWabei = timeWabei;
+    }
+
+    public Byte getAllowClear() {
+        return allowClear;
+    }
+
+    public void setAllowClear(Byte allowClear) {
+        this.allowClear = allowClear;
+    }
+
+    public Integer getClearTimes() {
+        return clearTimes;
+    }
+
+    public void setClearTimes(Integer clearTimes) {
+        this.clearTimes = clearTimes;
+    }
+
+    public Integer getTimingLength() {
+        return timingLength;
+    }
+
+    public void setTimingLength(Integer timingLength) {
+        this.timingLength = timingLength;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Byte isDel) {
+        this.isDel = isDel;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", evaluationCode=").append(evaluationCode);
+        sb.append(", parentCode=").append(parentCode);
+        sb.append(", sort=").append(sort);
+        sb.append(", question=").append(question);
+        sb.append(", type=").append(type);
+        sb.append(", recordType=").append(recordType);
+        sb.append(", recordContent=").append(recordContent);
+        sb.append(", relationCode=").append(relationCode);
+        sb.append(", operateType=").append(operateType);
+        sb.append(", recodeStarttime=").append(recodeStarttime);
+        sb.append(", timeWabei=").append(timeWabei);
+        sb.append(", allowClear=").append(allowClear);
+        sb.append(", clearTimes=").append(clearTimes);
+        sb.append(", timingLength=").append(timingLength);
+        sb.append(", remark=").append(remark);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", isDel=").append(isDel);
+        sb.append("]");
+        return sb.toString();
+    }
+}

question/src/main/java/com/ccsens/question/bean/po/HtQuestionIntroducer.java

@@ -0,0 +1,106 @@
+package com.ccsens.question.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class HtQuestionIntroducer implements Serializable {
+    private Long id;
+
+    private Long questionId;
+
+    private String content;
+
+    private Integer sort;
+
+    private String remark;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Byte isDel;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getQuestionId() {
+        return questionId;
+    }
+
+    public void setQuestionId(Long questionId) {
+        this.questionId = questionId;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content == null ? null : content.trim();
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Byte isDel) {
+        this.isDel = isDel;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", questionId=").append(questionId);
+        sb.append(", content=").append(content);
+        sb.append(", sort=").append(sort);
+        sb.append(", remark=").append(remark);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", isDel=").append(isDel);
+        sb.append("]");
+        return sb.toString();
+    }
+}