diff --git a/cloudutil/src/main/resources/application-util-prod.yml b/cloudutil/src/main/resources/application-util-prod.yml index 29039116..7b43a817 100644 --- a/cloudutil/src/main/resources/application-util-prod.yml +++ b/cloudutil/src/main/resources/application-util-prod.yml @@ -21,7 +21,7 @@ eureka: # 指定eureka server通信地址，注意/eureka/小尾巴不能少 #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/ # defaultZone: http://admin:admin@192.144.182.42:7010/eureka/ - defaultZone: http://admin:admin@81.70.54.64:7010/eureka/ + defaultZone: http://admin:admin@121.36.3.207:7010/eureka/ instance: # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server prefer-ip-address: true diff --git a/cloudutil/src/main/resources/application-util-test.yml b/cloudutil/src/main/resources/application-util-test.yml index 5bac785a..569f6b37 100644 --- a/cloudutil/src/main/resources/application-util-test.yml +++ b/cloudutil/src/main/resources/application-util-test.yml @@ -20,7 +20,7 @@ eureka: service-url: # 指定eureka server通信地址，注意/eureka/小尾巴不能少 #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/ - defaultZone: http://admin:admin@192.168.31.13:7010/eureka/ + defaultZone: http://admin:admin@192.168.4.113:7010/eureka/ instance: # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server prefer-ip-address: true diff --git a/ht/src/main/java/com/ccsens/ht/api/ImportController.java b/ht/src/main/java/com/ccsens/ht/api/ImportController.java index acb3e011..c6cd339e 100644 --- a/ht/src/main/java/com/ccsens/ht/api/ImportController.java +++ b/ht/src/main/java/com/ccsens/ht/api/ImportController.java @@ -1,5 +1,6 @@ package com.ccsens.ht.api; +import cn.hutool.core.collection.CollectionUtil; import com.ccsens.ht.service.IImportService; import com.ccsens.ht.uitl.Constant; import com.ccsens.util.JsonResponse; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.Part; import java.io.File; +import java.util.List; /** @@ -54,19 +56,27 @@ public class ImportController { 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); + File excelFile = new File(dir+path); long time2 = System.currentTimeMillis(); log.info("解析文件耗时：{}", (time2 - time1)); - importService.importPosition(execlFile, 0); + importService.importPosition(excelFile, 0); long time3 = System.currentTimeMillis(); log.info("导入职务耗时：{}", (time3 - time2)); - importService.importTitle(execlFile, 1); + importService.importTitle(excelFile, 1); long time4 = System.currentTimeMillis(); log.info("导入职称耗时：{}", (time4 - time3)); - importService.importReport(execlFile, 2); + List codes = importService.importReport(excelFile, 2); long time5 = System.currentTimeMillis(); log.info("导入报告单耗时：{}", (time5 - time4)); - importService.importQuestion(execlFile, Constant.Ht.Question.ALL); + importService.importReportRecord(excelFile, 3); + log.info("导入报告单其他记录耗时：{}", System.currentTimeMillis() - time5); + if (CollectionUtil.isNotEmpty(codes)) { + for (String code: codes) { + importService.importQuestion(excelFile, code); + log.info("{}导入完成",code); + } + } + return JsonResponse.newInstance().ok(); } @@ -84,24 +94,45 @@ public class ImportController { @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); + File excelFile = new File(dir+path); + importService.importReport(excelFile, 2); + return JsonResponse.newInstance().ok(); + } + + @ApiOperation(value = "单独导入报告单类型",notes = "文件大小不能超过20M，支持后缀:.xls|.xlsx") + @ApiImplicitParams({ + @ApiImplicitParam(name = "file", value = "医疗项目表", required = true, paramType = "form",dataType = "__file") + }) + @RequestMapping(value = "/importReportTypeRecord", method = RequestMethod.POST) + public JsonResponse importReportTypeRecord(@RequestParam(required = true) Part file) throws Exception{ + //1.上传文件 + String allowedExts = "xls,xlsx"; + String dir = WebConstant.UPLOAD_PROJECT_WBS + File.separator; + String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExts, dir); + File excelFile = new File(dir+path); + importService.importReportRecord(excelFile, 3); + return JsonResponse.newInstance().ok(); + } + + @ApiOperation(value = "导入指定测评类型",notes = "文件大小不能超过20M，支持后缀:.xls|.xlsx") + @ApiImplicitParams({ + @ApiImplicitParam(name = "file", value = "医疗项目表", required = true, paramType = "form",dataType = "__file"), + @ApiImplicitParam(name = "code", value = "测评类型", required = true, paramType = "form",dataType = "__file") + }) + @RequestMapping(value = "/importEvaluation", method = RequestMethod.POST) + public JsonResponse importEvaluation(@RequestParam(required = true) Part file, @RequestParam(required = true) String code) throws Exception{ + + //1.上传文件 + String allowedExts = "xls,xlsx"; + String dir = WebConstant.UPLOAD_PROJECT_WBS + File.separator; + String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExts, dir); + File excelFile = new File(dir+path); + importService.importQuestion(excelFile, code); + log.info("导入{}",code); return JsonResponse.newInstance().ok(); } @@ -120,14 +151,12 @@ public class ImportController { @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); + File excelFile = new File(dir+path); + importService.importQuestion(excelFile, Constant.Ht.Report.MOCA); log.info("导入moca"); return JsonResponse.newInstance().ok(); } @@ -146,14 +175,12 @@ public class ImportController { @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); + File excelFile = new File(dir+path); + importService.importQuestion(excelFile, Constant.Ht.Report.MMSE); log.info("导入mmse"); return JsonResponse.newInstance().ok(); } @@ -172,14 +199,12 @@ public class ImportController { @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); + File excelFile = new File(dir+path); + importService.importQuestion(excelFile, Constant.Ht.Report.REY); log.info("导入Rey"); return JsonResponse.newInstance().ok(); } @@ -199,14 +224,12 @@ public class ImportController { @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); + File excelFile = new File(dir+path); + importService.importQuestion(excelFile, Constant.Ht.Report.XFXPD); log.info("导入XFXPD"); return JsonResponse.newInstance().ok(); } diff --git a/ht/src/main/java/com/ccsens/ht/api/PatientReportController.java b/ht/src/main/java/com/ccsens/ht/api/PatientReportController.java index 55edf517..fb8e6253 100644 --- a/ht/src/main/java/com/ccsens/ht/api/PatientReportController.java +++ b/ht/src/main/java/com/ccsens/ht/api/PatientReportController.java @@ -14,7 +14,6 @@ import com.ccsens.util.JsonResponse; 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; @@ -143,20 +142,10 @@ public class PatientReportController { return JsonResponse.newInstance().ok(authority); } - @ApiOperation(value = "导出报告单",notes = "导出报告单") - @ApiImplicitParams({ - @ApiImplicitParam(name = "json", value = "导出报告单", required = true) - }) - @RequestMapping(value="/exportReport", method = RequestMethod.POST) - public JsonResponse exportReport(@RequestBody @ApiParam @Valid QueryDto 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({ @@ -166,7 +155,7 @@ public class PatientReportController { public JsonResponse shareReport(@RequestBody @ApiParam @Valid QueryDto param) throws IOException { //查询报告单信息 log.info("查询报告单详情：{}", param); - String path = patientReportService.generateQRCode(param.getParam(), param.getUserId()); + String path = patientReportService.generateQrCode(param.getParam(), param.getUserId()); log.info("文件路径:{}", path); PatientReportVo.Export export = new PatientReportVo.Export(); export.setPath(path); diff --git a/ht/src/main/java/com/ccsens/ht/api/PatientReportExportController.java b/ht/src/main/java/com/ccsens/ht/api/PatientReportExportController.java new file mode 100644 index 00000000..59a88088 --- /dev/null +++ b/ht/src/main/java/com/ccsens/ht/api/PatientReportExportController.java @@ -0,0 +1,87 @@ +package com.ccsens.ht.api; + +import cn.hutool.core.util.CharsetUtil; +import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.ht.annotation.DoctorAudit; +import com.ccsens.ht.bean.dto.PatientReportDto; +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 io.swagger.annotations.*; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.usermodel.Workbook; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.List; + +/** + * @description: + * @author: whj + * @time: 2021/4/21 19:01 + */ +@Slf4j +@Api(tags = "报告单导出",value = "报告单导出") +@RestController +public class PatientReportExportController { + @Resource + private IPatientReportService patientReportService; + + @MustLogin + @DoctorAudit + @ApiOperation(value = "导出报告单",notes = "导出报告单") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "导出报告单", required = true) + }) + @RequestMapping(value="/exportReport", method = RequestMethod.POST) + public JsonResponse exportReport(@RequestBody @ApiParam @Valid QueryDto 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); + } + + @MustLogin + @DoctorAudit + @ApiOperation(value = "导出指定量表",notes = "导出指定量表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "导出指定量表", required = true) + }) + @RequestMapping(value="/export", method = RequestMethod.POST) + public JsonResponse export(@RequestBody @ApiParam @Valid QueryDto param) { + //查询报告单信息 + log.info("导出指定报告单：{}", param); + String path = patientReportService.export(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 = "导出指定id的报告单分析",notes = "导出指定id的报告单分析") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "导出指定id的报告单分析", required = true) + }) + @RequestMapping(value="/exportAnalyse", method = RequestMethod.GET) + public void exportAnalyse(@RequestParam(value = "ids")@ApiParam @Valid List ids, HttpServletResponse response) throws IOException { + //查询报告单信息 + log.info("导出指定报告单分析：{}", ids); + Workbook workbook = patientReportService.exportAnalyse(ids); + log.info("导出报告单分析结束"); + String fileName = "报告单信息.xlsx"; + response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, CharsetUtil.UTF_8)); + workbook.write(response.getOutputStream()); + } + +} diff --git a/ht/src/main/java/com/ccsens/ht/api/QuestionController.java b/ht/src/main/java/com/ccsens/ht/api/QuestionController.java index 8b915e09..2b798dae 100644 --- a/ht/src/main/java/com/ccsens/ht/api/QuestionController.java +++ b/ht/src/main/java/com/ccsens/ht/api/QuestionController.java @@ -44,7 +44,6 @@ public class QuestionController { @RequestMapping(value="/queryQuestion", method = RequestMethod.POST) public JsonResponse query(@RequestBody @ApiParam @Valid QueryDto queryDto){ log.info("查询试题：{}", queryDto); - QuestionVo.Query query = questionService.queryQuestion(queryDto.getParam(), queryDto.getUserId()); log.info("查询试题结果：{}", query); return JsonResponse.newInstance().ok(query); @@ -92,6 +91,19 @@ public class QuestionController { return JsonResponse.newInstance().ok(patientCanvas); } + @MustLogin + @DoctorAudit + @ApiOperation(value = "保存题目的其他记录",notes = "whj:保存题目的其他记录") + @ApiImplicitParams({ + }) + @RequestMapping(value="/saveRecord", method = RequestMethod.POST) + public JsonResponse saveRecord(@RequestBody @ApiParam @Valid QueryDto queryDto) { + log.info("保存题目的其他记录：{}", queryDto); + questionService.saveRecord(queryDto.getParam(), queryDto.getUserId()); + log.info("保存题目的其他记录成功"); + return JsonResponse.newInstance().ok(); + } + @MustLogin @DoctorAudit @ApiOperation(value = "查看用户画图信息",notes = "zy:查看画板信息画图轨迹等") @@ -117,4 +129,5 @@ public class QuestionController { log.info("删除画图轨迹成功"); return JsonResponse.newInstance().ok(); } + } diff --git a/ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportDto.java b/ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportDto.java index 5f82f7aa..3a55f747 100644 --- a/ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportDto.java +++ b/ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportDto.java @@ -7,6 +7,7 @@ import lombok.Data; import org.springframework.beans.BeanUtils; import javax.validation.constraints.*; +import java.util.List; /** * @program: ptpro @@ -83,8 +84,34 @@ public class PatientReportDto { private Long id; @ApiModelProperty("是否需要rey 默认为0 0全部查询导出 1不导出rey 2只导出rey") private int rey = 0; + @ApiModelProperty("报告单类型") + private String report = "REPORT1.0"; + } + + @ApiModel("导出指定某一种报告单") + @Data + public static class ExportCode{ + @ApiModelProperty("病人报告单ID") + @NotNull(message = "病人报告单ID不能为空") + private Long id; + @ApiModelProperty("报告单类型") + private String code; + } + + + @ApiModel("导出报告单分析-请求") + @Data + public static class ExportSpecial{ + @ApiModelProperty("报告单ID") + private Long id; + +// public ExportSpecial() { +// } +// +// public ExportSpecial(Long id) { +// this.id = id; +// } } - /**医生对报告单权限*/ @ApiModel("PatientReportDtoAuthority") @@ -114,12 +141,20 @@ public class PatientReportDto { @ApiModel("查询报告单") @Data public static class AdminQueryReport { + @ApiModelProperty("病人名字") + private String patientName; @ApiModelProperty("病人年龄-开始") private Byte startAge; @ApiModelProperty("病人年龄-结束") private Byte endAge; @ApiModelProperty("性别") private Byte patientSex; + @ApiModelProperty("教育程度（1：文盲 2：小学 3：初中 4：高中 5：大学 6：大学以上 7：其他）") + private Byte educationalStatus; + @ApiModelProperty("受教时间-开始") + private Integer startEducationalStatusUnit; + @ApiModelProperty("受教时间-结束") + private Integer endEducationalStatusUnit; @ApiModelProperty("临床诊断") private String clinicalDiagnosis; @ApiModelProperty("严重程度") @@ -128,6 +163,8 @@ public class PatientReportDto { private Long startTime; @ApiModelProperty("结束时间") private Long endTime; + @ApiModelProperty("分数") + private List scores; @ApiModelProperty("第几页") @Min(value = 1) private int pageNum = 1; @@ -137,6 +174,17 @@ public class PatientReportDto { private int pageSize = 10; } + @ApiModel("分数") + @Data + public static class Score{ + @ApiModelProperty("量表类型") + private String code; + @ApiModelProperty("开始") + private Double start; + @ApiModelProperty("结束") + private Double end; + } + @ApiModel("临床诊断统计请求") @Data public static class ClinicalDiagnosis{ diff --git a/ht/src/main/java/com/ccsens/ht/bean/dto/QuestionDto.java b/ht/src/main/java/com/ccsens/ht/bean/dto/QuestionDto.java index 25af3566..e01aa060 100644 --- a/ht/src/main/java/com/ccsens/ht/bean/dto/QuestionDto.java +++ b/ht/src/main/java/com/ccsens/ht/bean/dto/QuestionDto.java @@ -5,8 +5,10 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.servlet.http.Part; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.io.File; +import java.math.BigDecimal; import java.util.List; /** @@ -75,6 +77,30 @@ public class QuestionDto { @ApiModelProperty("超出占比") private String beyondProportion; } + + @Data + @ApiModel("其他记录-request") + public static class Record{ + @NotNull + @ApiModelProperty("病人报告单ID") + private Long patientReportId; + @NotNull + @ApiModelProperty("其他记录答案") + private List details; + + } + + @Data + @ApiModel("其他记录答案-request") + public static class RecordDetail{ + @ApiModelProperty("试题ID") + @NotNull(message = "试题ID不能为空") + private Long recordId; + @NotEmpty + @ApiModelProperty("答案") + private List answers; + } + @Data @ApiModel("画板信息") public static class Canvas{ @@ -101,6 +127,10 @@ public class QuestionDto { @NotNull(message = "测评试题id不能为空") @ApiModelProperty("测评试题id") private Long questionId; + @ApiModelProperty("参考长度") + private BigDecimal referenceLength; + @ApiModelProperty("参考思考时间") + private BigDecimal referenceReflectOnTime; } @Data diff --git a/ht/src/main/java/com/ccsens/ht/bean/po/HtPatientReportRecordDesc.java b/ht/src/main/java/com/ccsens/ht/bean/po/HtPatientReportRecordDesc.java new file mode 100644 index 00000000..ea87d55c --- /dev/null +++ b/ht/src/main/java/com/ccsens/ht/bean/po/HtPatientReportRecordDesc.java @@ -0,0 +1,117 @@ +package com.ccsens.ht.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class HtPatientReportRecordDesc implements Serializable { + private Long id; + + private Long patientReportId; + + private Long recordId; + + 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 getRecordId() { + return recordId; + } + + public void setRecordId(Long recordId) { + this.recordId = recordId; + } + + 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(", recordId=").append(recordId); + 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(); + } +} \ No newline at end of file diff --git a/ht/src/main/java/com/ccsens/ht/bean/po/HtPatientReportRecordDescExample.java b/ht/src/main/java/com/ccsens/ht/bean/po/HtPatientReportRecordDescExample.java new file mode 100644 index 00000000..b3197b3c --- /dev/null +++ b/ht/src/main/java/com/ccsens/ht/bean/po/HtPatientReportRecordDescExample.java @@ -0,0 +1,761 @@ +package com.ccsens.ht.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class HtPatientReportRecordDescExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public HtPatientReportRecordDescExample() { + oredCriteria = new ArrayList(); + } + + 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 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List 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 values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 values) { + addCriterion("patient_report_id in", values, "patientReportId"); + return (Criteria) this; + } + + public Criteria andPatientReportIdNotIn(List 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 andRecordIdIsNull() { + addCriterion("record_id is null"); + return (Criteria) this; + } + + public Criteria andRecordIdIsNotNull() { + addCriterion("record_id is not null"); + return (Criteria) this; + } + + public Criteria andRecordIdEqualTo(Long value) { + addCriterion("record_id =", value, "recordId"); + return (Criteria) this; + } + + public Criteria andRecordIdNotEqualTo(Long value) { + addCriterion("record_id <>", value, "recordId"); + return (Criteria) this; + } + + public Criteria andRecordIdGreaterThan(Long value) { + addCriterion("record_id >", value, "recordId"); + return (Criteria) this; + } + + public Criteria andRecordIdGreaterThanOrEqualTo(Long value) { + addCriterion("record_id >=", value, "recordId"); + return (Criteria) this; + } + + public Criteria andRecordIdLessThan(Long value) { + addCriterion("record_id <", value, "recordId"); + return (Criteria) this; + } + + public Criteria andRecordIdLessThanOrEqualTo(Long value) { + addCriterion("record_id <=", value, "recordId"); + return (Criteria) this; + } + + public Criteria andRecordIdIn(List values) { + addCriterion("record_id in", values, "recordId"); + return (Criteria) this; + } + + public Criteria andRecordIdNotIn(List values) { + addCriterion("record_id not in", values, "recordId"); + return (Criteria) this; + } + + public Criteria andRecordIdBetween(Long value1, Long value2) { + addCriterion("record_id between", value1, value2, "recordId"); + return (Criteria) this; + } + + public Criteria andRecordIdNotBetween(Long value1, Long value2) { + addCriterion("record_id not between", value1, value2, "recordId"); + return (Criteria) this; + } + + public Criteria andAnswerIsNull() { + addCriterion("answer is null"); + return (Criteria) this; + } + + public Criteria andAnswerIsNotNull() { + addCriterion("answer is not null"); + return (Criteria) this; + } + + public Criteria andAnswerEqualTo(String value) { + addCriterion("answer =", value, "answer"); + return (Criteria) this; + } + + public Criteria andAnswerNotEqualTo(String value) { + addCriterion("answer <>", value, "answer"); + return (Criteria) this; + } + + public Criteria andAnswerGreaterThan(String value) { + addCriterion("answer >", value, "answer"); + return (Criteria) this; + } + + public Criteria andAnswerGreaterThanOrEqualTo(String value) { + addCriterion("answer >=", value, "answer"); + return (Criteria) this; + } + + public Criteria andAnswerLessThan(String value) { + addCriterion("answer <", value, "answer"); + return (Criteria) this; + } + + public Criteria andAnswerLessThanOrEqualTo(String value) { + addCriterion("answer <=", value, "answer"); + return (Criteria) this; + } + + public Criteria andAnswerLike(String value) { + addCriterion("answer like", value, "answer"); + return (Criteria) this; + } + + public Criteria andAnswerNotLike(String value) { + addCriterion("answer not like", value, "answer"); + return (Criteria) this; + } + + public Criteria andAnswerIn(List values) { + addCriterion("answer in", values, "answer"); + return (Criteria) this; + } + + public Criteria andAnswerNotIn(List values) { + addCriterion("answer not in", values, "answer"); + return (Criteria) this; + } + + public Criteria andAnswerBetween(String value1, String value2) { + addCriterion("answer between", value1, value2, "answer"); + return (Criteria) this; + } + + public Criteria andAnswerNotBetween(String value1, String value2) { + addCriterion("answer not between", value1, value2, "answer"); + 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 values) { + addCriterion("remark in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotIn(List 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 values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List 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 values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List 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 values) { + addCriterion("is_del in", values, "isDel"); + return (Criteria) this; + } + + public Criteria andIsDelNotIn(List 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 andAnswerTimeIsNull() { + addCriterion("answer_time is null"); + return (Criteria) this; + } + + public Criteria andAnswerTimeIsNotNull() { + addCriterion("answer_time is not null"); + return (Criteria) this; + } + + public Criteria andAnswerTimeEqualTo(Long value) { + addCriterion("answer_time =", value, "answerTime"); + return (Criteria) this; + } + + public Criteria andAnswerTimeNotEqualTo(Long value) { + addCriterion("answer_time <>", value, "answerTime"); + return (Criteria) this; + } + + public Criteria andAnswerTimeGreaterThan(Long value) { + addCriterion("answer_time >", value, "answerTime"); + return (Criteria) this; + } + + public Criteria andAnswerTimeGreaterThanOrEqualTo(Long value) { + addCriterion("answer_time >=", value, "answerTime"); + return (Criteria) this; + } + + public Criteria andAnswerTimeLessThan(Long value) { + addCriterion("answer_time <", value, "answerTime"); + return (Criteria) this; + } + + public Criteria andAnswerTimeLessThanOrEqualTo(Long value) { + addCriterion("answer_time <=", value, "answerTime"); + return (Criteria) this; + } + + public Criteria andAnswerTimeIn(List values) { + addCriterion("answer_time in", values, "answerTime"); + return (Criteria) this; + } + + public Criteria andAnswerTimeNotIn(List values) { + addCriterion("answer_time not in", values, "answerTime"); + return (Criteria) this; + } + + public Criteria andAnswerTimeBetween(Long value1, Long value2) { + addCriterion("answer_time between", value1, value2, "answerTime"); + return (Criteria) this; + } + + public Criteria andAnswerTimeNotBetween(Long value1, Long value2) { + addCriterion("answer_time not between", value1, value2, "answerTime"); + 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); + } + } +} \ No newline at end of file diff --git a/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestion.java b/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestion.java index 1b662016..b0d06c7b 100644 --- a/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestion.java +++ b/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestion.java @@ -22,6 +22,8 @@ public class HtQuestion implements Serializable { private String relationCode; + private Long relationId; + private Byte operateType; private Byte recodeStarttime; @@ -116,6 +118,14 @@ public class HtQuestion implements Serializable { this.relationCode = relationCode == null ? null : relationCode.trim(); } + public Long getRelationId() { + return relationId; + } + + public void setRelationId(Long relationId) { + this.relationId = relationId; + } + public Byte getOperateType() { return operateType; } @@ -211,6 +221,7 @@ public class HtQuestion implements Serializable { sb.append(", recordType=").append(recordType); sb.append(", recordContent=").append(recordContent); sb.append(", relationCode=").append(relationCode); + sb.append(", relationId=").append(relationId); sb.append(", operateType=").append(operateType); sb.append(", recodeStarttime=").append(recodeStarttime); sb.append(", timeWabei=").append(timeWabei); diff --git a/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionExample.java b/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionExample.java index bfb64772..283522f7 100644 --- a/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionExample.java +++ b/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionExample.java @@ -705,6 +705,66 @@ public class HtQuestionExample { return (Criteria) this; } + public Criteria andRelationIdIsNull() { + addCriterion("relation_id is null"); + return (Criteria) this; + } + + public Criteria andRelationIdIsNotNull() { + addCriterion("relation_id is not null"); + return (Criteria) this; + } + + public Criteria andRelationIdEqualTo(Long value) { + addCriterion("relation_id =", value, "relationId"); + return (Criteria) this; + } + + public Criteria andRelationIdNotEqualTo(Long value) { + addCriterion("relation_id <>", value, "relationId"); + return (Criteria) this; + } + + public Criteria andRelationIdGreaterThan(Long value) { + addCriterion("relation_id >", value, "relationId"); + return (Criteria) this; + } + + public Criteria andRelationIdGreaterThanOrEqualTo(Long value) { + addCriterion("relation_id >=", value, "relationId"); + return (Criteria) this; + } + + public Criteria andRelationIdLessThan(Long value) { + addCriterion("relation_id <", value, "relationId"); + return (Criteria) this; + } + + public Criteria andRelationIdLessThanOrEqualTo(Long value) { + addCriterion("relation_id <=", value, "relationId"); + return (Criteria) this; + } + + public Criteria andRelationIdIn(List values) { + addCriterion("relation_id in", values, "relationId"); + return (Criteria) this; + } + + public Criteria andRelationIdNotIn(List values) { + addCriterion("relation_id not in", values, "relationId"); + return (Criteria) this; + } + + public Criteria andRelationIdBetween(Long value1, Long value2) { + addCriterion("relation_id between", value1, value2, "relationId"); + return (Criteria) this; + } + + public Criteria andRelationIdNotBetween(Long value1, Long value2) { + addCriterion("relation_id not between", value1, value2, "relationId"); + return (Criteria) this; + } + public Criteria andOperateTypeIsNull() { addCriterion("operate_type is null"); return (Criteria) this; diff --git a/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionOptionDesc.java b/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionOptionDesc.java new file mode 100644 index 00000000..443f62a9 --- /dev/null +++ b/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionOptionDesc.java @@ -0,0 +1,117 @@ +package com.ccsens.ht.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class HtQuestionOptionDesc implements Serializable { + private Long id; + + private Long optionId; + + private Integer sort; + + private Byte type; + + 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 getOptionId() { + return optionId; + } + + public void setOptionId(Long optionId) { + this.optionId = optionId; + } + + public Integer getSort() { + return sort; + } + + public void setSort(Integer sort) { + this.sort = sort; + } + + public Byte getType() { + return type; + } + + public void setType(Byte type) { + this.type = type; + } + + 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(", optionId=").append(optionId); + sb.append(", sort=").append(sort); + sb.append(", type=").append(type); + 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(); + } +} \ No newline at end of file diff --git a/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionOptionDescExample.java b/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionOptionDescExample.java new file mode 100644 index 00000000..24c87bb4 --- /dev/null +++ b/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionOptionDescExample.java @@ -0,0 +1,761 @@ +package com.ccsens.ht.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class HtQuestionOptionDescExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public HtQuestionOptionDescExample() { + oredCriteria = new ArrayList(); + } + + 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 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List 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 values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andOptionIdIsNull() { + addCriterion("option_id is null"); + return (Criteria) this; + } + + public Criteria andOptionIdIsNotNull() { + addCriterion("option_id is not null"); + return (Criteria) this; + } + + public Criteria andOptionIdEqualTo(Long value) { + addCriterion("option_id =", value, "optionId"); + return (Criteria) this; + } + + public Criteria andOptionIdNotEqualTo(Long value) { + addCriterion("option_id <>", value, "optionId"); + return (Criteria) this; + } + + public Criteria andOptionIdGreaterThan(Long value) { + addCriterion("option_id >", value, "optionId"); + return (Criteria) this; + } + + public Criteria andOptionIdGreaterThanOrEqualTo(Long value) { + addCriterion("option_id >=", value, "optionId"); + return (Criteria) this; + } + + public Criteria andOptionIdLessThan(Long value) { + addCriterion("option_id <", value, "optionId"); + return (Criteria) this; + } + + public Criteria andOptionIdLessThanOrEqualTo(Long value) { + addCriterion("option_id <=", value, "optionId"); + return (Criteria) this; + } + + public Criteria andOptionIdIn(List values) { + addCriterion("option_id in", values, "optionId"); + return (Criteria) this; + } + + public Criteria andOptionIdNotIn(List values) { + addCriterion("option_id not in", values, "optionId"); + return (Criteria) this; + } + + public Criteria andOptionIdBetween(Long value1, Long value2) { + addCriterion("option_id between", value1, value2, "optionId"); + return (Criteria) this; + } + + public Criteria andOptionIdNotBetween(Long value1, Long value2) { + addCriterion("option_id not between", value1, value2, "optionId"); + return (Criteria) this; + } + + public Criteria andSortIsNull() { + addCriterion("sort is null"); + return (Criteria) this; + } + + public Criteria andSortIsNotNull() { + addCriterion("sort is not null"); + return (Criteria) this; + } + + public Criteria andSortEqualTo(Integer value) { + addCriterion("sort =", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortNotEqualTo(Integer value) { + addCriterion("sort <>", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortGreaterThan(Integer value) { + addCriterion("sort >", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortGreaterThanOrEqualTo(Integer value) { + addCriterion("sort >=", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortLessThan(Integer value) { + addCriterion("sort <", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortLessThanOrEqualTo(Integer value) { + addCriterion("sort <=", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortIn(List values) { + addCriterion("sort in", values, "sort"); + return (Criteria) this; + } + + public Criteria andSortNotIn(List values) { + addCriterion("sort not in", values, "sort"); + return (Criteria) this; + } + + public Criteria andSortBetween(Integer value1, Integer value2) { + addCriterion("sort between", value1, value2, "sort"); + return (Criteria) this; + } + + public Criteria andSortNotBetween(Integer value1, Integer value2) { + addCriterion("sort not between", value1, value2, "sort"); + 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 values) { + addCriterion("type in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotIn(List 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 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 values) { + addCriterion("content in", values, "content"); + return (Criteria) this; + } + + public Criteria andContentNotIn(List 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 values) { + addCriterion("remark in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotIn(List 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 values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List 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 values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List 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 values) { + addCriterion("is_del in", values, "isDel"); + return (Criteria) this; + } + + public Criteria andIsDelNotIn(List 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); + } + } +} \ No newline at end of file diff --git a/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionRecord.java b/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionRecord.java new file mode 100644 index 00000000..001d7dee --- /dev/null +++ b/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionRecord.java @@ -0,0 +1,161 @@ +package com.ccsens.ht.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class HtQuestionRecord implements Serializable { + private Long id; + + private Byte recordType; + + private Long questionId; + + private Integer sort; + + private Byte calcType; + + private String showTitle; + + private String showForm; + + private String defaultValue; + + private Byte type; + + 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 getRecordType() { + return recordType; + } + + public void setRecordType(Byte recordType) { + this.recordType = recordType; + } + + 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 Byte getCalcType() { + return calcType; + } + + public void setCalcType(Byte calcType) { + this.calcType = calcType; + } + + public String getShowTitle() { + return showTitle; + } + + public void setShowTitle(String showTitle) { + this.showTitle = showTitle == null ? null : showTitle.trim(); + } + + public String getShowForm() { + return showForm; + } + + public void setShowForm(String showForm) { + this.showForm = showForm == null ? null : showForm.trim(); + } + + public String getDefaultValue() { + return defaultValue; + } + + public void setDefaultValue(String defaultValue) { + this.defaultValue = defaultValue == null ? null : defaultValue.trim(); + } + + public Byte getType() { + return type; + } + + public void setType(Byte type) { + this.type = type; + } + + 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(", recordType=").append(recordType); + sb.append(", questionId=").append(questionId); + sb.append(", sort=").append(sort); + sb.append(", calcType=").append(calcType); + sb.append(", showTitle=").append(showTitle); + sb.append(", showForm=").append(showForm); + sb.append(", defaultValue=").append(defaultValue); + sb.append(", type=").append(type); + 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(); + } +} \ No newline at end of file diff --git a/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionRecordExample.java b/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionRecordExample.java new file mode 100644 index 00000000..e4a669ca --- /dev/null +++ b/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionRecordExample.java @@ -0,0 +1,1021 @@ +package com.ccsens.ht.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class HtQuestionRecordExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public HtQuestionRecordExample() { + oredCriteria = new ArrayList(); + } + + 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 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List 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 values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andRecordTypeIsNull() { + addCriterion("record_type is null"); + return (Criteria) this; + } + + public Criteria andRecordTypeIsNotNull() { + addCriterion("record_type is not null"); + return (Criteria) this; + } + + public Criteria andRecordTypeEqualTo(Byte value) { + addCriterion("record_type =", value, "recordType"); + return (Criteria) this; + } + + public Criteria andRecordTypeNotEqualTo(Byte value) { + addCriterion("record_type <>", value, "recordType"); + return (Criteria) this; + } + + public Criteria andRecordTypeGreaterThan(Byte value) { + addCriterion("record_type >", value, "recordType"); + return (Criteria) this; + } + + public Criteria andRecordTypeGreaterThanOrEqualTo(Byte value) { + addCriterion("record_type >=", value, "recordType"); + return (Criteria) this; + } + + public Criteria andRecordTypeLessThan(Byte value) { + addCriterion("record_type <", value, "recordType"); + return (Criteria) this; + } + + public Criteria andRecordTypeLessThanOrEqualTo(Byte value) { + addCriterion("record_type <=", value, "recordType"); + return (Criteria) this; + } + + public Criteria andRecordTypeIn(List values) { + addCriterion("record_type in", values, "recordType"); + return (Criteria) this; + } + + public Criteria andRecordTypeNotIn(List values) { + addCriterion("record_type not in", values, "recordType"); + return (Criteria) this; + } + + public Criteria andRecordTypeBetween(Byte value1, Byte value2) { + addCriterion("record_type between", value1, value2, "recordType"); + return (Criteria) this; + } + + public Criteria andRecordTypeNotBetween(Byte value1, Byte value2) { + addCriterion("record_type not between", value1, value2, "recordType"); + 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 values) { + addCriterion("question_id in", values, "questionId"); + return (Criteria) this; + } + + public Criteria andQuestionIdNotIn(List 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 andSortIsNull() { + addCriterion("sort is null"); + return (Criteria) this; + } + + public Criteria andSortIsNotNull() { + addCriterion("sort is not null"); + return (Criteria) this; + } + + public Criteria andSortEqualTo(Integer value) { + addCriterion("sort =", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortNotEqualTo(Integer value) { + addCriterion("sort <>", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortGreaterThan(Integer value) { + addCriterion("sort >", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortGreaterThanOrEqualTo(Integer value) { + addCriterion("sort >=", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortLessThan(Integer value) { + addCriterion("sort <", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortLessThanOrEqualTo(Integer value) { + addCriterion("sort <=", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortIn(List values) { + addCriterion("sort in", values, "sort"); + return (Criteria) this; + } + + public Criteria andSortNotIn(List values) { + addCriterion("sort not in", values, "sort"); + return (Criteria) this; + } + + public Criteria andSortBetween(Integer value1, Integer value2) { + addCriterion("sort between", value1, value2, "sort"); + return (Criteria) this; + } + + public Criteria andSortNotBetween(Integer value1, Integer value2) { + addCriterion("sort not between", value1, value2, "sort"); + return (Criteria) this; + } + + public Criteria andCalcTypeIsNull() { + addCriterion("calc_type is null"); + return (Criteria) this; + } + + public Criteria andCalcTypeIsNotNull() { + addCriterion("calc_type is not null"); + return (Criteria) this; + } + + public Criteria andCalcTypeEqualTo(Byte value) { + addCriterion("calc_type =", value, "calcType"); + return (Criteria) this; + } + + public Criteria andCalcTypeNotEqualTo(Byte value) { + addCriterion("calc_type <>", value, "calcType"); + return (Criteria) this; + } + + public Criteria andCalcTypeGreaterThan(Byte value) { + addCriterion("calc_type >", value, "calcType"); + return (Criteria) this; + } + + public Criteria andCalcTypeGreaterThanOrEqualTo(Byte value) { + addCriterion("calc_type >=", value, "calcType"); + return (Criteria) this; + } + + public Criteria andCalcTypeLessThan(Byte value) { + addCriterion("calc_type <", value, "calcType"); + return (Criteria) this; + } + + public Criteria andCalcTypeLessThanOrEqualTo(Byte value) { + addCriterion("calc_type <=", value, "calcType"); + return (Criteria) this; + } + + public Criteria andCalcTypeIn(List values) { + addCriterion("calc_type in", values, "calcType"); + return (Criteria) this; + } + + public Criteria andCalcTypeNotIn(List values) { + addCriterion("calc_type not in", values, "calcType"); + return (Criteria) this; + } + + public Criteria andCalcTypeBetween(Byte value1, Byte value2) { + addCriterion("calc_type between", value1, value2, "calcType"); + return (Criteria) this; + } + + public Criteria andCalcTypeNotBetween(Byte value1, Byte value2) { + addCriterion("calc_type not between", value1, value2, "calcType"); + return (Criteria) this; + } + + public Criteria andShowTitleIsNull() { + addCriterion("show_title is null"); + return (Criteria) this; + } + + public Criteria andShowTitleIsNotNull() { + addCriterion("show_title is not null"); + return (Criteria) this; + } + + public Criteria andShowTitleEqualTo(String value) { + addCriterion("show_title =", value, "showTitle"); + return (Criteria) this; + } + + public Criteria andShowTitleNotEqualTo(String value) { + addCriterion("show_title <>", value, "showTitle"); + return (Criteria) this; + } + + public Criteria andShowTitleGreaterThan(String value) { + addCriterion("show_title >", value, "showTitle"); + return (Criteria) this; + } + + public Criteria andShowTitleGreaterThanOrEqualTo(String value) { + addCriterion("show_title >=", value, "showTitle"); + return (Criteria) this; + } + + public Criteria andShowTitleLessThan(String value) { + addCriterion("show_title <", value, "showTitle"); + return (Criteria) this; + } + + public Criteria andShowTitleLessThanOrEqualTo(String value) { + addCriterion("show_title <=", value, "showTitle"); + return (Criteria) this; + } + + public Criteria andShowTitleLike(String value) { + addCriterion("show_title like", value, "showTitle"); + return (Criteria) this; + } + + public Criteria andShowTitleNotLike(String value) { + addCriterion("show_title not like", value, "showTitle"); + return (Criteria) this; + } + + public Criteria andShowTitleIn(List values) { + addCriterion("show_title in", values, "showTitle"); + return (Criteria) this; + } + + public Criteria andShowTitleNotIn(List values) { + addCriterion("show_title not in", values, "showTitle"); + return (Criteria) this; + } + + public Criteria andShowTitleBetween(String value1, String value2) { + addCriterion("show_title between", value1, value2, "showTitle"); + return (Criteria) this; + } + + public Criteria andShowTitleNotBetween(String value1, String value2) { + addCriterion("show_title not between", value1, value2, "showTitle"); + return (Criteria) this; + } + + public Criteria andShowFormIsNull() { + addCriterion("show_form is null"); + return (Criteria) this; + } + + public Criteria andShowFormIsNotNull() { + addCriterion("show_form is not null"); + return (Criteria) this; + } + + public Criteria andShowFormEqualTo(String value) { + addCriterion("show_form =", value, "showForm"); + return (Criteria) this; + } + + public Criteria andShowFormNotEqualTo(String value) { + addCriterion("show_form <>", value, "showForm"); + return (Criteria) this; + } + + public Criteria andShowFormGreaterThan(String value) { + addCriterion("show_form >", value, "showForm"); + return (Criteria) this; + } + + public Criteria andShowFormGreaterThanOrEqualTo(String value) { + addCriterion("show_form >=", value, "showForm"); + return (Criteria) this; + } + + public Criteria andShowFormLessThan(String value) { + addCriterion("show_form <", value, "showForm"); + return (Criteria) this; + } + + public Criteria andShowFormLessThanOrEqualTo(String value) { + addCriterion("show_form <=", value, "showForm"); + return (Criteria) this; + } + + public Criteria andShowFormLike(String value) { + addCriterion("show_form like", value, "showForm"); + return (Criteria) this; + } + + public Criteria andShowFormNotLike(String value) { + addCriterion("show_form not like", value, "showForm"); + return (Criteria) this; + } + + public Criteria andShowFormIn(List values) { + addCriterion("show_form in", values, "showForm"); + return (Criteria) this; + } + + public Criteria andShowFormNotIn(List values) { + addCriterion("show_form not in", values, "showForm"); + return (Criteria) this; + } + + public Criteria andShowFormBetween(String value1, String value2) { + addCriterion("show_form between", value1, value2, "showForm"); + return (Criteria) this; + } + + public Criteria andShowFormNotBetween(String value1, String value2) { + addCriterion("show_form not between", value1, value2, "showForm"); + return (Criteria) this; + } + + public Criteria andDefaultValueIsNull() { + addCriterion("default_value is null"); + return (Criteria) this; + } + + public Criteria andDefaultValueIsNotNull() { + addCriterion("default_value is not null"); + return (Criteria) this; + } + + public Criteria andDefaultValueEqualTo(String value) { + addCriterion("default_value =", value, "defaultValue"); + return (Criteria) this; + } + + public Criteria andDefaultValueNotEqualTo(String value) { + addCriterion("default_value <>", value, "defaultValue"); + return (Criteria) this; + } + + public Criteria andDefaultValueGreaterThan(String value) { + addCriterion("default_value >", value, "defaultValue"); + return (Criteria) this; + } + + public Criteria andDefaultValueGreaterThanOrEqualTo(String value) { + addCriterion("default_value >=", value, "defaultValue"); + return (Criteria) this; + } + + public Criteria andDefaultValueLessThan(String value) { + addCriterion("default_value <", value, "defaultValue"); + return (Criteria) this; + } + + public Criteria andDefaultValueLessThanOrEqualTo(String value) { + addCriterion("default_value <=", value, "defaultValue"); + return (Criteria) this; + } + + public Criteria andDefaultValueLike(String value) { + addCriterion("default_value like", value, "defaultValue"); + return (Criteria) this; + } + + public Criteria andDefaultValueNotLike(String value) { + addCriterion("default_value not like", value, "defaultValue"); + return (Criteria) this; + } + + public Criteria andDefaultValueIn(List values) { + addCriterion("default_value in", values, "defaultValue"); + return (Criteria) this; + } + + public Criteria andDefaultValueNotIn(List values) { + addCriterion("default_value not in", values, "defaultValue"); + return (Criteria) this; + } + + public Criteria andDefaultValueBetween(String value1, String value2) { + addCriterion("default_value between", value1, value2, "defaultValue"); + return (Criteria) this; + } + + public Criteria andDefaultValueNotBetween(String value1, String value2) { + addCriterion("default_value not between", value1, value2, "defaultValue"); + 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 values) { + addCriterion("type in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotIn(List 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 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 values) { + addCriterion("remark in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotIn(List 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 values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List 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 values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List 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 values) { + addCriterion("is_del in", values, "isDel"); + return (Criteria) this; + } + + public Criteria andIsDelNotIn(List 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); + } + } +} \ No newline at end of file diff --git a/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionRecordOption.java b/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionRecordOption.java new file mode 100644 index 00000000..114a11a8 --- /dev/null +++ b/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionRecordOption.java @@ -0,0 +1,117 @@ +package com.ccsens.ht.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class HtQuestionRecordOption implements Serializable { + private Long id; + + private Long questionRecordId; + + private Integer sort; + + private String dataKey; + + private String dataValue; + + 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 getQuestionRecordId() { + return questionRecordId; + } + + public void setQuestionRecordId(Long questionRecordId) { + this.questionRecordId = questionRecordId; + } + + public Integer getSort() { + return sort; + } + + public void setSort(Integer sort) { + this.sort = sort; + } + + public String getDataKey() { + return dataKey; + } + + public void setDataKey(String dataKey) { + this.dataKey = dataKey == null ? null : dataKey.trim(); + } + + public String getDataValue() { + return dataValue; + } + + public void setDataValue(String dataValue) { + this.dataValue = dataValue == null ? null : dataValue.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(", questionRecordId=").append(questionRecordId); + sb.append(", sort=").append(sort); + sb.append(", dataKey=").append(dataKey); + sb.append(", dataValue=").append(dataValue); + 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(); + } +} \ No newline at end of file diff --git a/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionRecordOptionExample.java b/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionRecordOptionExample.java new file mode 100644 index 00000000..9ea20ee4 --- /dev/null +++ b/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionRecordOptionExample.java @@ -0,0 +1,771 @@ +package com.ccsens.ht.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class HtQuestionRecordOptionExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public HtQuestionRecordOptionExample() { + oredCriteria = new ArrayList(); + } + + 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 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List 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 values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 andQuestionRecordIdIsNull() { + addCriterion("question_record_id is null"); + return (Criteria) this; + } + + public Criteria andQuestionRecordIdIsNotNull() { + addCriterion("question_record_id is not null"); + return (Criteria) this; + } + + public Criteria andQuestionRecordIdEqualTo(Long value) { + addCriterion("question_record_id =", value, "questionRecordId"); + return (Criteria) this; + } + + public Criteria andQuestionRecordIdNotEqualTo(Long value) { + addCriterion("question_record_id <>", value, "questionRecordId"); + return (Criteria) this; + } + + public Criteria andQuestionRecordIdGreaterThan(Long value) { + addCriterion("question_record_id >", value, "questionRecordId"); + return (Criteria) this; + } + + public Criteria andQuestionRecordIdGreaterThanOrEqualTo(Long value) { + addCriterion("question_record_id >=", value, "questionRecordId"); + return (Criteria) this; + } + + public Criteria andQuestionRecordIdLessThan(Long value) { + addCriterion("question_record_id <", value, "questionRecordId"); + return (Criteria) this; + } + + public Criteria andQuestionRecordIdLessThanOrEqualTo(Long value) { + addCriterion("question_record_id <=", value, "questionRecordId"); + return (Criteria) this; + } + + public Criteria andQuestionRecordIdIn(List values) { + addCriterion("question_record_id in", values, "questionRecordId"); + return (Criteria) this; + } + + public Criteria andQuestionRecordIdNotIn(List values) { + addCriterion("question_record_id not in", values, "questionRecordId"); + return (Criteria) this; + } + + public Criteria andQuestionRecordIdBetween(Long value1, Long value2) { + addCriterion("question_record_id between", value1, value2, "questionRecordId"); + return (Criteria) this; + } + + public Criteria andQuestionRecordIdNotBetween(Long value1, Long value2) { + addCriterion("question_record_id not between", value1, value2, "questionRecordId"); + return (Criteria) this; + } + + public Criteria andSortIsNull() { + addCriterion("sort is null"); + return (Criteria) this; + } + + public Criteria andSortIsNotNull() { + addCriterion("sort is not null"); + return (Criteria) this; + } + + public Criteria andSortEqualTo(Integer value) { + addCriterion("sort =", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortNotEqualTo(Integer value) { + addCriterion("sort <>", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortGreaterThan(Integer value) { + addCriterion("sort >", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortGreaterThanOrEqualTo(Integer value) { + addCriterion("sort >=", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortLessThan(Integer value) { + addCriterion("sort <", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortLessThanOrEqualTo(Integer value) { + addCriterion("sort <=", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortIn(List values) { + addCriterion("sort in", values, "sort"); + return (Criteria) this; + } + + public Criteria andSortNotIn(List values) { + addCriterion("sort not in", values, "sort"); + return (Criteria) this; + } + + public Criteria andSortBetween(Integer value1, Integer value2) { + addCriterion("sort between", value1, value2, "sort"); + return (Criteria) this; + } + + public Criteria andSortNotBetween(Integer value1, Integer value2) { + addCriterion("sort not between", value1, value2, "sort"); + return (Criteria) this; + } + + public Criteria andDataKeyIsNull() { + addCriterion("data_key is null"); + return (Criteria) this; + } + + public Criteria andDataKeyIsNotNull() { + addCriterion("data_key is not null"); + return (Criteria) this; + } + + public Criteria andDataKeyEqualTo(String value) { + addCriterion("data_key =", value, "dataKey"); + return (Criteria) this; + } + + public Criteria andDataKeyNotEqualTo(String value) { + addCriterion("data_key <>", value, "dataKey"); + return (Criteria) this; + } + + public Criteria andDataKeyGreaterThan(String value) { + addCriterion("data_key >", value, "dataKey"); + return (Criteria) this; + } + + public Criteria andDataKeyGreaterThanOrEqualTo(String value) { + addCriterion("data_key >=", value, "dataKey"); + return (Criteria) this; + } + + public Criteria andDataKeyLessThan(String value) { + addCriterion("data_key <", value, "dataKey"); + return (Criteria) this; + } + + public Criteria andDataKeyLessThanOrEqualTo(String value) { + addCriterion("data_key <=", value, "dataKey"); + return (Criteria) this; + } + + public Criteria andDataKeyLike(String value) { + addCriterion("data_key like", value, "dataKey"); + return (Criteria) this; + } + + public Criteria andDataKeyNotLike(String value) { + addCriterion("data_key not like", value, "dataKey"); + return (Criteria) this; + } + + public Criteria andDataKeyIn(List values) { + addCriterion("data_key in", values, "dataKey"); + return (Criteria) this; + } + + public Criteria andDataKeyNotIn(List values) { + addCriterion("data_key not in", values, "dataKey"); + return (Criteria) this; + } + + public Criteria andDataKeyBetween(String value1, String value2) { + addCriterion("data_key between", value1, value2, "dataKey"); + return (Criteria) this; + } + + public Criteria andDataKeyNotBetween(String value1, String value2) { + addCriterion("data_key not between", value1, value2, "dataKey"); + return (Criteria) this; + } + + public Criteria andDataValueIsNull() { + addCriterion("data_value is null"); + return (Criteria) this; + } + + public Criteria andDataValueIsNotNull() { + addCriterion("data_value is not null"); + return (Criteria) this; + } + + public Criteria andDataValueEqualTo(String value) { + addCriterion("data_value =", value, "dataValue"); + return (Criteria) this; + } + + public Criteria andDataValueNotEqualTo(String value) { + addCriterion("data_value <>", value, "dataValue"); + return (Criteria) this; + } + + public Criteria andDataValueGreaterThan(String value) { + addCriterion("data_value >", value, "dataValue"); + return (Criteria) this; + } + + public Criteria andDataValueGreaterThanOrEqualTo(String value) { + addCriterion("data_value >=", value, "dataValue"); + return (Criteria) this; + } + + public Criteria andDataValueLessThan(String value) { + addCriterion("data_value <", value, "dataValue"); + return (Criteria) this; + } + + public Criteria andDataValueLessThanOrEqualTo(String value) { + addCriterion("data_value <=", value, "dataValue"); + return (Criteria) this; + } + + public Criteria andDataValueLike(String value) { + addCriterion("data_value like", value, "dataValue"); + return (Criteria) this; + } + + public Criteria andDataValueNotLike(String value) { + addCriterion("data_value not like", value, "dataValue"); + return (Criteria) this; + } + + public Criteria andDataValueIn(List values) { + addCriterion("data_value in", values, "dataValue"); + return (Criteria) this; + } + + public Criteria andDataValueNotIn(List values) { + addCriterion("data_value not in", values, "dataValue"); + return (Criteria) this; + } + + public Criteria andDataValueBetween(String value1, String value2) { + addCriterion("data_value between", value1, value2, "dataValue"); + return (Criteria) this; + } + + public Criteria andDataValueNotBetween(String value1, String value2) { + addCriterion("data_value not between", value1, value2, "dataValue"); + 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 values) { + addCriterion("remark in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotIn(List 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 values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List 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 values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List 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 values) { + addCriterion("is_del in", values, "isDel"); + return (Criteria) this; + } + + public Criteria andIsDelNotIn(List 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); + } + } +} \ No newline at end of file diff --git a/ht/src/main/java/com/ccsens/ht/bean/vo/PatientReportVo.java b/ht/src/main/java/com/ccsens/ht/bean/vo/PatientReportVo.java index 5a371bda..a3443747 100644 --- a/ht/src/main/java/com/ccsens/ht/bean/vo/PatientReportVo.java +++ b/ht/src/main/java/com/ccsens/ht/bean/vo/PatientReportVo.java @@ -14,9 +14,9 @@ import java.math.BigDecimal; import java.util.*; /** - * @program: ptpro + * @program: ht * @description: - * @author: wu huijuan + * @author: whj * @create: 2019/10/31 10:28 */ public class PatientReportVo { @@ -129,10 +129,49 @@ public class PatientReportVo { private String hospital; public List toPdfRow(){ + List rows = getInitRows(); + //第四栏 + rows.add( + fillRow( + "临床诊断：" + this.clinicalDiagnosis, + "","") + ); + + return rows; + } + + + public List toPdfSimpleCodeRow(){ + List rows = getInitRows(); + //第四栏 + Date date = new Date(); + if (this.reportTime != null && this.reportTime > 0) { + date.setTime(this.reportTime); + } + PdfUtil.Row fourRow = new PdfUtil.Row(); + PdfUtil.Cell cell = new PdfUtil.Cell(); + cell.setContent("临床诊断：" + (StrUtil.isEmpty(this.clinicalDiagnosis) ? "" : this.clinicalDiagnosis) ); + cell.setCenter(false); + cell.setColSpan(2); + cell.setBorderLeft(0); + cell.setBorderBottom(0); + fourRow.addCell(cell); + PdfUtil.Cell cell2 = new PdfUtil.Cell(); + cell2.setContent("检查日期：" + DateUtil.format(date, "yyyy-MM-dd")); + cell2.setCenter(false); + cell2.setBorderLeft(0); + cell2.setBorderBottom(0); + fourRow.addCell(cell2); + rows.add(fourRow); + + return rows; + } + + private List getInitRows() { Map careerMap = new HashMap<>(16); String careerMsg = "1：农林牧渔水利生产人员 2：教师 3：医务工作者 4：专业技术人员 5：生产、运输设备操作人员及有关人员 6：商业、服务业人员 7：国家机关、事业单位、企业负责人 8：国家机关、事业单位、企业办事人员和有关人员 9：军人 10：媒体、文体类工作人员 11：在校学生 12：未就业 13：家务 14：其他"; String splitStr = " "; - for (String careerOne: careerMsg.split(splitStr)) { + for (String careerOne : careerMsg.split(splitStr)) { String splitStr2 = "："; careerMap.put(Byte.parseByte(careerOne.split(splitStr2)[0]), careerOne.split(splitStr2)[1]); } @@ -151,30 +190,16 @@ public class PatientReportVo { rows.add( fillRow( "文化程度：" + this.educationalStatusUnit + "年", - "编号：" + this.serialNumber, + "编号：" + (StrUtil.isEmpty(this.serialNumber) ? "" : this.serialNumber), "职业：" + careerMap.get(this.career)) ); //第三栏 rows.add( fillRow( - "科别：" + this.department, - "床号：" + this.bedNumber, - "病案号：" + this.hospitalNumber) + "科别：" + (StrUtil.isEmpty(this.department) ? "" : this.department), + "床号：" + (StrUtil.isEmpty(this.bedNumber) ? "" : this.bedNumber), + "病案号：" + (StrUtil.isEmpty(this.hospitalNumber) ? "" : this.hospitalNumber)) ); - //第四栏 -// Date date = null; -// if (this.reportTime > 0) { -// date = new Date(); -// date.setTime(this.reportTime); -// } - - rows.add( - fillRow( - "临床诊断：" + this.clinicalDiagnosis, - "","") -// "检查日期：" + (date == null ? "" : DateUtil.format(date, "yyyy-MM-dd"))) - ); - return rows; } @@ -223,35 +248,57 @@ public class PatientReportVo { this.subReport.add(score); } + /** + * 将mmse的多层嵌套转成一层 + * @param score 报告 + * @param list 转换后的list + */ + public void dealMMSE(ReportScore score, List list) { + if (CollectionUtil.isEmpty(score.subReport)) { + list.add(score); + } else { + score.subReport.forEach(subScore -> dealMMSE(subScore, list)); + } + } + public List toRow() { - int colNum = 8; + int colNum = 8; int headNum = 2; List rows = new ArrayList<>(); if (CollectionUtil.isEmpty(subReport)) { - PdfUtil.Row row = new PdfUtil.Row(); - PdfUtil.Cell cell1 = new PdfUtil.Cell(); - cell1.setContent(this.code + (StrUtil.isBlank(this.remark) ? "" : "("+this.remark+")")); - cell1.setColSpan(headNum); - PdfUtil.Cell cell2 = new PdfUtil.Cell(); - cell2.setContent(this.score == null ? "" : this.score + (this.totalScore > 0 ? "/" + this.totalScore : "")); - cell2.setColSpan(colNum - headNum); - cell2.setBorderRight(1); - row.addCell(cell1); - row.addCell(cell2); - - rows.add(row); + toRowOnlyTotal(colNum, headNum, rows); } else { String mmse = Constant.Ht.Report.MMSE; String npi = Constant.Ht.Report.NPI; - if (mmse.equalsIgnoreCase(this.code) || npi.equalsIgnoreCase(this.code)) { - fillMmseOrNpi(headNum, rows, mmse, npi); - } else { - fillMoca(rows); + switch (this.code) { + case Constant.Ht.Report.MMSE: + case Constant.Ht.Report.NPI: + fillMmseOrNpi(headNum, rows, mmse, npi); + break; + case Constant.Ht.Report.MOCA: + fillMoca(rows); + break; + case Constant.Ht.Report.HAMD: + case Constant.Ht.Report.HAMA: + case Constant.Ht.Report.ADL: + toRowOnlyTotal(colNum, headNum, rows); + break; + default: + fillCommon(rows); + break; } + + } + toDescRow(colNum, headNum, rows); + + return rows; + } + + private void toDescRow(int colNum, int headNum, List rows) { if (StrUtil.isBlank(this.description)) { - return rows; + return ; } PdfUtil.Row descRow = new PdfUtil.Row(); PdfUtil.Cell cell = new PdfUtil.Cell(); @@ -264,10 +311,166 @@ public class PatientReportVo { // MOCA中，视直觉单独展示 fillSzj(colNum, headNum, rows); + } + + private void toRowOnlyTotal(int colNum, int headNum, List rows) { + PdfUtil.Row row = new PdfUtil.Row(); + PdfUtil.Cell cell1 = new PdfUtil.Cell(); + cell1.setContent(this.code + (StrUtil.isBlank(this.remark) ? "" : "(" + this.remark + ")")); + cell1.setColSpan(headNum); + PdfUtil.Cell cell2 = new PdfUtil.Cell(); + cell2.setContent(this.score == null ? "" : this.score + (this.totalScore > 0 ? "/" + this.totalScore : "")); + cell2.setColSpan(colNum - headNum); + cell2.setBorderRight(1); + row.addCell(cell1); + row.addCell(cell2); + + rows.add(row); + } + + public List toSingleRow() { + int colNum = Constant.Ht.Report.HAMD.equalsIgnoreCase(code) ? 9 : 8; + int headNum = 2; + List rows = new ArrayList<>(); + if (CollectionUtil.isEmpty(subReport)) { + toRowOnlyTotal(colNum, headNum, rows); + } else { + String mmse = Constant.Ht.Report.MMSE; + String npi = Constant.Ht.Report.NPI; + switch (this.code) { + case Constant.Ht.Report.MMSE: + fillMMSE(rows); + break; + case Constant.Ht.Report.NPI: + fillMmseOrNpi(headNum, rows, mmse, npi); + break; + case Constant.Ht.Report.MOCA: + fillSingleMoca(rows); + break; + default: + fillCommon(rows); + break; + } + + + + } + toDescRow(colNum, headNum, rows); return rows; } + private void fillMMSE(List rows) { + List mmseList = new ArrayList<>(); + dealMMSE(this, mmseList); + PdfUtil.Row row = new PdfUtil.Row(); + PdfUtil.Cell purposeCell = new PdfUtil.Cell(Constant.Export.MMSE_PURPOSE); + purposeCell.setColSpan(8); + purposeCell.setBorderRight(1); + purposeCell.setCenter(false); + purposeCell.setHeight(36); + row.addCell(purposeCell); + rows.add(row); + + + PdfUtil.Row titleRow = new PdfUtil.Row(); + PdfUtil.Row scoreRow = new PdfUtil.Row(); + for (int i = 0; i < mmseList.size() ; i++) { + if (i == 0) { + PdfUtil.Cell cell = new PdfUtil.Cell("简明心理状况测验(MMSE)"); + cell.setRowSpan(4); + titleRow.addCell(cell); + rows.add(titleRow); + rows.add(scoreRow); + } else if (i==7){ + titleRow = new PdfUtil.Row(); + scoreRow = new PdfUtil.Row(); + rows.add(titleRow); + rows.add(scoreRow); + } + + ReportScore score = mmseList.get(i); + PdfUtil.Cell titleCell = new PdfUtil.Cell(score.getName()); + titleRow.addCell(titleCell); + titleCell.setBorderRight(i == 6 ? 1 : 0); + PdfUtil.Cell scoreCell = new PdfUtil.Cell(score.score == null ? "" : score.score + (score.totalScore > 0 ? "/" + score.totalScore : "")); + scoreCell.setBorderRight(i == 6 ? 1 : 0); + scoreRow.addCell(scoreCell); + + if (i == mmseList.size() - 1) { + PdfUtil.Cell titleTotalCell = new PdfUtil.Cell("总分"); + titleTotalCell.setColSpan(3); + titleTotalCell.setBorderRight(1); + titleRow.addCell(titleTotalCell); + PdfUtil.Cell scoreTotalCell = new PdfUtil.Cell(this.score == null ? "" : this.score + (this.totalScore > 0 ? "/" + this.totalScore : "")); + scoreTotalCell.setColSpan(3); + scoreTotalCell.setBorderRight(1); + scoreRow.addCell(scoreTotalCell); + } + + } + } + + /** + * 通用项目得分 + * @param rows pdf的内容 + */ + private void fillCommon(List rows) { + //总列数 + int total = Constant.Ht.Report.HAMD.equalsIgnoreCase(code) ? 9 : 8; + // 标题 + PdfUtil.Row row = new PdfUtil.Row(); + PdfUtil.Cell cell = new PdfUtil.Cell(); + cell.setContent(this.name + "(" + this.code + ")各项目的因子分和总分"); + + cell.setColSpan(total); + cell.setBorderTop(0); + cell.setBorderRight(0); + cell.setBorderLeft(0); + row.addCell(cell); + rows.add(row); + + // 默认两行 + PdfUtil.Row row1 = new PdfUtil.Row(); + PdfUtil.Row row2 = new PdfUtil.Row(); + // 题目 + PdfUtil.Cell firstCell1 = new PdfUtil.Cell(); + firstCell1.setContent("项目"); + row1.addCell(firstCell1); + PdfUtil.Cell firstCell2 = new PdfUtil.Cell(); + firstCell2.setContent("计分"); + row2.addCell(firstCell2); + + + // 子类型 + int colspan = (total - 1) / (this.subReport.size() + 1); + int lastSpan = total - 1 - colspan * this.subReport.size(); + this.subReport.forEach(score -> { + PdfUtil.Cell cell1 = new PdfUtil.Cell(); + PdfUtil.Cell cell2 = new PdfUtil.Cell(); + cell1.setContent(score.name); + cell1.setColSpan(colspan); + cell2.setContent(score.score == null ? "" : score.score + (score.totalScore > 0 ? "/" + score.totalScore : "")); + cell2.setColSpan(colspan); + row1.addCell(cell1); + row2.addCell(cell2); + + }); + // 总分 + PdfUtil.Cell lastCell1 = new PdfUtil.Cell(); + lastCell1.setContent("总分"); + lastCell1.setColSpan(lastSpan); + lastCell1.setBorderRight(1); + row1.addCell(lastCell1); + PdfUtil.Cell lastCell2 = new PdfUtil.Cell(); + lastCell2.setContent(this.score == null ? "" : this.score + (this.totalScore > 0 ? "/" + this.totalScore : "")); + lastCell2.setColSpan(lastSpan); + lastCell2.setBorderRight(1); + row2.addCell(lastCell2); + rows.add(row1); + rows.add(row2); + } + private void fillMmseOrNpi(int headNum, List rows, String mmse, String npi) { PdfUtil.Row row1 = new PdfUtil.Row(); PdfUtil.Cell cell = new PdfUtil.Cell(); @@ -293,8 +496,29 @@ public class PatientReportVo { rows.add(row2); } + + private void fillMoca(List rows) { + fillMocaScore(rows); + } + + + + private void fillSingleMoca(List rows) { //moca + PdfUtil.Row row = new PdfUtil.Row(); + PdfUtil.Cell purposeCell = new PdfUtil.Cell(Constant.Export.MOCA_PURPOSE); + purposeCell.setColSpan(8); + purposeCell.setCenter(false); + purposeCell.setBorderRight(1); + purposeCell.setHeight(36); + row.addCell(purposeCell); + rows.add(row); + + fillMocaScore(rows); + } + + private void fillMocaScore(List rows) { int firstIndex = 5; PdfUtil.Row row1 = new PdfUtil.Row(); PdfUtil.Cell cell = new PdfUtil.Cell(); @@ -397,8 +621,8 @@ public class PatientReportVo { //名称 PdfUtil.Cell cell1 = new PdfUtil.Cell(); cell1.setContent(name); - cell1.setBorderTop(isTop? 1 : 0); - cell1.setBorderRight(isRight? 1 : 0); + cell1.setBorderTop(isTop? 1 : null); + cell1.setBorderRight(isRight? 1 : null); cell1.setColSpan(colspan == null || colspan.length == 0 ? 1 : colspan[0]); row1.addCell(cell1); @@ -406,13 +630,12 @@ public class PatientReportVo { PdfUtil.Cell cell2 = new PdfUtil.Cell(); cell2.setContent(score); cell2.setColSpan(colspan == null || colspan.length <= 1 ? 1 : colspan[1]); - cell2.setBorderRight(isRight? 1 : 0); + cell2.setBorderRight(isRight? 1 : null); row2.addCell(cell2); } } - /**医生对报告单权限*/ - @ApiModel("PatientReportVoAuthority") + @ApiModel("医生对报告单权限") @Data public static class Authority{ @ApiModelProperty("对报告单的操作权限 0：仅查看 1： 可修改 2：可审查") @@ -519,4 +742,86 @@ public class PatientReportVo { @ApiModelProperty("图片路径") private String imgPath; } + + @Data + @ApiModel("导出试题") + public static class QuestionAndAnswer{ + private Long id; + @ApiModelProperty("排序") + private int sort; + @ApiModelProperty("试题") + private String question; + @ApiModelProperty("选项") + private List