diff --git a/cloudutil/src/main/resources/application-util-green.yml b/cloudutil/src/main/resources/application-util-green.yml new file mode 100644 index 00000000..51cac966 --- /dev/null +++ b/cloudutil/src/main/resources/application-util-green.yml @@ -0,0 +1,61 @@ +#服务端点暴露 +management: + endpoints: + web: + exposure: + # 暴露xxx端点，如需暴露多个，用,分隔；如需暴露所有端点，用'*' + include: auditevents,caches,conditions,flyway,health,heapdump,httptrace,info,integrationgraph,jolokia,logfile,loggers,liquibase,metrics,mappings,prometheus,scheduledtasks,sessions,shutdown,threaddump,hystrix.stream +# # 不暴露哪些端点 +# exclude: env,beans,configprops + endpoint: + health: + # 是否展示健康检查详情 + show-details: always + health: + redis: + enabled: false +#eureka注册 +eureka: + client: + service-url: + # 指定eureka server通信地址，注意/eureka/小尾巴不能少 + #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/ + defaultZone: http://admin:admin@49.232.6.143:7010/eureka/ +# defaultZone: http://admin:admin@192.168.0.99:7010/eureka/ + instance: + # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server + prefer-ip-address: true + metadata-map: + management: + context-path: ${server.servlet.context-path:}/actuator + home-page-url-path: ${server.servlet.context-path:}/ + status-page-url-path: ${server.servlet.context-path:}/actuator/info + health-check-url-path: ${server.servlet.context-path:}/actuator/health +feign: + client: + config: + default: + connectTime: 5000 + readTimeout: 5000 + # NONE【性能最佳，适用于生产】：不记录任何日志（默认值）。 + # BASIC【适用于生产环境追踪问题】：仅记录请求方法、URL、响应状态代码以及执行时间。 + # HEADERS：记录BASIC级别的基础上，记录请求和响应的header。 + # FULL【比较适用于开发及测试环境定位问题】：记录请求和响应的header、body和元数据 + loggerLevel: basic + hystrix: + enabled: true +# sleuth +logging: + level: + root: info + org.springframework.cloud.sleuth: DEBUG +spring: +# zipkin: +# base-url: http://49.233.89.188:9411 +# sleuth: +# sampler: +# # 采样率，模式0.1，也就是10%，为了便于观察效果，改为1.0，也就是100%。生产环境建议保持默认。 +# probability: 1.0 + cloud: + inetutils: + ignored-interfaces: ['VMware.*'] \ No newline at end of file diff --git a/ht/src/main/java/com/ccsens/ht/HtApplication.java b/ht/src/main/java/com/ccsens/ht/HtApplication.java index a501e5c0..6ad93007 100644 --- a/ht/src/main/java/com/ccsens/ht/HtApplication.java +++ b/ht/src/main/java/com/ccsens/ht/HtApplication.java @@ -3,7 +3,6 @@ package com.ccsens.ht; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker; import org.springframework.cloud.openfeign.EnableFeignClients; 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 f098e7d4..acb3e011 100644 --- a/ht/src/main/java/com/ccsens/ht/api/ImportController.java +++ b/ht/src/main/java/com/ccsens/ht/api/ImportController.java @@ -70,6 +70,41 @@ public class ImportController { return JsonResponse.newInstance().ok(); } + /** + *@Description: + *@Param: + *@return: com.ccsens.ptpro.util.JsonResponse + *@Author: wuhuijuan + *@date: 2019/10/21 10:04 + */ + @ApiOperation(value = "单独导入报告单类型",notes = "文件大小不能超过20M，支持后缀:.xls|.xlsx") + @ApiImplicitParams({ + @ApiImplicitParam(name = "file", value = "医疗项目表", required = true, paramType = "form",dataType = "__file") + }) + @RequestMapping(value = "/importReportType", method = RequestMethod.POST) + public JsonResponse importReportType(@RequestParam(required = true) Part file) throws Exception{ + + long time1 = System.currentTimeMillis(); + //1.上传文件 + String allowedExts = "xls,xlsx"; + String dir = WebConstant.UPLOAD_PROJECT_WBS + File.separator; + String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExts, dir); + File execlFile = new File(dir+path); + long time2 = System.currentTimeMillis(); + log.info("解析文件耗时：{}", (time2 - time1)); +// importService.importPosition(execlFile, 0); +// long time3 = System.currentTimeMillis(); +// log.info("导入职务耗时：{}", (time3 - time2)); +// importService.importTitle(execlFile, 1); + long time4 = System.currentTimeMillis(); +// log.info("导入职称耗时：{}", (time4 - time3)); + importService.importReport(execlFile, 2); + long time5 = System.currentTimeMillis(); + log.info("导入报告单耗时：{}", (time5 - time4)); +// importService.importQuestion(execlFile, Constant.Ht.Question.ALL); + return JsonResponse.newInstance().ok(); + } + /** *@Description: @@ -149,4 +184,30 @@ public class ImportController { return JsonResponse.newInstance().ok(); } + + /** + *@Description: + *@Param: + *@return: com.ccsens.ptpro.util.JsonResponse + *@Author: wuhuijuan + *@date: 2020/5/14 11:21 + */ + @ApiOperation(value = "导入importXFXPD",notes = "文件大小不能超过20M，支持后缀:.xls|.xlsx") + @ApiImplicitParams({ + @ApiImplicitParam(name = "file", value = "医疗项目表", required = true, paramType = "form",dataType = "__file") + }) + @RequestMapping(value = "/importXFXPD", method = RequestMethod.POST) + public JsonResponse importXFXPD(@RequestParam(required = true) Part file) throws Exception{ + + long time1 = System.currentTimeMillis(); + //1.上传文件 + String allowedExts = "xls,xlsx"; + String dir = WebConstant.UPLOAD_PROJECT_WBS + File.separator; + String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExts, dir); + File execlFile = new File(dir+path); + long time2 = System.currentTimeMillis(); + importService.importQuestion(execlFile, Constant.Ht.Report.XFXPD); + log.info("导入XFXPD"); + return JsonResponse.newInstance().ok(); + } } 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 f695b4d1..55edf517 100644 --- a/ht/src/main/java/com/ccsens/ht/api/PatientReportController.java +++ b/ht/src/main/java/com/ccsens/ht/api/PatientReportController.java @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; import javax.validation.Valid; import java.io.IOException; import java.util.List; @@ -35,7 +36,7 @@ import java.util.List; @RestController public class PatientReportController { - @Autowired + @Resource private IPatientReportService patientReportService; @MustLogin diff --git a/ht/src/main/java/com/ccsens/ht/api/PatientReportSearchController.java b/ht/src/main/java/com/ccsens/ht/api/PatientReportSearchController.java new file mode 100644 index 00000000..457be7e7 --- /dev/null +++ b/ht/src/main/java/com/ccsens/ht/api/PatientReportSearchController.java @@ -0,0 +1,64 @@ +package com.ccsens.ht.api; + +import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.ht.annotation.DoctorAudit; +import com.ccsens.ht.bean.dto.PatientReportDto; +import com.ccsens.ht.bean.dto.PatientReportSearchDto; +import com.ccsens.ht.bean.vo.PatientReportSearchVo; +import com.ccsens.ht.bean.vo.PatientReportVo; +import com.ccsens.ht.service.IPatientReportService; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.*; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.List; + +/** + * @description: + * @author: whj + * @time: 2021/3/10 15:03 + */ +@Slf4j +@Api(tags = "报告单搜索",value = "报告单搜索条件，搜索") +@RestController +@RequestMapping("/patientReport") +public class PatientReportSearchController { + @Resource + private IPatientReportService patientReportService; + + @MustLogin + @DoctorAudit + @ApiOperation(value = "查询搜索条件",notes = "whj 查询搜索条件") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "查询搜索条件", required = true) + }) + @RequestMapping(value="/searchParam", method = RequestMethod.POST) + public JsonResponse searchParam(@RequestBody @ApiParam @Valid QueryDto dto){ + log.info("查询搜索条件：{}", dto); + List params = patientReportService.searchParam(dto.getParam()); + log.info("查询搜索条件已完成"); + return JsonResponse.newInstance().ok(params); + } + + @MustLogin + @DoctorAudit + @ApiOperation(value = "根据条件搜索报告单",notes = "whj 搜索报告单") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "查询搜索条件", required = true) + }) + @RequestMapping(value="/search", method = RequestMethod.POST) + public JsonResponse search(@RequestBody @ApiParam @Valid QueryDto dto){ + log.info("搜索报告单：{}", dto); + PageInfo params = patientReportService.search(dto.getParam()); + log.info("搜索报告单已完成"); + return JsonResponse.newInstance().ok(params); + } +} 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 3e77a0a6..8b915e09 100644 --- a/ht/src/main/java/com/ccsens/ht/api/QuestionController.java +++ b/ht/src/main/java/com/ccsens/ht/api/QuestionController.java @@ -104,4 +104,17 @@ public class QuestionController { log.info("查看用户画图信息成功"); return JsonResponse.newInstance().ok(patientCanvas); } + + @MustLogin + @DoctorAudit + @ApiOperation(value = "删除画图轨迹",notes = "zy:删除画图的轨迹，可以一次删除多条") + @ApiImplicitParams({ + }) + @RequestMapping(value="/delCanvas", method = RequestMethod.POST) + public JsonResponse delCanvas(@RequestBody @ApiParam @Valid QueryDto queryDto) throws IOException, NotSupportedFileTypeException { + log.info("删除画图轨迹"); + questionService.delCanvas(queryDto.getParam(), queryDto.getUserId()); + 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 90e73931..5f82f7aa 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 @@ -81,7 +81,10 @@ public class PatientReportDto { @ApiModelProperty("病人报告单ID") @NotNull(message = "病人报告单ID不能为空") private Long id; + @ApiModelProperty("是否需要rey 默认为0 0全部查询导出 1不导出rey 2只导出rey") + private int rey = 0; } + /**医生对报告单权限*/ @ApiModel("PatientReportDtoAuthority") diff --git a/ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportSearchDto.java b/ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportSearchDto.java new file mode 100644 index 00000000..a4afeac6 --- /dev/null +++ b/ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportSearchDto.java @@ -0,0 +1,47 @@ +package com.ccsens.ht.bean.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotEmpty; +import java.util.List; + +/** + * @description: + * @author: whj + * @time: 2021/3/10 16:21 + */ +public class PatientReportSearchDto { + @Data + @ApiModel("搜索条件-请求参数") + public static class SearchParam{ + @ApiModelProperty("查询类型") + @NotEmpty(message = "请输入查询报告单类型") + private String parentCode; + } + + @Data + @ApiModel("搜索报告单参数列表-请求") + public static class SearchList { + private List codes; + @ApiModelProperty("第几页") + @Min(value = 1) + private int pageNum = 1; + @ApiModelProperty("每页多少条") + @Min(value = 1) + @Max(value=100) + private int pageSize = 10; + } + + @Data + @ApiModel("搜索报告单参数-请求") + public static class Search { + @NotEmpty(message="请选择查询类型") + private String code; + private Integer start; + private Integer end; + } +} 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 bd755ec5..25af3566 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 @@ -103,4 +103,11 @@ public class QuestionDto { private Long questionId; } + @Data + @ApiModel("删除画图笔画") + public static class DelPatientCanvas{ + @ApiModelProperty("轨迹的id") + private List pointId; + } + } diff --git a/ht/src/main/java/com/ccsens/ht/bean/po/HtPatientAcp.java b/ht/src/main/java/com/ccsens/ht/bean/po/HtPatientAcp.java index d9baa789..4073dd8a 100644 --- a/ht/src/main/java/com/ccsens/ht/bean/po/HtPatientAcp.java +++ b/ht/src/main/java/com/ccsens/ht/bean/po/HtPatientAcp.java @@ -1,183 +1,205 @@ -package com.ccsens.ht.bean.po; - -import java.io.Serializable; -import java.util.Date; - -public class HtPatientAcp implements Serializable { - private Long id; - - private Long patientId; - - private String ct; - - private String mri; - - private String hcy; - - private String vb12; - - private String folicAcid; - - private String tt3; - - private String tt4; - - private String tsh; - - private String remark; - - private Date createTime; - - private Date updateTime; - - private Byte isDel; - - private Long recorder; - - private static final long serialVersionUID = 1L; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getPatientId() { - return patientId; - } - - public void setPatientId(Long patientId) { - this.patientId = patientId; - } - - public String getCt() { - return ct; - } - - public void setCt(String ct) { - this.ct = ct == null ? null : ct.trim(); - } - - public String getMri() { - return mri; - } - - public void setMri(String mri) { - this.mri = mri == null ? null : mri.trim(); - } - - public String getHcy() { - return hcy; - } - - public void setHcy(String hcy) { - this.hcy = hcy == null ? null : hcy.trim(); - } - - public String getVb12() { - return vb12; - } - - public void setVb12(String vb12) { - this.vb12 = vb12 == null ? null : vb12.trim(); - } - - public String getFolicAcid() { - return folicAcid; - } - - public void setFolicAcid(String folicAcid) { - this.folicAcid = folicAcid == null ? null : folicAcid.trim(); - } - - public String getTt3() { - return tt3; - } - - public void setTt3(String tt3) { - this.tt3 = tt3 == null ? null : tt3.trim(); - } - - public String getTt4() { - return tt4; - } - - public void setTt4(String tt4) { - this.tt4 = tt4 == null ? null : tt4.trim(); - } - - public String getTsh() { - return tsh; - } - - public void setTsh(String tsh) { - this.tsh = tsh == null ? null : tsh.trim(); - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark == null ? null : remark.trim(); - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - - public Byte getIsDel() { - return isDel; - } - - public void setIsDel(Byte isDel) { - this.isDel = isDel; - } - - public Long getRecorder() { - return recorder; - } - - public void setRecorder(Long recorder) { - this.recorder = recorder; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", patientId=").append(patientId); - sb.append(", ct=").append(ct); - sb.append(", mri=").append(mri); - sb.append(", hcy=").append(hcy); - sb.append(", vb12=").append(vb12); - sb.append(", folicAcid=").append(folicAcid); - sb.append(", tt3=").append(tt3); - sb.append(", tt4=").append(tt4); - sb.append(", tsh=").append(tsh); - sb.append(", remark=").append(remark); - sb.append(", createTime=").append(createTime); - sb.append(", updateTime=").append(updateTime); - sb.append(", isDel=").append(isDel); - sb.append(", recorder=").append(recorder); - sb.append("]"); - return sb.toString(); - } +package com.ccsens.ht.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class HtPatientAcp implements Serializable { + private Long id; + + private Long patientId; + + private String ct; + + private String mri; + + private String hcy; + + private String vb12; + + private String folicAcid; + + private String tt3; + + private String tt4; + + private String tsh; + + private String remark; + + private Date createTime; + + private Date updateTime; + + private Byte isDel; + + private Long recorder; + + private String ta1; + + private String tpt; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getPatientId() { + return patientId; + } + + public void setPatientId(Long patientId) { + this.patientId = patientId; + } + + public String getCt() { + return ct; + } + + public void setCt(String ct) { + this.ct = ct == null ? null : ct.trim(); + } + + public String getMri() { + return mri; + } + + public void setMri(String mri) { + this.mri = mri == null ? null : mri.trim(); + } + + public String getHcy() { + return hcy; + } + + public void setHcy(String hcy) { + this.hcy = hcy == null ? null : hcy.trim(); + } + + public String getVb12() { + return vb12; + } + + public void setVb12(String vb12) { + this.vb12 = vb12 == null ? null : vb12.trim(); + } + + public String getFolicAcid() { + return folicAcid; + } + + public void setFolicAcid(String folicAcid) { + this.folicAcid = folicAcid == null ? null : folicAcid.trim(); + } + + public String getTt3() { + return tt3; + } + + public void setTt3(String tt3) { + this.tt3 = tt3 == null ? null : tt3.trim(); + } + + public String getTt4() { + return tt4; + } + + public void setTt4(String tt4) { + this.tt4 = tt4 == null ? null : tt4.trim(); + } + + public String getTsh() { + return tsh; + } + + public void setTsh(String tsh) { + this.tsh = tsh == null ? null : tsh.trim(); + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark == null ? null : remark.trim(); + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public Byte getIsDel() { + return isDel; + } + + public void setIsDel(Byte isDel) { + this.isDel = isDel; + } + + public Long getRecorder() { + return recorder; + } + + public void setRecorder(Long recorder) { + this.recorder = recorder; + } + + public String getTa1() { + return ta1; + } + + public void setTa1(String ta1) { + this.ta1 = ta1 == null ? null : ta1.trim(); + } + + public String getTpt() { + return tpt; + } + + public void setTpt(String tpt) { + this.tpt = tpt == null ? null : tpt.trim(); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", patientId=").append(patientId); + sb.append(", ct=").append(ct); + sb.append(", mri=").append(mri); + sb.append(", hcy=").append(hcy); + sb.append(", vb12=").append(vb12); + sb.append(", folicAcid=").append(folicAcid); + sb.append(", tt3=").append(tt3); + sb.append(", tt4=").append(tt4); + sb.append(", tsh=").append(tsh); + sb.append(", remark=").append(remark); + sb.append(", createTime=").append(createTime); + sb.append(", updateTime=").append(updateTime); + sb.append(", isDel=").append(isDel); + sb.append(", recorder=").append(recorder); + sb.append(", ta1=").append(ta1); + sb.append(", tpt=").append(tpt); + sb.append("]"); + return sb.toString(); + } } \ No newline at end of file diff --git a/ht/src/main/java/com/ccsens/ht/bean/po/HtPatientAcpExample.java b/ht/src/main/java/com/ccsens/ht/bean/po/HtPatientAcpExample.java index 77f7d9b9..24daa3f5 100644 --- a/ht/src/main/java/com/ccsens/ht/bean/po/HtPatientAcpExample.java +++ b/ht/src/main/java/com/ccsens/ht/bean/po/HtPatientAcpExample.java @@ -1,1191 +1,1331 @@ -package com.ccsens.ht.bean.po; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class HtPatientAcpExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public HtPatientAcpExample() { - 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 andPatientIdIsNull() { - addCriterion("patient_id is null"); - return (Criteria) this; - } - - public Criteria andPatientIdIsNotNull() { - addCriterion("patient_id is not null"); - return (Criteria) this; - } - - public Criteria andPatientIdEqualTo(Long value) { - addCriterion("patient_id =", value, "patientId"); - return (Criteria) this; - } - - public Criteria andPatientIdNotEqualTo(Long value) { - addCriterion("patient_id <>", value, "patientId"); - return (Criteria) this; - } - - public Criteria andPatientIdGreaterThan(Long value) { - addCriterion("patient_id >", value, "patientId"); - return (Criteria) this; - } - - public Criteria andPatientIdGreaterThanOrEqualTo(Long value) { - addCriterion("patient_id >=", value, "patientId"); - return (Criteria) this; - } - - public Criteria andPatientIdLessThan(Long value) { - addCriterion("patient_id <", value, "patientId"); - return (Criteria) this; - } - - public Criteria andPatientIdLessThanOrEqualTo(Long value) { - addCriterion("patient_id <=", value, "patientId"); - return (Criteria) this; - } - - public Criteria andPatientIdIn(List values) { - addCriterion("patient_id in", values, "patientId"); - return (Criteria) this; - } - - public Criteria andPatientIdNotIn(List values) { - addCriterion("patient_id not in", values, "patientId"); - return (Criteria) this; - } - - public Criteria andPatientIdBetween(Long value1, Long value2) { - addCriterion("patient_id between", value1, value2, "patientId"); - return (Criteria) this; - } - - public Criteria andPatientIdNotBetween(Long value1, Long value2) { - addCriterion("patient_id not between", value1, value2, "patientId"); - return (Criteria) this; - } - - public Criteria andCtIsNull() { - addCriterion("ct is null"); - return (Criteria) this; - } - - public Criteria andCtIsNotNull() { - addCriterion("ct is not null"); - return (Criteria) this; - } - - public Criteria andCtEqualTo(String value) { - addCriterion("ct =", value, "ct"); - return (Criteria) this; - } - - public Criteria andCtNotEqualTo(String value) { - addCriterion("ct <>", value, "ct"); - return (Criteria) this; - } - - public Criteria andCtGreaterThan(String value) { - addCriterion("ct >", value, "ct"); - return (Criteria) this; - } - - public Criteria andCtGreaterThanOrEqualTo(String value) { - addCriterion("ct >=", value, "ct"); - return (Criteria) this; - } - - public Criteria andCtLessThan(String value) { - addCriterion("ct <", value, "ct"); - return (Criteria) this; - } - - public Criteria andCtLessThanOrEqualTo(String value) { - addCriterion("ct <=", value, "ct"); - return (Criteria) this; - } - - public Criteria andCtLike(String value) { - addCriterion("ct like", value, "ct"); - return (Criteria) this; - } - - public Criteria andCtNotLike(String value) { - addCriterion("ct not like", value, "ct"); - return (Criteria) this; - } - - public Criteria andCtIn(List values) { - addCriterion("ct in", values, "ct"); - return (Criteria) this; - } - - public Criteria andCtNotIn(List values) { - addCriterion("ct not in", values, "ct"); - return (Criteria) this; - } - - public Criteria andCtBetween(String value1, String value2) { - addCriterion("ct between", value1, value2, "ct"); - return (Criteria) this; - } - - public Criteria andCtNotBetween(String value1, String value2) { - addCriterion("ct not between", value1, value2, "ct"); - return (Criteria) this; - } - - public Criteria andMriIsNull() { - addCriterion("mri is null"); - return (Criteria) this; - } - - public Criteria andMriIsNotNull() { - addCriterion("mri is not null"); - return (Criteria) this; - } - - public Criteria andMriEqualTo(String value) { - addCriterion("mri =", value, "mri"); - return (Criteria) this; - } - - public Criteria andMriNotEqualTo(String value) { - addCriterion("mri <>", value, "mri"); - return (Criteria) this; - } - - public Criteria andMriGreaterThan(String value) { - addCriterion("mri >", value, "mri"); - return (Criteria) this; - } - - public Criteria andMriGreaterThanOrEqualTo(String value) { - addCriterion("mri >=", value, "mri"); - return (Criteria) this; - } - - public Criteria andMriLessThan(String value) { - addCriterion("mri <", value, "mri"); - return (Criteria) this; - } - - public Criteria andMriLessThanOrEqualTo(String value) { - addCriterion("mri <=", value, "mri"); - return (Criteria) this; - } - - public Criteria andMriLike(String value) { - addCriterion("mri like", value, "mri"); - return (Criteria) this; - } - - public Criteria andMriNotLike(String value) { - addCriterion("mri not like", value, "mri"); - return (Criteria) this; - } - - public Criteria andMriIn(List values) { - addCriterion("mri in", values, "mri"); - return (Criteria) this; - } - - public Criteria andMriNotIn(List values) { - addCriterion("mri not in", values, "mri"); - return (Criteria) this; - } - - public Criteria andMriBetween(String value1, String value2) { - addCriterion("mri between", value1, value2, "mri"); - return (Criteria) this; - } - - public Criteria andMriNotBetween(String value1, String value2) { - addCriterion("mri not between", value1, value2, "mri"); - return (Criteria) this; - } - - public Criteria andHcyIsNull() { - addCriterion("hcy is null"); - return (Criteria) this; - } - - public Criteria andHcyIsNotNull() { - addCriterion("hcy is not null"); - return (Criteria) this; - } - - public Criteria andHcyEqualTo(String value) { - addCriterion("hcy =", value, "hcy"); - return (Criteria) this; - } - - public Criteria andHcyNotEqualTo(String value) { - addCriterion("hcy <>", value, "hcy"); - return (Criteria) this; - } - - public Criteria andHcyGreaterThan(String value) { - addCriterion("hcy >", value, "hcy"); - return (Criteria) this; - } - - public Criteria andHcyGreaterThanOrEqualTo(String value) { - addCriterion("hcy >=", value, "hcy"); - return (Criteria) this; - } - - public Criteria andHcyLessThan(String value) { - addCriterion("hcy <", value, "hcy"); - return (Criteria) this; - } - - public Criteria andHcyLessThanOrEqualTo(String value) { - addCriterion("hcy <=", value, "hcy"); - return (Criteria) this; - } - - public Criteria andHcyLike(String value) { - addCriterion("hcy like", value, "hcy"); - return (Criteria) this; - } - - public Criteria andHcyNotLike(String value) { - addCriterion("hcy not like", value, "hcy"); - return (Criteria) this; - } - - public Criteria andHcyIn(List values) { - addCriterion("hcy in", values, "hcy"); - return (Criteria) this; - } - - public Criteria andHcyNotIn(List values) { - addCriterion("hcy not in", values, "hcy"); - return (Criteria) this; - } - - public Criteria andHcyBetween(String value1, String value2) { - addCriterion("hcy between", value1, value2, "hcy"); - return (Criteria) this; - } - - public Criteria andHcyNotBetween(String value1, String value2) { - addCriterion("hcy not between", value1, value2, "hcy"); - return (Criteria) this; - } - - public Criteria andVb12IsNull() { - addCriterion("vb12 is null"); - return (Criteria) this; - } - - public Criteria andVb12IsNotNull() { - addCriterion("vb12 is not null"); - return (Criteria) this; - } - - public Criteria andVb12EqualTo(String value) { - addCriterion("vb12 =", value, "vb12"); - return (Criteria) this; - } - - public Criteria andVb12NotEqualTo(String value) { - addCriterion("vb12 <>", value, "vb12"); - return (Criteria) this; - } - - public Criteria andVb12GreaterThan(String value) { - addCriterion("vb12 >", value, "vb12"); - return (Criteria) this; - } - - public Criteria andVb12GreaterThanOrEqualTo(String value) { - addCriterion("vb12 >=", value, "vb12"); - return (Criteria) this; - } - - public Criteria andVb12LessThan(String value) { - addCriterion("vb12 <", value, "vb12"); - return (Criteria) this; - } - - public Criteria andVb12LessThanOrEqualTo(String value) { - addCriterion("vb12 <=", value, "vb12"); - return (Criteria) this; - } - - public Criteria andVb12Like(String value) { - addCriterion("vb12 like", value, "vb12"); - return (Criteria) this; - } - - public Criteria andVb12NotLike(String value) { - addCriterion("vb12 not like", value, "vb12"); - return (Criteria) this; - } - - public Criteria andVb12In(List values) { - addCriterion("vb12 in", values, "vb12"); - return (Criteria) this; - } - - public Criteria andVb12NotIn(List values) { - addCriterion("vb12 not in", values, "vb12"); - return (Criteria) this; - } - - public Criteria andVb12Between(String value1, String value2) { - addCriterion("vb12 between", value1, value2, "vb12"); - return (Criteria) this; - } - - public Criteria andVb12NotBetween(String value1, String value2) { - addCriterion("vb12 not between", value1, value2, "vb12"); - return (Criteria) this; - } - - public Criteria andFolicAcidIsNull() { - addCriterion("folic_acid is null"); - return (Criteria) this; - } - - public Criteria andFolicAcidIsNotNull() { - addCriterion("folic_acid is not null"); - return (Criteria) this; - } - - public Criteria andFolicAcidEqualTo(String value) { - addCriterion("folic_acid =", value, "folicAcid"); - return (Criteria) this; - } - - public Criteria andFolicAcidNotEqualTo(String value) { - addCriterion("folic_acid <>", value, "folicAcid"); - return (Criteria) this; - } - - public Criteria andFolicAcidGreaterThan(String value) { - addCriterion("folic_acid >", value, "folicAcid"); - return (Criteria) this; - } - - public Criteria andFolicAcidGreaterThanOrEqualTo(String value) { - addCriterion("folic_acid >=", value, "folicAcid"); - return (Criteria) this; - } - - public Criteria andFolicAcidLessThan(String value) { - addCriterion("folic_acid <", value, "folicAcid"); - return (Criteria) this; - } - - public Criteria andFolicAcidLessThanOrEqualTo(String value) { - addCriterion("folic_acid <=", value, "folicAcid"); - return (Criteria) this; - } - - public Criteria andFolicAcidLike(String value) { - addCriterion("folic_acid like", value, "folicAcid"); - return (Criteria) this; - } - - public Criteria andFolicAcidNotLike(String value) { - addCriterion("folic_acid not like", value, "folicAcid"); - return (Criteria) this; - } - - public Criteria andFolicAcidIn(List values) { - addCriterion("folic_acid in", values, "folicAcid"); - return (Criteria) this; - } - - public Criteria andFolicAcidNotIn(List values) { - addCriterion("folic_acid not in", values, "folicAcid"); - return (Criteria) this; - } - - public Criteria andFolicAcidBetween(String value1, String value2) { - addCriterion("folic_acid between", value1, value2, "folicAcid"); - return (Criteria) this; - } - - public Criteria andFolicAcidNotBetween(String value1, String value2) { - addCriterion("folic_acid not between", value1, value2, "folicAcid"); - return (Criteria) this; - } - - public Criteria andTt3IsNull() { - addCriterion("tt3 is null"); - return (Criteria) this; - } - - public Criteria andTt3IsNotNull() { - addCriterion("tt3 is not null"); - return (Criteria) this; - } - - public Criteria andTt3EqualTo(String value) { - addCriterion("tt3 =", value, "tt3"); - return (Criteria) this; - } - - public Criteria andTt3NotEqualTo(String value) { - addCriterion("tt3 <>", value, "tt3"); - return (Criteria) this; - } - - public Criteria andTt3GreaterThan(String value) { - addCriterion("tt3 >", value, "tt3"); - return (Criteria) this; - } - - public Criteria andTt3GreaterThanOrEqualTo(String value) { - addCriterion("tt3 >=", value, "tt3"); - return (Criteria) this; - } - - public Criteria andTt3LessThan(String value) { - addCriterion("tt3 <", value, "tt3"); - return (Criteria) this; - } - - public Criteria andTt3LessThanOrEqualTo(String value) { - addCriterion("tt3 <=", value, "tt3"); - return (Criteria) this; - } - - public Criteria andTt3Like(String value) { - addCriterion("tt3 like", value, "tt3"); - return (Criteria) this; - } - - public Criteria andTt3NotLike(String value) { - addCriterion("tt3 not like", value, "tt3"); - return (Criteria) this; - } - - public Criteria andTt3In(List values) { - addCriterion("tt3 in", values, "tt3"); - return (Criteria) this; - } - - public Criteria andTt3NotIn(List values) { - addCriterion("tt3 not in", values, "tt3"); - return (Criteria) this; - } - - public Criteria andTt3Between(String value1, String value2) { - addCriterion("tt3 between", value1, value2, "tt3"); - return (Criteria) this; - } - - public Criteria andTt3NotBetween(String value1, String value2) { - addCriterion("tt3 not between", value1, value2, "tt3"); - return (Criteria) this; - } - - public Criteria andTt4IsNull() { - addCriterion("tt4 is null"); - return (Criteria) this; - } - - public Criteria andTt4IsNotNull() { - addCriterion("tt4 is not null"); - return (Criteria) this; - } - - public Criteria andTt4EqualTo(String value) { - addCriterion("tt4 =", value, "tt4"); - return (Criteria) this; - } - - public Criteria andTt4NotEqualTo(String value) { - addCriterion("tt4 <>", value, "tt4"); - return (Criteria) this; - } - - public Criteria andTt4GreaterThan(String value) { - addCriterion("tt4 >", value, "tt4"); - return (Criteria) this; - } - - public Criteria andTt4GreaterThanOrEqualTo(String value) { - addCriterion("tt4 >=", value, "tt4"); - return (Criteria) this; - } - - public Criteria andTt4LessThan(String value) { - addCriterion("tt4 <", value, "tt4"); - return (Criteria) this; - } - - public Criteria andTt4LessThanOrEqualTo(String value) { - addCriterion("tt4 <=", value, "tt4"); - return (Criteria) this; - } - - public Criteria andTt4Like(String value) { - addCriterion("tt4 like", value, "tt4"); - return (Criteria) this; - } - - public Criteria andTt4NotLike(String value) { - addCriterion("tt4 not like", value, "tt4"); - return (Criteria) this; - } - - public Criteria andTt4In(List values) { - addCriterion("tt4 in", values, "tt4"); - return (Criteria) this; - } - - public Criteria andTt4NotIn(List values) { - addCriterion("tt4 not in", values, "tt4"); - return (Criteria) this; - } - - public Criteria andTt4Between(String value1, String value2) { - addCriterion("tt4 between", value1, value2, "tt4"); - return (Criteria) this; - } - - public Criteria andTt4NotBetween(String value1, String value2) { - addCriterion("tt4 not between", value1, value2, "tt4"); - return (Criteria) this; - } - - public Criteria andTshIsNull() { - addCriterion("tsh is null"); - return (Criteria) this; - } - - public Criteria andTshIsNotNull() { - addCriterion("tsh is not null"); - return (Criteria) this; - } - - public Criteria andTshEqualTo(String value) { - addCriterion("tsh =", value, "tsh"); - return (Criteria) this; - } - - public Criteria andTshNotEqualTo(String value) { - addCriterion("tsh <>", value, "tsh"); - return (Criteria) this; - } - - public Criteria andTshGreaterThan(String value) { - addCriterion("tsh >", value, "tsh"); - return (Criteria) this; - } - - public Criteria andTshGreaterThanOrEqualTo(String value) { - addCriterion("tsh >=", value, "tsh"); - return (Criteria) this; - } - - public Criteria andTshLessThan(String value) { - addCriterion("tsh <", value, "tsh"); - return (Criteria) this; - } - - public Criteria andTshLessThanOrEqualTo(String value) { - addCriterion("tsh <=", value, "tsh"); - return (Criteria) this; - } - - public Criteria andTshLike(String value) { - addCriterion("tsh like", value, "tsh"); - return (Criteria) this; - } - - public Criteria andTshNotLike(String value) { - addCriterion("tsh not like", value, "tsh"); - return (Criteria) this; - } - - public Criteria andTshIn(List values) { - addCriterion("tsh in", values, "tsh"); - return (Criteria) this; - } - - public Criteria andTshNotIn(List values) { - addCriterion("tsh not in", values, "tsh"); - return (Criteria) this; - } - - public Criteria andTshBetween(String value1, String value2) { - addCriterion("tsh between", value1, value2, "tsh"); - return (Criteria) this; - } - - public Criteria andTshNotBetween(String value1, String value2) { - addCriterion("tsh not between", value1, value2, "tsh"); - 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 andRecorderIsNull() { - addCriterion("recorder is null"); - return (Criteria) this; - } - - public Criteria andRecorderIsNotNull() { - addCriterion("recorder is not null"); - return (Criteria) this; - } - - public Criteria andRecorderEqualTo(Long value) { - addCriterion("recorder =", value, "recorder"); - return (Criteria) this; - } - - public Criteria andRecorderNotEqualTo(Long value) { - addCriterion("recorder <>", value, "recorder"); - return (Criteria) this; - } - - public Criteria andRecorderGreaterThan(Long value) { - addCriterion("recorder >", value, "recorder"); - return (Criteria) this; - } - - public Criteria andRecorderGreaterThanOrEqualTo(Long value) { - addCriterion("recorder >=", value, "recorder"); - return (Criteria) this; - } - - public Criteria andRecorderLessThan(Long value) { - addCriterion("recorder <", value, "recorder"); - return (Criteria) this; - } - - public Criteria andRecorderLessThanOrEqualTo(Long value) { - addCriterion("recorder <=", value, "recorder"); - return (Criteria) this; - } - - public Criteria andRecorderIn(List values) { - addCriterion("recorder in", values, "recorder"); - return (Criteria) this; - } - - public Criteria andRecorderNotIn(List values) { - addCriterion("recorder not in", values, "recorder"); - return (Criteria) this; - } - - public Criteria andRecorderBetween(Long value1, Long value2) { - addCriterion("recorder between", value1, value2, "recorder"); - return (Criteria) this; - } - - public Criteria andRecorderNotBetween(Long value1, Long value2) { - addCriterion("recorder not between", value1, value2, "recorder"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } +package com.ccsens.ht.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class HtPatientAcpExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public HtPatientAcpExample() { + 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 andPatientIdIsNull() { + addCriterion("patient_id is null"); + return (Criteria) this; + } + + public Criteria andPatientIdIsNotNull() { + addCriterion("patient_id is not null"); + return (Criteria) this; + } + + public Criteria andPatientIdEqualTo(Long value) { + addCriterion("patient_id =", value, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdNotEqualTo(Long value) { + addCriterion("patient_id <>", value, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdGreaterThan(Long value) { + addCriterion("patient_id >", value, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdGreaterThanOrEqualTo(Long value) { + addCriterion("patient_id >=", value, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdLessThan(Long value) { + addCriterion("patient_id <", value, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdLessThanOrEqualTo(Long value) { + addCriterion("patient_id <=", value, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdIn(List values) { + addCriterion("patient_id in", values, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdNotIn(List values) { + addCriterion("patient_id not in", values, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdBetween(Long value1, Long value2) { + addCriterion("patient_id between", value1, value2, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdNotBetween(Long value1, Long value2) { + addCriterion("patient_id not between", value1, value2, "patientId"); + return (Criteria) this; + } + + public Criteria andCtIsNull() { + addCriterion("ct is null"); + return (Criteria) this; + } + + public Criteria andCtIsNotNull() { + addCriterion("ct is not null"); + return (Criteria) this; + } + + public Criteria andCtEqualTo(String value) { + addCriterion("ct =", value, "ct"); + return (Criteria) this; + } + + public Criteria andCtNotEqualTo(String value) { + addCriterion("ct <>", value, "ct"); + return (Criteria) this; + } + + public Criteria andCtGreaterThan(String value) { + addCriterion("ct >", value, "ct"); + return (Criteria) this; + } + + public Criteria andCtGreaterThanOrEqualTo(String value) { + addCriterion("ct >=", value, "ct"); + return (Criteria) this; + } + + public Criteria andCtLessThan(String value) { + addCriterion("ct <", value, "ct"); + return (Criteria) this; + } + + public Criteria andCtLessThanOrEqualTo(String value) { + addCriterion("ct <=", value, "ct"); + return (Criteria) this; + } + + public Criteria andCtLike(String value) { + addCriterion("ct like", value, "ct"); + return (Criteria) this; + } + + public Criteria andCtNotLike(String value) { + addCriterion("ct not like", value, "ct"); + return (Criteria) this; + } + + public Criteria andCtIn(List values) { + addCriterion("ct in", values, "ct"); + return (Criteria) this; + } + + public Criteria andCtNotIn(List values) { + addCriterion("ct not in", values, "ct"); + return (Criteria) this; + } + + public Criteria andCtBetween(String value1, String value2) { + addCriterion("ct between", value1, value2, "ct"); + return (Criteria) this; + } + + public Criteria andCtNotBetween(String value1, String value2) { + addCriterion("ct not between", value1, value2, "ct"); + return (Criteria) this; + } + + public Criteria andMriIsNull() { + addCriterion("mri is null"); + return (Criteria) this; + } + + public Criteria andMriIsNotNull() { + addCriterion("mri is not null"); + return (Criteria) this; + } + + public Criteria andMriEqualTo(String value) { + addCriterion("mri =", value, "mri"); + return (Criteria) this; + } + + public Criteria andMriNotEqualTo(String value) { + addCriterion("mri <>", value, "mri"); + return (Criteria) this; + } + + public Criteria andMriGreaterThan(String value) { + addCriterion("mri >", value, "mri"); + return (Criteria) this; + } + + public Criteria andMriGreaterThanOrEqualTo(String value) { + addCriterion("mri >=", value, "mri"); + return (Criteria) this; + } + + public Criteria andMriLessThan(String value) { + addCriterion("mri <", value, "mri"); + return (Criteria) this; + } + + public Criteria andMriLessThanOrEqualTo(String value) { + addCriterion("mri <=", value, "mri"); + return (Criteria) this; + } + + public Criteria andMriLike(String value) { + addCriterion("mri like", value, "mri"); + return (Criteria) this; + } + + public Criteria andMriNotLike(String value) { + addCriterion("mri not like", value, "mri"); + return (Criteria) this; + } + + public Criteria andMriIn(List values) { + addCriterion("mri in", values, "mri"); + return (Criteria) this; + } + + public Criteria andMriNotIn(List values) { + addCriterion("mri not in", values, "mri"); + return (Criteria) this; + } + + public Criteria andMriBetween(String value1, String value2) { + addCriterion("mri between", value1, value2, "mri"); + return (Criteria) this; + } + + public Criteria andMriNotBetween(String value1, String value2) { + addCriterion("mri not between", value1, value2, "mri"); + return (Criteria) this; + } + + public Criteria andHcyIsNull() { + addCriterion("hcy is null"); + return (Criteria) this; + } + + public Criteria andHcyIsNotNull() { + addCriterion("hcy is not null"); + return (Criteria) this; + } + + public Criteria andHcyEqualTo(String value) { + addCriterion("hcy =", value, "hcy"); + return (Criteria) this; + } + + public Criteria andHcyNotEqualTo(String value) { + addCriterion("hcy <>", value, "hcy"); + return (Criteria) this; + } + + public Criteria andHcyGreaterThan(String value) { + addCriterion("hcy >", value, "hcy"); + return (Criteria) this; + } + + public Criteria andHcyGreaterThanOrEqualTo(String value) { + addCriterion("hcy >=", value, "hcy"); + return (Criteria) this; + } + + public Criteria andHcyLessThan(String value) { + addCriterion("hcy <", value, "hcy"); + return (Criteria) this; + } + + public Criteria andHcyLessThanOrEqualTo(String value) { + addCriterion("hcy <=", value, "hcy"); + return (Criteria) this; + } + + public Criteria andHcyLike(String value) { + addCriterion("hcy like", value, "hcy"); + return (Criteria) this; + } + + public Criteria andHcyNotLike(String value) { + addCriterion("hcy not like", value, "hcy"); + return (Criteria) this; + } + + public Criteria andHcyIn(List values) { + addCriterion("hcy in", values, "hcy"); + return (Criteria) this; + } + + public Criteria andHcyNotIn(List values) { + addCriterion("hcy not in", values, "hcy"); + return (Criteria) this; + } + + public Criteria andHcyBetween(String value1, String value2) { + addCriterion("hcy between", value1, value2, "hcy"); + return (Criteria) this; + } + + public Criteria andHcyNotBetween(String value1, String value2) { + addCriterion("hcy not between", value1, value2, "hcy"); + return (Criteria) this; + } + + public Criteria andVb12IsNull() { + addCriterion("vb12 is null"); + return (Criteria) this; + } + + public Criteria andVb12IsNotNull() { + addCriterion("vb12 is not null"); + return (Criteria) this; + } + + public Criteria andVb12EqualTo(String value) { + addCriterion("vb12 =", value, "vb12"); + return (Criteria) this; + } + + public Criteria andVb12NotEqualTo(String value) { + addCriterion("vb12 <>", value, "vb12"); + return (Criteria) this; + } + + public Criteria andVb12GreaterThan(String value) { + addCriterion("vb12 >", value, "vb12"); + return (Criteria) this; + } + + public Criteria andVb12GreaterThanOrEqualTo(String value) { + addCriterion("vb12 >=", value, "vb12"); + return (Criteria) this; + } + + public Criteria andVb12LessThan(String value) { + addCriterion("vb12 <", value, "vb12"); + return (Criteria) this; + } + + public Criteria andVb12LessThanOrEqualTo(String value) { + addCriterion("vb12 <=", value, "vb12"); + return (Criteria) this; + } + + public Criteria andVb12Like(String value) { + addCriterion("vb12 like", value, "vb12"); + return (Criteria) this; + } + + public Criteria andVb12NotLike(String value) { + addCriterion("vb12 not like", value, "vb12"); + return (Criteria) this; + } + + public Criteria andVb12In(List values) { + addCriterion("vb12 in", values, "vb12"); + return (Criteria) this; + } + + public Criteria andVb12NotIn(List values) { + addCriterion("vb12 not in", values, "vb12"); + return (Criteria) this; + } + + public Criteria andVb12Between(String value1, String value2) { + addCriterion("vb12 between", value1, value2, "vb12"); + return (Criteria) this; + } + + public Criteria andVb12NotBetween(String value1, String value2) { + addCriterion("vb12 not between", value1, value2, "vb12"); + return (Criteria) this; + } + + public Criteria andFolicAcidIsNull() { + addCriterion("folic_acid is null"); + return (Criteria) this; + } + + public Criteria andFolicAcidIsNotNull() { + addCriterion("folic_acid is not null"); + return (Criteria) this; + } + + public Criteria andFolicAcidEqualTo(String value) { + addCriterion("folic_acid =", value, "folicAcid"); + return (Criteria) this; + } + + public Criteria andFolicAcidNotEqualTo(String value) { + addCriterion("folic_acid <>", value, "folicAcid"); + return (Criteria) this; + } + + public Criteria andFolicAcidGreaterThan(String value) { + addCriterion("folic_acid >", value, "folicAcid"); + return (Criteria) this; + } + + public Criteria andFolicAcidGreaterThanOrEqualTo(String value) { + addCriterion("folic_acid >=", value, "folicAcid"); + return (Criteria) this; + } + + public Criteria andFolicAcidLessThan(String value) { + addCriterion("folic_acid <", value, "folicAcid"); + return (Criteria) this; + } + + public Criteria andFolicAcidLessThanOrEqualTo(String value) { + addCriterion("folic_acid <=", value, "folicAcid"); + return (Criteria) this; + } + + public Criteria andFolicAcidLike(String value) { + addCriterion("folic_acid like", value, "folicAcid"); + return (Criteria) this; + } + + public Criteria andFolicAcidNotLike(String value) { + addCriterion("folic_acid not like", value, "folicAcid"); + return (Criteria) this; + } + + public Criteria andFolicAcidIn(List values) { + addCriterion("folic_acid in", values, "folicAcid"); + return (Criteria) this; + } + + public Criteria andFolicAcidNotIn(List values) { + addCriterion("folic_acid not in", values, "folicAcid"); + return (Criteria) this; + } + + public Criteria andFolicAcidBetween(String value1, String value2) { + addCriterion("folic_acid between", value1, value2, "folicAcid"); + return (Criteria) this; + } + + public Criteria andFolicAcidNotBetween(String value1, String value2) { + addCriterion("folic_acid not between", value1, value2, "folicAcid"); + return (Criteria) this; + } + + public Criteria andTt3IsNull() { + addCriterion("tt3 is null"); + return (Criteria) this; + } + + public Criteria andTt3IsNotNull() { + addCriterion("tt3 is not null"); + return (Criteria) this; + } + + public Criteria andTt3EqualTo(String value) { + addCriterion("tt3 =", value, "tt3"); + return (Criteria) this; + } + + public Criteria andTt3NotEqualTo(String value) { + addCriterion("tt3 <>", value, "tt3"); + return (Criteria) this; + } + + public Criteria andTt3GreaterThan(String value) { + addCriterion("tt3 >", value, "tt3"); + return (Criteria) this; + } + + public Criteria andTt3GreaterThanOrEqualTo(String value) { + addCriterion("tt3 >=", value, "tt3"); + return (Criteria) this; + } + + public Criteria andTt3LessThan(String value) { + addCriterion("tt3 <", value, "tt3"); + return (Criteria) this; + } + + public Criteria andTt3LessThanOrEqualTo(String value) { + addCriterion("tt3 <=", value, "tt3"); + return (Criteria) this; + } + + public Criteria andTt3Like(String value) { + addCriterion("tt3 like", value, "tt3"); + return (Criteria) this; + } + + public Criteria andTt3NotLike(String value) { + addCriterion("tt3 not like", value, "tt3"); + return (Criteria) this; + } + + public Criteria andTt3In(List values) { + addCriterion("tt3 in", values, "tt3"); + return (Criteria) this; + } + + public Criteria andTt3NotIn(List values) { + addCriterion("tt3 not in", values, "tt3"); + return (Criteria) this; + } + + public Criteria andTt3Between(String value1, String value2) { + addCriterion("tt3 between", value1, value2, "tt3"); + return (Criteria) this; + } + + public Criteria andTt3NotBetween(String value1, String value2) { + addCriterion("tt3 not between", value1, value2, "tt3"); + return (Criteria) this; + } + + public Criteria andTt4IsNull() { + addCriterion("tt4 is null"); + return (Criteria) this; + } + + public Criteria andTt4IsNotNull() { + addCriterion("tt4 is not null"); + return (Criteria) this; + } + + public Criteria andTt4EqualTo(String value) { + addCriterion("tt4 =", value, "tt4"); + return (Criteria) this; + } + + public Criteria andTt4NotEqualTo(String value) { + addCriterion("tt4 <>", value, "tt4"); + return (Criteria) this; + } + + public Criteria andTt4GreaterThan(String value) { + addCriterion("tt4 >", value, "tt4"); + return (Criteria) this; + } + + public Criteria andTt4GreaterThanOrEqualTo(String value) { + addCriterion("tt4 >=", value, "tt4"); + return (Criteria) this; + } + + public Criteria andTt4LessThan(String value) { + addCriterion("tt4 <", value, "tt4"); + return (Criteria) this; + } + + public Criteria andTt4LessThanOrEqualTo(String value) { + addCriterion("tt4 <=", value, "tt4"); + return (Criteria) this; + } + + public Criteria andTt4Like(String value) { + addCriterion("tt4 like", value, "tt4"); + return (Criteria) this; + } + + public Criteria andTt4NotLike(String value) { + addCriterion("tt4 not like", value, "tt4"); + return (Criteria) this; + } + + public Criteria andTt4In(List values) { + addCriterion("tt4 in", values, "tt4"); + return (Criteria) this; + } + + public Criteria andTt4NotIn(List values) { + addCriterion("tt4 not in", values, "tt4"); + return (Criteria) this; + } + + public Criteria andTt4Between(String value1, String value2) { + addCriterion("tt4 between", value1, value2, "tt4"); + return (Criteria) this; + } + + public Criteria andTt4NotBetween(String value1, String value2) { + addCriterion("tt4 not between", value1, value2, "tt4"); + return (Criteria) this; + } + + public Criteria andTshIsNull() { + addCriterion("tsh is null"); + return (Criteria) this; + } + + public Criteria andTshIsNotNull() { + addCriterion("tsh is not null"); + return (Criteria) this; + } + + public Criteria andTshEqualTo(String value) { + addCriterion("tsh =", value, "tsh"); + return (Criteria) this; + } + + public Criteria andTshNotEqualTo(String value) { + addCriterion("tsh <>", value, "tsh"); + return (Criteria) this; + } + + public Criteria andTshGreaterThan(String value) { + addCriterion("tsh >", value, "tsh"); + return (Criteria) this; + } + + public Criteria andTshGreaterThanOrEqualTo(String value) { + addCriterion("tsh >=", value, "tsh"); + return (Criteria) this; + } + + public Criteria andTshLessThan(String value) { + addCriterion("tsh <", value, "tsh"); + return (Criteria) this; + } + + public Criteria andTshLessThanOrEqualTo(String value) { + addCriterion("tsh <=", value, "tsh"); + return (Criteria) this; + } + + public Criteria andTshLike(String value) { + addCriterion("tsh like", value, "tsh"); + return (Criteria) this; + } + + public Criteria andTshNotLike(String value) { + addCriterion("tsh not like", value, "tsh"); + return (Criteria) this; + } + + public Criteria andTshIn(List values) { + addCriterion("tsh in", values, "tsh"); + return (Criteria) this; + } + + public Criteria andTshNotIn(List values) { + addCriterion("tsh not in", values, "tsh"); + return (Criteria) this; + } + + public Criteria andTshBetween(String value1, String value2) { + addCriterion("tsh between", value1, value2, "tsh"); + return (Criteria) this; + } + + public Criteria andTshNotBetween(String value1, String value2) { + addCriterion("tsh not between", value1, value2, "tsh"); + 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 andRecorderIsNull() { + addCriterion("recorder is null"); + return (Criteria) this; + } + + public Criteria andRecorderIsNotNull() { + addCriterion("recorder is not null"); + return (Criteria) this; + } + + public Criteria andRecorderEqualTo(Long value) { + addCriterion("recorder =", value, "recorder"); + return (Criteria) this; + } + + public Criteria andRecorderNotEqualTo(Long value) { + addCriterion("recorder <>", value, "recorder"); + return (Criteria) this; + } + + public Criteria andRecorderGreaterThan(Long value) { + addCriterion("recorder >", value, "recorder"); + return (Criteria) this; + } + + public Criteria andRecorderGreaterThanOrEqualTo(Long value) { + addCriterion("recorder >=", value, "recorder"); + return (Criteria) this; + } + + public Criteria andRecorderLessThan(Long value) { + addCriterion("recorder <", value, "recorder"); + return (Criteria) this; + } + + public Criteria andRecorderLessThanOrEqualTo(Long value) { + addCriterion("recorder <=", value, "recorder"); + return (Criteria) this; + } + + public Criteria andRecorderIn(List values) { + addCriterion("recorder in", values, "recorder"); + return (Criteria) this; + } + + public Criteria andRecorderNotIn(List values) { + addCriterion("recorder not in", values, "recorder"); + return (Criteria) this; + } + + public Criteria andRecorderBetween(Long value1, Long value2) { + addCriterion("recorder between", value1, value2, "recorder"); + return (Criteria) this; + } + + public Criteria andRecorderNotBetween(Long value1, Long value2) { + addCriterion("recorder not between", value1, value2, "recorder"); + return (Criteria) this; + } + + public Criteria andTa1IsNull() { + addCriterion("ta1 is null"); + return (Criteria) this; + } + + public Criteria andTa1IsNotNull() { + addCriterion("ta1 is not null"); + return (Criteria) this; + } + + public Criteria andTa1EqualTo(String value) { + addCriterion("ta1 =", value, "ta1"); + return (Criteria) this; + } + + public Criteria andTa1NotEqualTo(String value) { + addCriterion("ta1 <>", value, "ta1"); + return (Criteria) this; + } + + public Criteria andTa1GreaterThan(String value) { + addCriterion("ta1 >", value, "ta1"); + return (Criteria) this; + } + + public Criteria andTa1GreaterThanOrEqualTo(String value) { + addCriterion("ta1 >=", value, "ta1"); + return (Criteria) this; + } + + public Criteria andTa1LessThan(String value) { + addCriterion("ta1 <", value, "ta1"); + return (Criteria) this; + } + + public Criteria andTa1LessThanOrEqualTo(String value) { + addCriterion("ta1 <=", value, "ta1"); + return (Criteria) this; + } + + public Criteria andTa1Like(String value) { + addCriterion("ta1 like", value, "ta1"); + return (Criteria) this; + } + + public Criteria andTa1NotLike(String value) { + addCriterion("ta1 not like", value, "ta1"); + return (Criteria) this; + } + + public Criteria andTa1In(List values) { + addCriterion("ta1 in", values, "ta1"); + return (Criteria) this; + } + + public Criteria andTa1NotIn(List values) { + addCriterion("ta1 not in", values, "ta1"); + return (Criteria) this; + } + + public Criteria andTa1Between(String value1, String value2) { + addCriterion("ta1 between", value1, value2, "ta1"); + return (Criteria) this; + } + + public Criteria andTa1NotBetween(String value1, String value2) { + addCriterion("ta1 not between", value1, value2, "ta1"); + return (Criteria) this; + } + + public Criteria andTptIsNull() { + addCriterion("tpt is null"); + return (Criteria) this; + } + + public Criteria andTptIsNotNull() { + addCriterion("tpt is not null"); + return (Criteria) this; + } + + public Criteria andTptEqualTo(String value) { + addCriterion("tpt =", value, "tpt"); + return (Criteria) this; + } + + public Criteria andTptNotEqualTo(String value) { + addCriterion("tpt <>", value, "tpt"); + return (Criteria) this; + } + + public Criteria andTptGreaterThan(String value) { + addCriterion("tpt >", value, "tpt"); + return (Criteria) this; + } + + public Criteria andTptGreaterThanOrEqualTo(String value) { + addCriterion("tpt >=", value, "tpt"); + return (Criteria) this; + } + + public Criteria andTptLessThan(String value) { + addCriterion("tpt <", value, "tpt"); + return (Criteria) this; + } + + public Criteria andTptLessThanOrEqualTo(String value) { + addCriterion("tpt <=", value, "tpt"); + return (Criteria) this; + } + + public Criteria andTptLike(String value) { + addCriterion("tpt like", value, "tpt"); + return (Criteria) this; + } + + public Criteria andTptNotLike(String value) { + addCriterion("tpt not like", value, "tpt"); + return (Criteria) this; + } + + public Criteria andTptIn(List values) { + addCriterion("tpt in", values, "tpt"); + return (Criteria) this; + } + + public Criteria andTptNotIn(List values) { + addCriterion("tpt not in", values, "tpt"); + return (Criteria) this; + } + + public Criteria andTptBetween(String value1, String value2) { + addCriterion("tpt between", value1, value2, "tpt"); + return (Criteria) this; + } + + public Criteria andTptNotBetween(String value1, String value2) { + addCriterion("tpt not between", value1, value2, "tpt"); + 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/HtPatientScore.java b/ht/src/main/java/com/ccsens/ht/bean/po/HtPatientScore.java index aac2baac..42b6911d 100644 --- a/ht/src/main/java/com/ccsens/ht/bean/po/HtPatientScore.java +++ b/ht/src/main/java/com/ccsens/ht/bean/po/HtPatientScore.java @@ -1,183 +1,184 @@ -package com.ccsens.ht.bean.po; - -import java.io.Serializable; -import java.util.Date; - -public class HtPatientScore implements Serializable { - private Long id; - - private Long patientReportId; - - private Long patientId; - - private String questionParentCode; - - private Long questionId; - - private Long optionId; - - private String optionName; - - private Integer score; - - private Byte type; - - private String answer; - - private String remark; - - private Date createTime; - - private Date updateTime; - - private Byte isDel; - - private Long answerTime; - - private static final long serialVersionUID = 1L; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getPatientReportId() { - return patientReportId; - } - - public void setPatientReportId(Long patientReportId) { - this.patientReportId = patientReportId; - } - - public Long getPatientId() { - return patientId; - } - - public void setPatientId(Long patientId) { - this.patientId = patientId; - } - - public String getQuestionParentCode() { - return questionParentCode; - } - - public void setQuestionParentCode(String questionParentCode) { - this.questionParentCode = questionParentCode == null ? null : questionParentCode.trim(); - } - - public Long getQuestionId() { - return questionId; - } - - public void setQuestionId(Long questionId) { - this.questionId = questionId; - } - - public Long getOptionId() { - return optionId; - } - - public void setOptionId(Long optionId) { - this.optionId = optionId; - } - - public String getOptionName() { - return optionName; - } - - public void setOptionName(String optionName) { - this.optionName = optionName == null ? null : optionName.trim(); - } - - public Integer getScore() { - return score; - } - - public void setScore(Integer score) { - this.score = score; - } - - public Byte getType() { - return type; - } - - public void setType(Byte type) { - this.type = type; - } - - public String getAnswer() { - return answer; - } - - public void setAnswer(String answer) { - this.answer = answer == null ? null : answer.trim(); - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark == null ? null : remark.trim(); - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - - public Byte getIsDel() { - return isDel; - } - - public void setIsDel(Byte isDel) { - this.isDel = isDel; - } - - public Long getAnswerTime() { - return answerTime; - } - - public void setAnswerTime(Long answerTime) { - this.answerTime = answerTime; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", patientReportId=").append(patientReportId); - sb.append(", patientId=").append(patientId); - sb.append(", questionParentCode=").append(questionParentCode); - sb.append(", questionId=").append(questionId); - sb.append(", optionId=").append(optionId); - sb.append(", optionName=").append(optionName); - sb.append(", score=").append(score); - sb.append(", type=").append(type); - sb.append(", answer=").append(answer); - sb.append(", remark=").append(remark); - sb.append(", createTime=").append(createTime); - sb.append(", updateTime=").append(updateTime); - sb.append(", isDel=").append(isDel); - sb.append(", answerTime=").append(answerTime); - sb.append("]"); - return sb.toString(); - } +package com.ccsens.ht.bean.po; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +public class HtPatientScore implements Serializable { + private Long id; + + private Long patientReportId; + + private Long patientId; + + private String questionParentCode; + + private Long questionId; + + private Long optionId; + + private String optionName; + + private BigDecimal score; + + private Byte type; + + private String answer; + + private String remark; + + private Date createTime; + + private Date updateTime; + + private Byte isDel; + + private Long answerTime; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getPatientReportId() { + return patientReportId; + } + + public void setPatientReportId(Long patientReportId) { + this.patientReportId = patientReportId; + } + + public Long getPatientId() { + return patientId; + } + + public void setPatientId(Long patientId) { + this.patientId = patientId; + } + + public String getQuestionParentCode() { + return questionParentCode; + } + + public void setQuestionParentCode(String questionParentCode) { + this.questionParentCode = questionParentCode == null ? null : questionParentCode.trim(); + } + + public Long getQuestionId() { + return questionId; + } + + public void setQuestionId(Long questionId) { + this.questionId = questionId; + } + + public Long getOptionId() { + return optionId; + } + + public void setOptionId(Long optionId) { + this.optionId = optionId; + } + + public String getOptionName() { + return optionName; + } + + public void setOptionName(String optionName) { + this.optionName = optionName == null ? null : optionName.trim(); + } + + public BigDecimal getScore() { + return score; + } + + public void setScore(BigDecimal score) { + this.score = score; + } + + public Byte getType() { + return type; + } + + public void setType(Byte type) { + this.type = type; + } + + public String getAnswer() { + return answer; + } + + public void setAnswer(String answer) { + this.answer = answer == null ? null : answer.trim(); + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark == null ? null : remark.trim(); + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public Byte getIsDel() { + return isDel; + } + + public void setIsDel(Byte isDel) { + this.isDel = isDel; + } + + public Long getAnswerTime() { + return answerTime; + } + + public void setAnswerTime(Long answerTime) { + this.answerTime = answerTime; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", patientReportId=").append(patientReportId); + sb.append(", patientId=").append(patientId); + sb.append(", questionParentCode=").append(questionParentCode); + sb.append(", questionId=").append(questionId); + sb.append(", optionId=").append(optionId); + sb.append(", optionName=").append(optionName); + sb.append(", score=").append(score); + sb.append(", type=").append(type); + sb.append(", answer=").append(answer); + sb.append(", remark=").append(remark); + sb.append(", createTime=").append(createTime); + sb.append(", updateTime=").append(updateTime); + sb.append(", isDel=").append(isDel); + sb.append(", answerTime=").append(answerTime); + sb.append("]"); + return sb.toString(); + } } \ No newline at end of file diff --git a/ht/src/main/java/com/ccsens/ht/bean/po/HtPatientScoreExample.java b/ht/src/main/java/com/ccsens/ht/bean/po/HtPatientScoreExample.java index f5595d24..9d377815 100644 --- a/ht/src/main/java/com/ccsens/ht/bean/po/HtPatientScoreExample.java +++ b/ht/src/main/java/com/ccsens/ht/bean/po/HtPatientScoreExample.java @@ -1,1141 +1,1142 @@ -package com.ccsens.ht.bean.po; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class HtPatientScoreExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public HtPatientScoreExample() { - 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 andPatientIdIsNull() { - addCriterion("patient_id is null"); - return (Criteria) this; - } - - public Criteria andPatientIdIsNotNull() { - addCriterion("patient_id is not null"); - return (Criteria) this; - } - - public Criteria andPatientIdEqualTo(Long value) { - addCriterion("patient_id =", value, "patientId"); - return (Criteria) this; - } - - public Criteria andPatientIdNotEqualTo(Long value) { - addCriterion("patient_id <>", value, "patientId"); - return (Criteria) this; - } - - public Criteria andPatientIdGreaterThan(Long value) { - addCriterion("patient_id >", value, "patientId"); - return (Criteria) this; - } - - public Criteria andPatientIdGreaterThanOrEqualTo(Long value) { - addCriterion("patient_id >=", value, "patientId"); - return (Criteria) this; - } - - public Criteria andPatientIdLessThan(Long value) { - addCriterion("patient_id <", value, "patientId"); - return (Criteria) this; - } - - public Criteria andPatientIdLessThanOrEqualTo(Long value) { - addCriterion("patient_id <=", value, "patientId"); - return (Criteria) this; - } - - public Criteria andPatientIdIn(List values) { - addCriterion("patient_id in", values, "patientId"); - return (Criteria) this; - } - - public Criteria andPatientIdNotIn(List values) { - addCriterion("patient_id not in", values, "patientId"); - return (Criteria) this; - } - - public Criteria andPatientIdBetween(Long value1, Long value2) { - addCriterion("patient_id between", value1, value2, "patientId"); - return (Criteria) this; - } - - public Criteria andPatientIdNotBetween(Long value1, Long value2) { - addCriterion("patient_id not between", value1, value2, "patientId"); - return (Criteria) this; - } - - public Criteria andQuestionParentCodeIsNull() { - addCriterion("question_parent_code is null"); - return (Criteria) this; - } - - public Criteria andQuestionParentCodeIsNotNull() { - addCriterion("question_parent_code is not null"); - return (Criteria) this; - } - - public Criteria andQuestionParentCodeEqualTo(String value) { - addCriterion("question_parent_code =", value, "questionParentCode"); - return (Criteria) this; - } - - public Criteria andQuestionParentCodeNotEqualTo(String value) { - addCriterion("question_parent_code <>", value, "questionParentCode"); - return (Criteria) this; - } - - public Criteria andQuestionParentCodeGreaterThan(String value) { - addCriterion("question_parent_code >", value, "questionParentCode"); - return (Criteria) this; - } - - public Criteria andQuestionParentCodeGreaterThanOrEqualTo(String value) { - addCriterion("question_parent_code >=", value, "questionParentCode"); - return (Criteria) this; - } - - public Criteria andQuestionParentCodeLessThan(String value) { - addCriterion("question_parent_code <", value, "questionParentCode"); - return (Criteria) this; - } - - public Criteria andQuestionParentCodeLessThanOrEqualTo(String value) { - addCriterion("question_parent_code <=", value, "questionParentCode"); - return (Criteria) this; - } - - public Criteria andQuestionParentCodeLike(String value) { - addCriterion("question_parent_code like", value, "questionParentCode"); - return (Criteria) this; - } - - public Criteria andQuestionParentCodeNotLike(String value) { - addCriterion("question_parent_code not like", value, "questionParentCode"); - return (Criteria) this; - } - - public Criteria andQuestionParentCodeIn(List values) { - addCriterion("question_parent_code in", values, "questionParentCode"); - return (Criteria) this; - } - - public Criteria andQuestionParentCodeNotIn(List values) { - addCriterion("question_parent_code not in", values, "questionParentCode"); - return (Criteria) this; - } - - public Criteria andQuestionParentCodeBetween(String value1, String value2) { - addCriterion("question_parent_code between", value1, value2, "questionParentCode"); - return (Criteria) this; - } - - public Criteria andQuestionParentCodeNotBetween(String value1, String value2) { - addCriterion("question_parent_code not between", value1, value2, "questionParentCode"); - 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 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 andOptionNameIsNull() { - addCriterion("option_name is null"); - return (Criteria) this; - } - - public Criteria andOptionNameIsNotNull() { - addCriterion("option_name is not null"); - return (Criteria) this; - } - - public Criteria andOptionNameEqualTo(String value) { - addCriterion("option_name =", value, "optionName"); - return (Criteria) this; - } - - public Criteria andOptionNameNotEqualTo(String value) { - addCriterion("option_name <>", value, "optionName"); - return (Criteria) this; - } - - public Criteria andOptionNameGreaterThan(String value) { - addCriterion("option_name >", value, "optionName"); - return (Criteria) this; - } - - public Criteria andOptionNameGreaterThanOrEqualTo(String value) { - addCriterion("option_name >=", value, "optionName"); - return (Criteria) this; - } - - public Criteria andOptionNameLessThan(String value) { - addCriterion("option_name <", value, "optionName"); - return (Criteria) this; - } - - public Criteria andOptionNameLessThanOrEqualTo(String value) { - addCriterion("option_name <=", value, "optionName"); - return (Criteria) this; - } - - public Criteria andOptionNameLike(String value) { - addCriterion("option_name like", value, "optionName"); - return (Criteria) this; - } - - public Criteria andOptionNameNotLike(String value) { - addCriterion("option_name not like", value, "optionName"); - return (Criteria) this; - } - - public Criteria andOptionNameIn(List values) { - addCriterion("option_name in", values, "optionName"); - return (Criteria) this; - } - - public Criteria andOptionNameNotIn(List values) { - addCriterion("option_name not in", values, "optionName"); - return (Criteria) this; - } - - public Criteria andOptionNameBetween(String value1, String value2) { - addCriterion("option_name between", value1, value2, "optionName"); - return (Criteria) this; - } - - public Criteria andOptionNameNotBetween(String value1, String value2) { - addCriterion("option_name not between", value1, value2, "optionName"); - return (Criteria) this; - } - - public Criteria andScoreIsNull() { - addCriterion("score is null"); - return (Criteria) this; - } - - public Criteria andScoreIsNotNull() { - addCriterion("score is not null"); - return (Criteria) this; - } - - public Criteria andScoreEqualTo(Integer value) { - addCriterion("score =", value, "score"); - return (Criteria) this; - } - - public Criteria andScoreNotEqualTo(Integer value) { - addCriterion("score <>", value, "score"); - return (Criteria) this; - } - - public Criteria andScoreGreaterThan(Integer value) { - addCriterion("score >", value, "score"); - return (Criteria) this; - } - - public Criteria andScoreGreaterThanOrEqualTo(Integer value) { - addCriterion("score >=", value, "score"); - return (Criteria) this; - } - - public Criteria andScoreLessThan(Integer value) { - addCriterion("score <", value, "score"); - return (Criteria) this; - } - - public Criteria andScoreLessThanOrEqualTo(Integer value) { - addCriterion("score <=", value, "score"); - return (Criteria) this; - } - - public Criteria andScoreIn(List values) { - addCriterion("score in", values, "score"); - return (Criteria) this; - } - - public Criteria andScoreNotIn(List values) { - addCriterion("score not in", values, "score"); - return (Criteria) this; - } - - public Criteria andScoreBetween(Integer value1, Integer value2) { - addCriterion("score between", value1, value2, "score"); - return (Criteria) this; - } - - public Criteria andScoreNotBetween(Integer value1, Integer value2) { - addCriterion("score not between", value1, value2, "score"); - 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 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); - } - } +package com.ccsens.ht.bean.po; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class HtPatientScoreExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public HtPatientScoreExample() { + 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 andPatientIdIsNull() { + addCriterion("patient_id is null"); + return (Criteria) this; + } + + public Criteria andPatientIdIsNotNull() { + addCriterion("patient_id is not null"); + return (Criteria) this; + } + + public Criteria andPatientIdEqualTo(Long value) { + addCriterion("patient_id =", value, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdNotEqualTo(Long value) { + addCriterion("patient_id <>", value, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdGreaterThan(Long value) { + addCriterion("patient_id >", value, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdGreaterThanOrEqualTo(Long value) { + addCriterion("patient_id >=", value, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdLessThan(Long value) { + addCriterion("patient_id <", value, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdLessThanOrEqualTo(Long value) { + addCriterion("patient_id <=", value, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdIn(List values) { + addCriterion("patient_id in", values, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdNotIn(List values) { + addCriterion("patient_id not in", values, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdBetween(Long value1, Long value2) { + addCriterion("patient_id between", value1, value2, "patientId"); + return (Criteria) this; + } + + public Criteria andPatientIdNotBetween(Long value1, Long value2) { + addCriterion("patient_id not between", value1, value2, "patientId"); + return (Criteria) this; + } + + public Criteria andQuestionParentCodeIsNull() { + addCriterion("question_parent_code is null"); + return (Criteria) this; + } + + public Criteria andQuestionParentCodeIsNotNull() { + addCriterion("question_parent_code is not null"); + return (Criteria) this; + } + + public Criteria andQuestionParentCodeEqualTo(String value) { + addCriterion("question_parent_code =", value, "questionParentCode"); + return (Criteria) this; + } + + public Criteria andQuestionParentCodeNotEqualTo(String value) { + addCriterion("question_parent_code <>", value, "questionParentCode"); + return (Criteria) this; + } + + public Criteria andQuestionParentCodeGreaterThan(String value) { + addCriterion("question_parent_code >", value, "questionParentCode"); + return (Criteria) this; + } + + public Criteria andQuestionParentCodeGreaterThanOrEqualTo(String value) { + addCriterion("question_parent_code >=", value, "questionParentCode"); + return (Criteria) this; + } + + public Criteria andQuestionParentCodeLessThan(String value) { + addCriterion("question_parent_code <", value, "questionParentCode"); + return (Criteria) this; + } + + public Criteria andQuestionParentCodeLessThanOrEqualTo(String value) { + addCriterion("question_parent_code <=", value, "questionParentCode"); + return (Criteria) this; + } + + public Criteria andQuestionParentCodeLike(String value) { + addCriterion("question_parent_code like", value, "questionParentCode"); + return (Criteria) this; + } + + public Criteria andQuestionParentCodeNotLike(String value) { + addCriterion("question_parent_code not like", value, "questionParentCode"); + return (Criteria) this; + } + + public Criteria andQuestionParentCodeIn(List values) { + addCriterion("question_parent_code in", values, "questionParentCode"); + return (Criteria) this; + } + + public Criteria andQuestionParentCodeNotIn(List values) { + addCriterion("question_parent_code not in", values, "questionParentCode"); + return (Criteria) this; + } + + public Criteria andQuestionParentCodeBetween(String value1, String value2) { + addCriterion("question_parent_code between", value1, value2, "questionParentCode"); + return (Criteria) this; + } + + public Criteria andQuestionParentCodeNotBetween(String value1, String value2) { + addCriterion("question_parent_code not between", value1, value2, "questionParentCode"); + 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 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 andOptionNameIsNull() { + addCriterion("option_name is null"); + return (Criteria) this; + } + + public Criteria andOptionNameIsNotNull() { + addCriterion("option_name is not null"); + return (Criteria) this; + } + + public Criteria andOptionNameEqualTo(String value) { + addCriterion("option_name =", value, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameNotEqualTo(String value) { + addCriterion("option_name <>", value, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameGreaterThan(String value) { + addCriterion("option_name >", value, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameGreaterThanOrEqualTo(String value) { + addCriterion("option_name >=", value, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameLessThan(String value) { + addCriterion("option_name <", value, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameLessThanOrEqualTo(String value) { + addCriterion("option_name <=", value, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameLike(String value) { + addCriterion("option_name like", value, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameNotLike(String value) { + addCriterion("option_name not like", value, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameIn(List values) { + addCriterion("option_name in", values, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameNotIn(List values) { + addCriterion("option_name not in", values, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameBetween(String value1, String value2) { + addCriterion("option_name between", value1, value2, "optionName"); + return (Criteria) this; + } + + public Criteria andOptionNameNotBetween(String value1, String value2) { + addCriterion("option_name not between", value1, value2, "optionName"); + return (Criteria) this; + } + + public Criteria andScoreIsNull() { + addCriterion("score is null"); + return (Criteria) this; + } + + public Criteria andScoreIsNotNull() { + addCriterion("score is not null"); + return (Criteria) this; + } + + public Criteria andScoreEqualTo(BigDecimal value) { + addCriterion("score =", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreNotEqualTo(BigDecimal value) { + addCriterion("score <>", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreGreaterThan(BigDecimal value) { + addCriterion("score >", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("score >=", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreLessThan(BigDecimal value) { + addCriterion("score <", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreLessThanOrEqualTo(BigDecimal value) { + addCriterion("score <=", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreIn(List values) { + addCriterion("score in", values, "score"); + return (Criteria) this; + } + + public Criteria andScoreNotIn(List values) { + addCriterion("score not in", values, "score"); + return (Criteria) this; + } + + public Criteria andScoreBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("score between", value1, value2, "score"); + return (Criteria) this; + } + + public Criteria andScoreNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("score not between", value1, value2, "score"); + 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 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/HtQuestionOption.java b/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionOption.java index 41ae8fc6..661b0eb7 100644 --- a/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionOption.java +++ b/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionOption.java @@ -1,139 +1,140 @@ -package com.ccsens.ht.bean.po; - -import java.io.Serializable; -import java.util.Date; - -public class HtQuestionOption implements Serializable { - private Long id; - - private Long questionId; - - private Integer sort; - - private String type; - - private String name; - - private Integer score; - - private String display; - - private String remark; - - private Date createTime; - - private Date updateTime; - - private Byte isDel; - - private static final long serialVersionUID = 1L; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getQuestionId() { - return questionId; - } - - public void setQuestionId(Long questionId) { - this.questionId = questionId; - } - - public Integer getSort() { - return sort; - } - - public void setSort(Integer sort) { - this.sort = sort; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type == null ? null : type.trim(); - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name == null ? null : name.trim(); - } - - public Integer getScore() { - return score; - } - - public void setScore(Integer score) { - this.score = score; - } - - public String getDisplay() { - return display; - } - - public void setDisplay(String display) { - this.display = display == null ? null : display.trim(); - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark == null ? null : remark.trim(); - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - - public Byte getIsDel() { - return isDel; - } - - public void setIsDel(Byte isDel) { - this.isDel = isDel; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", questionId=").append(questionId); - sb.append(", sort=").append(sort); - sb.append(", type=").append(type); - sb.append(", name=").append(name); - sb.append(", score=").append(score); - sb.append(", display=").append(display); - sb.append(", remark=").append(remark); - sb.append(", createTime=").append(createTime); - sb.append(", updateTime=").append(updateTime); - sb.append(", isDel=").append(isDel); - sb.append("]"); - return sb.toString(); - } +package com.ccsens.ht.bean.po; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +public class HtQuestionOption implements Serializable { + private Long id; + + private Long questionId; + + private Integer sort; + + private String type; + + private String name; + + private BigDecimal score; + + private String display; + + private String remark; + + private Date createTime; + + private Date updateTime; + + private Byte isDel; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getQuestionId() { + return questionId; + } + + public void setQuestionId(Long questionId) { + this.questionId = questionId; + } + + public Integer getSort() { + return sort; + } + + public void setSort(Integer sort) { + this.sort = sort; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type == null ? null : type.trim(); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name == null ? null : name.trim(); + } + + public BigDecimal getScore() { + return score; + } + + public void setScore(BigDecimal score) { + this.score = score; + } + + public String getDisplay() { + return display; + } + + public void setDisplay(String display) { + this.display = display == null ? null : display.trim(); + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark == null ? null : remark.trim(); + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public Byte getIsDel() { + return isDel; + } + + public void setIsDel(Byte isDel) { + this.isDel = isDel; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", questionId=").append(questionId); + sb.append(", sort=").append(sort); + sb.append(", type=").append(type); + sb.append(", name=").append(name); + sb.append(", score=").append(score); + sb.append(", display=").append(display); + sb.append(", remark=").append(remark); + sb.append(", createTime=").append(createTime); + sb.append(", updateTime=").append(updateTime); + sb.append(", isDel=").append(isDel); + sb.append("]"); + return sb.toString(); + } } \ No newline at end of file diff --git a/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionOptionExample.java b/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionOptionExample.java index 7eb59c6d..043d2f21 100644 --- a/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionOptionExample.java +++ b/ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionOptionExample.java @@ -1,901 +1,902 @@ -package com.ccsens.ht.bean.po; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class HtQuestionOptionExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public HtQuestionOptionExample() { - 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 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 andTypeIsNull() { - addCriterion("type is null"); - return (Criteria) this; - } - - public Criteria andTypeIsNotNull() { - addCriterion("type is not null"); - return (Criteria) this; - } - - public Criteria andTypeEqualTo(String value) { - addCriterion("type =", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotEqualTo(String value) { - addCriterion("type <>", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThan(String value) { - addCriterion("type >", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThanOrEqualTo(String value) { - addCriterion("type >=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThan(String value) { - addCriterion("type <", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThanOrEqualTo(String value) { - addCriterion("type <=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLike(String value) { - addCriterion("type like", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotLike(String value) { - addCriterion("type not like", 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(String value1, String value2) { - addCriterion("type between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotBetween(String value1, String value2) { - addCriterion("type not between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andNameIsNull() { - addCriterion("name is null"); - return (Criteria) this; - } - - public Criteria andNameIsNotNull() { - addCriterion("name is not null"); - return (Criteria) this; - } - - public Criteria andNameEqualTo(String value) { - addCriterion("name =", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotEqualTo(String value) { - addCriterion("name <>", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThan(String value) { - addCriterion("name >", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThanOrEqualTo(String value) { - addCriterion("name >=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThan(String value) { - addCriterion("name <", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThanOrEqualTo(String value) { - addCriterion("name <=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLike(String value) { - addCriterion("name like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotLike(String value) { - addCriterion("name not like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameIn(List values) { - addCriterion("name in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameNotIn(List values) { - addCriterion("name not in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameBetween(String value1, String value2) { - addCriterion("name between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andNameNotBetween(String value1, String value2) { - addCriterion("name not between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andScoreIsNull() { - addCriterion("score is null"); - return (Criteria) this; - } - - public Criteria andScoreIsNotNull() { - addCriterion("score is not null"); - return (Criteria) this; - } - - public Criteria andScoreEqualTo(Integer value) { - addCriterion("score =", value, "score"); - return (Criteria) this; - } - - public Criteria andScoreNotEqualTo(Integer value) { - addCriterion("score <>", value, "score"); - return (Criteria) this; - } - - public Criteria andScoreGreaterThan(Integer value) { - addCriterion("score >", value, "score"); - return (Criteria) this; - } - - public Criteria andScoreGreaterThanOrEqualTo(Integer value) { - addCriterion("score >=", value, "score"); - return (Criteria) this; - } - - public Criteria andScoreLessThan(Integer value) { - addCriterion("score <", value, "score"); - return (Criteria) this; - } - - public Criteria andScoreLessThanOrEqualTo(Integer value) { - addCriterion("score <=", value, "score"); - return (Criteria) this; - } - - public Criteria andScoreIn(List values) { - addCriterion("score in", values, "score"); - return (Criteria) this; - } - - public Criteria andScoreNotIn(List values) { - addCriterion("score not in", values, "score"); - return (Criteria) this; - } - - public Criteria andScoreBetween(Integer value1, Integer value2) { - addCriterion("score between", value1, value2, "score"); - return (Criteria) this; - } - - public Criteria andScoreNotBetween(Integer value1, Integer value2) { - addCriterion("score not between", value1, value2, "score"); - return (Criteria) this; - } - - public Criteria andDisplayIsNull() { - addCriterion("display is null"); - return (Criteria) this; - } - - public Criteria andDisplayIsNotNull() { - addCriterion("display is not null"); - return (Criteria) this; - } - - public Criteria andDisplayEqualTo(String value) { - addCriterion("display =", value, "display"); - return (Criteria) this; - } - - public Criteria andDisplayNotEqualTo(String value) { - addCriterion("display <>", value, "display"); - return (Criteria) this; - } - - public Criteria andDisplayGreaterThan(String value) { - addCriterion("display >", value, "display"); - return (Criteria) this; - } - - public Criteria andDisplayGreaterThanOrEqualTo(String value) { - addCriterion("display >=", value, "display"); - return (Criteria) this; - } - - public Criteria andDisplayLessThan(String value) { - addCriterion("display <", value, "display"); - return (Criteria) this; - } - - public Criteria andDisplayLessThanOrEqualTo(String value) { - addCriterion("display <=", value, "display"); - return (Criteria) this; - } - - public Criteria andDisplayLike(String value) { - addCriterion("display like", value, "display"); - return (Criteria) this; - } - - public Criteria andDisplayNotLike(String value) { - addCriterion("display not like", value, "display"); - return (Criteria) this; - } - - public Criteria andDisplayIn(List values) { - addCriterion("display in", values, "display"); - return (Criteria) this; - } - - public Criteria andDisplayNotIn(List values) { - addCriterion("display not in", values, "display"); - return (Criteria) this; - } - - public Criteria andDisplayBetween(String value1, String value2) { - addCriterion("display between", value1, value2, "display"); - return (Criteria) this; - } - - public Criteria andDisplayNotBetween(String value1, String value2) { - addCriterion("display not between", value1, value2, "display"); - 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); - } - } +package com.ccsens.ht.bean.po; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class HtQuestionOptionExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public HtQuestionOptionExample() { + 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 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 andTypeIsNull() { + addCriterion("type is null"); + return (Criteria) this; + } + + public Criteria andTypeIsNotNull() { + addCriterion("type is not null"); + return (Criteria) this; + } + + public Criteria andTypeEqualTo(String value) { + addCriterion("type =", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotEqualTo(String value) { + addCriterion("type <>", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThan(String value) { + addCriterion("type >", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThanOrEqualTo(String value) { + addCriterion("type >=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThan(String value) { + addCriterion("type <", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThanOrEqualTo(String value) { + addCriterion("type <=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLike(String value) { + addCriterion("type like", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotLike(String value) { + addCriterion("type not like", 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(String value1, String value2) { + addCriterion("type between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotBetween(String value1, String value2) { + addCriterion("type not between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andNameIsNull() { + addCriterion("name is null"); + return (Criteria) this; + } + + public Criteria andNameIsNotNull() { + addCriterion("name is not null"); + return (Criteria) this; + } + + public Criteria andNameEqualTo(String value) { + addCriterion("name =", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotEqualTo(String value) { + addCriterion("name <>", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThan(String value) { + addCriterion("name >", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThanOrEqualTo(String value) { + addCriterion("name >=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThan(String value) { + addCriterion("name <", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThanOrEqualTo(String value) { + addCriterion("name <=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLike(String value) { + addCriterion("name like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotLike(String value) { + addCriterion("name not like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameIn(List values) { + addCriterion("name in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List values) { + addCriterion("name not in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameBetween(String value1, String value2) { + addCriterion("name between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andNameNotBetween(String value1, String value2) { + addCriterion("name not between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andScoreIsNull() { + addCriterion("score is null"); + return (Criteria) this; + } + + public Criteria andScoreIsNotNull() { + addCriterion("score is not null"); + return (Criteria) this; + } + + public Criteria andScoreEqualTo(BigDecimal value) { + addCriterion("score =", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreNotEqualTo(BigDecimal value) { + addCriterion("score <>", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreGreaterThan(BigDecimal value) { + addCriterion("score >", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("score >=", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreLessThan(BigDecimal value) { + addCriterion("score <", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreLessThanOrEqualTo(BigDecimal value) { + addCriterion("score <=", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreIn(List values) { + addCriterion("score in", values, "score"); + return (Criteria) this; + } + + public Criteria andScoreNotIn(List values) { + addCriterion("score not in", values, "score"); + return (Criteria) this; + } + + public Criteria andScoreBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("score between", value1, value2, "score"); + return (Criteria) this; + } + + public Criteria andScoreNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("score not between", value1, value2, "score"); + return (Criteria) this; + } + + public Criteria andDisplayIsNull() { + addCriterion("display is null"); + return (Criteria) this; + } + + public Criteria andDisplayIsNotNull() { + addCriterion("display is not null"); + return (Criteria) this; + } + + public Criteria andDisplayEqualTo(String value) { + addCriterion("display =", value, "display"); + return (Criteria) this; + } + + public Criteria andDisplayNotEqualTo(String value) { + addCriterion("display <>", value, "display"); + return (Criteria) this; + } + + public Criteria andDisplayGreaterThan(String value) { + addCriterion("display >", value, "display"); + return (Criteria) this; + } + + public Criteria andDisplayGreaterThanOrEqualTo(String value) { + addCriterion("display >=", value, "display"); + return (Criteria) this; + } + + public Criteria andDisplayLessThan(String value) { + addCriterion("display <", value, "display"); + return (Criteria) this; + } + + public Criteria andDisplayLessThanOrEqualTo(String value) { + addCriterion("display <=", value, "display"); + return (Criteria) this; + } + + public Criteria andDisplayLike(String value) { + addCriterion("display like", value, "display"); + return (Criteria) this; + } + + public Criteria andDisplayNotLike(String value) { + addCriterion("display not like", value, "display"); + return (Criteria) this; + } + + public Criteria andDisplayIn(List values) { + addCriterion("display in", values, "display"); + return (Criteria) this; + } + + public Criteria andDisplayNotIn(List values) { + addCriterion("display not in", values, "display"); + return (Criteria) this; + } + + public Criteria andDisplayBetween(String value1, String value2) { + addCriterion("display between", value1, value2, "display"); + return (Criteria) this; + } + + public Criteria andDisplayNotBetween(String value1, String value2) { + addCriterion("display not between", value1, value2, "display"); + 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/PatientReportSearchVo.java b/ht/src/main/java/com/ccsens/ht/bean/vo/PatientReportSearchVo.java new file mode 100644 index 00000000..f707d158 --- /dev/null +++ b/ht/src/main/java/com/ccsens/ht/bean/vo/PatientReportSearchVo.java @@ -0,0 +1,33 @@ +package com.ccsens.ht.bean.vo; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: whj + * @time: 2021/3/10 16:06 + */ +public class PatientReportSearchVo { + + @Data + @ApiModel("搜索条件-响应") + public static class SearchParam { + private Long id; + private String code; + private String name; + private byte optionStatus; + private String parentCode; + private List children = new ArrayList<>(); + } + + @Data + @ApiModel("搜索-响应") + public static class Search { + private Long id; + private String name; + } +} 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 00d51388..5a371bda 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 @@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.*; /** @@ -210,7 +211,7 @@ public class PatientReportVo { @ApiModelProperty("总分（<0:不需要显示总分,=0：不计分, >0:总分）") private Integer totalScore; @ApiModelProperty("病人得分") - private Integer score; + private BigDecimal score; @ApiModelProperty("备注") private String remark; @ApiModelProperty("类型（1：报告单 2:测评 3：测评子类 4：二级子类）") diff --git a/ht/src/main/java/com/ccsens/ht/bean/vo/QuestionVo.java b/ht/src/main/java/com/ccsens/ht/bean/vo/QuestionVo.java index 323af41e..4c23bc8c 100644 --- a/ht/src/main/java/com/ccsens/ht/bean/vo/QuestionVo.java +++ b/ht/src/main/java/com/ccsens/ht/bean/vo/QuestionVo.java @@ -307,6 +307,8 @@ public class QuestionVo { @Data @ApiModel("轨迹信息及颜色") public static class Point{ + @ApiModelProperty("id") + private Long pointId; @ApiModelProperty("颜色") private Integer color; @ApiModelProperty("轨迹坐标值") @@ -339,9 +341,9 @@ public class QuestionVo { private Long totalDuration; @ApiModelProperty("总笔画数") private int lineNums; - @ApiModelProperty("最长笔画") + @ApiModelProperty("最长笔画长度") private double longLine; - @ApiModelProperty("最短笔画") + @ApiModelProperty("最短笔画长度") private double shortLine; @ApiModelProperty("笔画中间值") private double centre; @@ -351,6 +353,19 @@ public class QuestionVo { private String beyondProportion; @ApiModelProperty("每条轨迹的参数") private List lineParameterList; + /*20210112新加统计数据*/ + @ApiModelProperty("思考总时间（所有笔画间隔时间）") + private Long reflectOnTime; + @ApiModelProperty("中心 暂定为坐标：X,Y") + private String centreCoordinate; + @ApiModelProperty("面积 暂定均为最小外接长方形 单位为px") + private double acreage; + @ApiModelProperty("平均笔画长度") + private double aveLength; + @ApiModelProperty("长笔画数量") + private int longNums; + @ApiModelProperty("长笔画数量") + private int shortNums; } @Data diff --git a/ht/src/main/java/com/ccsens/ht/config/SpringConfig.java b/ht/src/main/java/com/ccsens/ht/config/SpringConfig.java index a2237a17..b5ac0755 100644 --- a/ht/src/main/java/com/ccsens/ht/config/SpringConfig.java +++ b/ht/src/main/java/com/ccsens/ht/config/SpringConfig.java @@ -17,7 +17,6 @@ import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; diff --git a/ht/src/main/java/com/ccsens/ht/persist/dao/HtPatientReportDao.java b/ht/src/main/java/com/ccsens/ht/persist/dao/HtPatientReportDao.java index 5e8ecf12..c6c9c691 100644 --- a/ht/src/main/java/com/ccsens/ht/persist/dao/HtPatientReportDao.java +++ b/ht/src/main/java/com/ccsens/ht/persist/dao/HtPatientReportDao.java @@ -1,6 +1,8 @@ package com.ccsens.ht.persist.dao; import com.ccsens.ht.bean.dto.PatientReportDto; +import com.ccsens.ht.bean.dto.PatientReportSearchDto; +import com.ccsens.ht.bean.vo.PatientReportSearchVo; import com.ccsens.ht.bean.vo.PatientReportVo; import com.ccsens.ht.persist.mapper.HtPatientReportMapper; import org.apache.ibatis.annotations.Param; @@ -29,7 +31,7 @@ public interface HtPatientReportDao extends HtPatientReportMapper { *@Author: wuHuiJuan *@date: 2019/11/19 11:46 */ - List queryReportScore(@Param("id") Long id); + List queryReportScore(@Param("id") Long id,@Param("rey") int rey); /** * 查询NPI的分数 @@ -95,4 +97,11 @@ public interface HtPatientReportDao extends HtPatientReportMapper { * @return */ List queryReportAnswer(@Param("id")Long id, @Param("evaluationCode")String evaluationCode); + + /** + * 根据分数搜索报告单 + * @param codes 分数 + * @return 报告单 + */ + List search(@Param("codes") List codes); } diff --git a/ht/src/main/java/com/ccsens/ht/persist/dao/HtReportDao.java b/ht/src/main/java/com/ccsens/ht/persist/dao/HtReportDao.java index d4a75a54..2d7399cf 100644 --- a/ht/src/main/java/com/ccsens/ht/persist/dao/HtReportDao.java +++ b/ht/src/main/java/com/ccsens/ht/persist/dao/HtReportDao.java @@ -1,7 +1,9 @@ package com.ccsens.ht.persist.dao; import com.ccsens.ht.bean.po.HtReport; +import com.ccsens.ht.bean.vo.PatientReportSearchVo; import com.ccsens.ht.persist.mapper.HtReportMapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -28,4 +30,11 @@ public interface HtReportDao extends HtReportMapper { *@date: 2019/11/19 10:10 */ List queryReportShow(); + + /** + * 查询所有下级菜单和是否有试题 + * @param parentCode 父code + * @return 搜索条件 + */ + List queryParam(@Param("parentCode") String parentCode); } diff --git a/ht/src/main/java/com/ccsens/ht/persist/mapper/HtPatientAcpMapper.java b/ht/src/main/java/com/ccsens/ht/persist/mapper/HtPatientAcpMapper.java index 5a74c4a5..39b41a8a 100644 --- a/ht/src/main/java/com/ccsens/ht/persist/mapper/HtPatientAcpMapper.java +++ b/ht/src/main/java/com/ccsens/ht/persist/mapper/HtPatientAcpMapper.java @@ -1,30 +1,30 @@ -package com.ccsens.ht.persist.mapper; - -import com.ccsens.ht.bean.po.HtPatientAcp; -import com.ccsens.ht.bean.po.HtPatientAcpExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface HtPatientAcpMapper { - long countByExample(HtPatientAcpExample example); - - int deleteByExample(HtPatientAcpExample example); - - int deleteByPrimaryKey(Long id); - - int insert(HtPatientAcp record); - - int insertSelective(HtPatientAcp record); - - List selectByExample(HtPatientAcpExample example); - - HtPatientAcp selectByPrimaryKey(Long id); - - int updateByExampleSelective(@Param("record") HtPatientAcp record, @Param("example") HtPatientAcpExample example); - - int updateByExample(@Param("record") HtPatientAcp record, @Param("example") HtPatientAcpExample example); - - int updateByPrimaryKeySelective(HtPatientAcp record); - - int updateByPrimaryKey(HtPatientAcp record); +package com.ccsens.ht.persist.mapper; + +import com.ccsens.ht.bean.po.HtPatientAcp; +import com.ccsens.ht.bean.po.HtPatientAcpExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface HtPatientAcpMapper { + long countByExample(HtPatientAcpExample example); + + int deleteByExample(HtPatientAcpExample example); + + int deleteByPrimaryKey(Long id); + + int insert(HtPatientAcp record); + + int insertSelective(HtPatientAcp record); + + List selectByExample(HtPatientAcpExample example); + + HtPatientAcp selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") HtPatientAcp record, @Param("example") HtPatientAcpExample example); + + int updateByExample(@Param("record") HtPatientAcp record, @Param("example") HtPatientAcpExample example); + + int updateByPrimaryKeySelective(HtPatientAcp record); + + int updateByPrimaryKey(HtPatientAcp record); } \ No newline at end of file diff --git a/ht/src/main/java/com/ccsens/ht/persist/mapper/HtPatientScoreMapper.java b/ht/src/main/java/com/ccsens/ht/persist/mapper/HtPatientScoreMapper.java index 9a1f1de5..b6bcedcb 100644 --- a/ht/src/main/java/com/ccsens/ht/persist/mapper/HtPatientScoreMapper.java +++ b/ht/src/main/java/com/ccsens/ht/persist/mapper/HtPatientScoreMapper.java @@ -1,30 +1,30 @@ -package com.ccsens.ht.persist.mapper; - -import com.ccsens.ht.bean.po.HtPatientScore; -import com.ccsens.ht.bean.po.HtPatientScoreExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface HtPatientScoreMapper { - long countByExample(HtPatientScoreExample example); - - int deleteByExample(HtPatientScoreExample example); - - int deleteByPrimaryKey(Long id); - - int insert(HtPatientScore record); - - int insertSelective(HtPatientScore record); - - List selectByExample(HtPatientScoreExample example); - - HtPatientScore selectByPrimaryKey(Long id); - - int updateByExampleSelective(@Param("record") HtPatientScore record, @Param("example") HtPatientScoreExample example); - - int updateByExample(@Param("record") HtPatientScore record, @Param("example") HtPatientScoreExample example); - - int updateByPrimaryKeySelective(HtPatientScore record); - - int updateByPrimaryKey(HtPatientScore record); +package com.ccsens.ht.persist.mapper; + +import com.ccsens.ht.bean.po.HtPatientScore; +import com.ccsens.ht.bean.po.HtPatientScoreExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface HtPatientScoreMapper { + long countByExample(HtPatientScoreExample example); + + int deleteByExample(HtPatientScoreExample example); + + int deleteByPrimaryKey(Long id); + + int insert(HtPatientScore record); + + int insertSelective(HtPatientScore record); + + List selectByExample(HtPatientScoreExample example); + + HtPatientScore selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") HtPatientScore record, @Param("example") HtPatientScoreExample example); + + int updateByExample(@Param("record") HtPatientScore record, @Param("example") HtPatientScoreExample example); + + int updateByPrimaryKeySelective(HtPatientScore record); + + int updateByPrimaryKey(HtPatientScore record); } \ No newline at end of file diff --git a/ht/src/main/java/com/ccsens/ht/persist/mapper/HtQuestionOptionMapper.java b/ht/src/main/java/com/ccsens/ht/persist/mapper/HtQuestionOptionMapper.java index 440c577d..60157bd2 100644 --- a/ht/src/main/java/com/ccsens/ht/persist/mapper/HtQuestionOptionMapper.java +++ b/ht/src/main/java/com/ccsens/ht/persist/mapper/HtQuestionOptionMapper.java @@ -1,30 +1,30 @@ -package com.ccsens.ht.persist.mapper; - -import com.ccsens.ht.bean.po.HtQuestionOption; -import com.ccsens.ht.bean.po.HtQuestionOptionExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface HtQuestionOptionMapper { - long countByExample(HtQuestionOptionExample example); - - int deleteByExample(HtQuestionOptionExample example); - - int deleteByPrimaryKey(Long id); - - int insert(HtQuestionOption record); - - int insertSelective(HtQuestionOption record); - - List selectByExample(HtQuestionOptionExample example); - - HtQuestionOption selectByPrimaryKey(Long id); - - int updateByExampleSelective(@Param("record") HtQuestionOption record, @Param("example") HtQuestionOptionExample example); - - int updateByExample(@Param("record") HtQuestionOption record, @Param("example") HtQuestionOptionExample example); - - int updateByPrimaryKeySelective(HtQuestionOption record); - - int updateByPrimaryKey(HtQuestionOption record); +package com.ccsens.ht.persist.mapper; + +import com.ccsens.ht.bean.po.HtQuestionOption; +import com.ccsens.ht.bean.po.HtQuestionOptionExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface HtQuestionOptionMapper { + long countByExample(HtQuestionOptionExample example); + + int deleteByExample(HtQuestionOptionExample example); + + int deleteByPrimaryKey(Long id); + + int insert(HtQuestionOption record); + + int insertSelective(HtQuestionOption record); + + List selectByExample(HtQuestionOptionExample example); + + HtQuestionOption selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") HtQuestionOption record, @Param("example") HtQuestionOptionExample example); + + int updateByExample(@Param("record") HtQuestionOption record, @Param("example") HtQuestionOptionExample example); + + int updateByPrimaryKeySelective(HtQuestionOption record); + + int updateByPrimaryKey(HtQuestionOption record); } \ No newline at end of file diff --git a/ht/src/main/java/com/ccsens/ht/service/IPatientReportService.java b/ht/src/main/java/com/ccsens/ht/service/IPatientReportService.java index 47bdc37c..56c022c1 100644 --- a/ht/src/main/java/com/ccsens/ht/service/IPatientReportService.java +++ b/ht/src/main/java/com/ccsens/ht/service/IPatientReportService.java @@ -1,7 +1,9 @@ package com.ccsens.ht.service; import com.ccsens.ht.bean.dto.PatientReportDto; +import com.ccsens.ht.bean.dto.PatientReportSearchDto; import com.ccsens.ht.bean.po.HtDoctor; +import com.ccsens.ht.bean.vo.PatientReportSearchVo; import com.ccsens.ht.bean.vo.PatientReportVo; import com.ccsens.util.CodeEnum; import com.ccsens.util.JsonResponse; @@ -142,4 +144,17 @@ public interface IPatientReportService { List queryReportAnswer(PatientReportDto.QueryReportAnswer param, Long userId); + /** + * 查询报告单的搜索条件 + * @param param 父code + * @return 搜索条件 + */ + List searchParam(PatientReportSearchDto.SearchParam param); + + /** + * 搜索报告单 + * @param param 搜索列表 + * @return 报告单 + */ + PageInfo search(PatientReportSearchDto.SearchList param); } diff --git a/ht/src/main/java/com/ccsens/ht/service/IQuestionService.java b/ht/src/main/java/com/ccsens/ht/service/IQuestionService.java index 87db829b..b77d58af 100644 --- a/ht/src/main/java/com/ccsens/ht/service/IQuestionService.java +++ b/ht/src/main/java/com/ccsens/ht/service/IQuestionService.java @@ -54,4 +54,11 @@ public interface IQuestionService { * @return 返回选项 */ List queryOptionJson(QuestionDto.QueryPatientCanvas param, Long userId); + + /** + * 删除画图轨迹 + * @param param 轨迹的id可以为多条 + * @param userId userId + */ + void delCanvas(QuestionDto.DelPatientCanvas param, Long userId); } diff --git a/ht/src/main/java/com/ccsens/ht/service/ImportService.java b/ht/src/main/java/com/ccsens/ht/service/ImportService.java index fde813ba..3097e9f9 100644 --- a/ht/src/main/java/com/ccsens/ht/service/ImportService.java +++ b/ht/src/main/java/com/ccsens/ht/service/ImportService.java @@ -362,7 +362,7 @@ public class ImportService implements IImportService { option.setQuestionId(questionId); option.setSort(sort); - option.setScore(option.getScore() == null ? Constant.Ht.NUMBER_DEFAULT : option.getScore()); + option.setScore(option.getScore() == null ? Constant.Ht.NUMBER_DEFAULT_BIGDECIMAL : option.getScore()); log.info("导入选项：{}", option); return option; diff --git a/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java b/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java index 0675ef8b..ba91682b 100644 --- a/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java +++ b/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java @@ -4,13 +4,17 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.IdcardUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.ccsens.ht.bean.dto.PatientReportDto; +import com.ccsens.ht.bean.dto.PatientReportSearchDto; import com.ccsens.ht.bean.po.*; +import com.ccsens.ht.bean.vo.PatientReportSearchVo; import com.ccsens.ht.bean.vo.PatientReportVo; import com.ccsens.ht.persist.dao.HtDoctorDao; import com.ccsens.ht.persist.dao.HtPatientReportDao; import com.ccsens.ht.persist.dao.HtPositionDao; +import com.ccsens.ht.persist.dao.HtReportDao; import com.ccsens.ht.persist.mapper.HtPatientFollowUpMapper; import com.ccsens.ht.persist.mapper.HtPatientMapper; import com.ccsens.ht.persist.mapper.HtPatientReportRecordMapper; @@ -21,7 +25,6 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.github.pagehelper.StringUtil; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -45,7 +48,7 @@ import java.util.concurrent.atomic.AtomicReference; @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) public class PatientReportService implements IPatientReportService { - @Autowired + @Resource private Snowflake snowflake; @Resource private HtDoctorDao htDoctorDao; @@ -59,6 +62,8 @@ public class PatientReportService implements IPatientReportService { private HtPatientReportRecordMapper htPatientReportRecordMapper; @Resource private HtPatientFollowUpMapper htPatientFollowUpMapper; + @Resource + private HtReportDao htReportDao; @Override public JsonResponse generatePatientReport(PatientReportDto.Generate generate, Long userId) { @@ -145,6 +150,7 @@ public class PatientReportService implements IPatientReportService { copy.setUrl(Constant.Ht.STRING_DEFAULT); copy.setQrCodeUrl(Constant.Ht.STRING_DEFAULT); copy.setCompleteStatus(Constant.Ht.Report.COMPLETE_OK); + copy.setShowStatus(Constant.Ht.Report.SHOW_HISTORY); htPatientReportDao.updateByPrimaryKeySelective(copy); log.info("成功编辑报告单信息"); HtPatientReportRecord record = new HtPatientReportRecord(); @@ -217,11 +223,16 @@ public class PatientReportService implements IPatientReportService { //查询报告单信息和病人信息 PatientReportVo.ReprotPatient reportPatient = htPatientReportDao.queryReportResult(queryDetail.getId()); //查询报告单分数 - List reportScore = htPatientReportDao.queryReportScore(queryDetail.getId()); + List reportScore = htPatientReportDao.queryReportScore(queryDetail.getId(),queryDetail.getRey()); //重新封装报告单信息 Map map = new HashMap<>(32); List scores = new ArrayList<>(); reportScore.forEach(score -> { + if(ObjectUtil.isNotNull(score.getScore())){ + if(BigDecimal.valueOf(score.getScore().intValue()).compareTo(score.getScore()) == 0){ + score.setScore(score.getScore().setScale(0,BigDecimal.ROUND_HALF_UP)); + } + } map.put(score.getCode(), score); //测评类（MOCA等） if (Constant.Ht.Report.TYPE_EVALUATION.equals(score.getType())) { @@ -231,6 +242,7 @@ public class PatientReportService implements IPatientReportService { } scores.add(score); } else { + log.info("score:{}", score); map.get(score.getParentCode()).addSub(score); } @@ -258,7 +270,10 @@ public class PatientReportService implements IPatientReportService { carer.setCode("carer"); carer.setName("照顾者"); carer.setTotalScore(-1); - carer.setScore(npiScore == null || npiScore.get("carer") == null ? null : ((BigDecimal) npiScore.get("carer")).intValue()); + carer.setScore(npiScore == null || npiScore.get("carer") == null ? null : ((BigDecimal)npiScore.get("carer"))); + if(ObjectUtil.isNotNull(carer.getScore())){ + carer.setScore(carer.getScore().setScale(0,BigDecimal.ROUND_HALF_UP)); + } carer.setType((byte)3); carer.setParentCode("NPI"); score.addSub(carer); @@ -266,7 +281,10 @@ public class PatientReportService implements IPatientReportService { patient.setCode("result"); patient.setName("患者"); patient.setTotalScore(-1); - patient.setScore(npiScore == null || npiScore.get("result") == null ? null : ((BigDecimal) npiScore.get("result")).intValue()); + patient.setScore(npiScore == null || npiScore.get("result") == null ? null : ((BigDecimal) npiScore.get("result"))); + if(ObjectUtil.isNotNull(patient.getScore())){ + patient.setScore(patient.getScore().setScale(0,BigDecimal.ROUND_HALF_UP)); + } patient.setType((byte)3); patient.setParentCode("NPI"); score.addSub(patient); @@ -318,23 +336,25 @@ public class PatientReportService implements IPatientReportService { *@Author: wuHuiJuan *@date: 2019/11/19 15:42 */ - private Integer sumScore(PatientReportVo.ReportScore score){ - AtomicReference sum = new AtomicReference<>(score.getScore() == null ? 0 : score.getScore()); + private BigDecimal sumScore(PatientReportVo.ReportScore score){ + AtomicReference sum = new AtomicReference<>(score.getScore() == null ? BigDecimal.valueOf(0) : score.getScore()); AtomicBoolean hasAdd = new AtomicBoolean(false); if (!CollectionUtils.isEmpty(score.getSubReport())) { score.getSubReport().forEach(sub -> { sum.updateAndGet(v -> { - Integer sumScore = sumScore(sub); + BigDecimal sumScore = sumScore(sub); if (sumScore== null) { return v; } hasAdd.set(true); - return v += sumScore; +// return v += sumScore; + v = v.add(sumScore); + return v; }); }); } else { if (StringUtil.isNotEmpty(score.getRemark()) && score.getRemark().matches(Constant.Ht.Report.IGNORE_SCORE)) { - return score.getScore() == null ? null : 0; + return score.getScore() == null ? null : BigDecimal.valueOf(0); } if (Constant.Ht.Report.MOCA_SJZ.equals(score.getCode())) { return null; @@ -352,6 +372,8 @@ public class PatientReportService implements IPatientReportService { @Override public String exportReport(PatientReportDto.QueryDetail queryDetail, Long userId) { log.info("导出报告单：{}， 操作用户：{}", queryDetail, userId); + // TODO 暂时不导出rey试题，将传入参数改为1 + queryDetail.setRey(1); //查看是否已生成对应文件路径 HtPatientReport report = htPatientReportDao.selectByPrimaryKey(queryDetail.getId()); if (report == null) { @@ -560,5 +582,33 @@ public class PatientReportService implements IPatientReportService { return htPatientReportDao.queryReportAnswer(param.getId(),param.getEvaluationCode()); } + @Override + public List searchParam(PatientReportSearchDto.SearchParam param) { + List list = htReportDao.queryParam(param.getParentCode()); + if (CollectionUtil.isEmpty(list)) { + return list; + } + Map map = new HashMap<>(); + List nodes = new ArrayList<>(); + list.forEach(searchParam -> { + if (param.getParentCode().equals(searchParam.getParentCode())) { + nodes.add(searchParam); + } else { + PatientReportSearchVo.SearchParam parent = map.get(searchParam.getParentCode()); + parent.getChildren().add(searchParam); + } + map.put(searchParam.getCode(), searchParam); + }); + return nodes; + } + + @Override + public PageInfo search(PatientReportSearchDto.SearchList param) { + + PageHelper.startPage(param.getPageNum(), param.getPageSize()); + List list = htPatientReportDao.search(param.getCodes()); + return new PageInfo<>(list); + } + } diff --git a/ht/src/main/java/com/ccsens/ht/service/QuestionService.java b/ht/src/main/java/com/ccsens/ht/service/QuestionService.java index 6f1f125e..776861d5 100644 --- a/ht/src/main/java/com/ccsens/ht/service/QuestionService.java +++ b/ht/src/main/java/com/ccsens/ht/service/QuestionService.java @@ -29,6 +29,7 @@ import javax.script.ScriptEngineManager; import javax.script.ScriptException; import java.io.IOException; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; @@ -243,6 +244,12 @@ public class QuestionService implements IQuestionService { for(QuestionDto.Option option : score.getOptions()) { HtQuestionOption questionOption = htQuestionOptionDao.selectByPrimaryKey(option.getId()); + //去除整数后多余的小数点 + if(ObjectUtil.isNotNull(questionOption.getScore())){ + if(BigDecimal.valueOf(questionOption.getScore().intValue()).compareTo(questionOption.getScore()) == 0){ + questionOption.setScore(questionOption.getScore().setScale(0,BigDecimal.ROUND_HALF_UP)); + } + } //未找到对应选项 或选项不是该试题的选项 if (questionOption == null || questionOption.getQuestionId().longValue() != question.getId()) { log.info("选项不存在或不是对应试题的选项"); @@ -273,7 +280,7 @@ public class QuestionService implements IQuestionService { //保存现在的答案 if (CollectionUtil.isEmpty(scores)) { // 选项为空，默认0分 - HtPatientScore zeroScore = getHtPatientScore(score, parentCode, report, 0); + HtPatientScore zeroScore = getHtPatientScore(score, parentCode, report, BigDecimal.valueOf(0)); scores.add(zeroScore); } htPatientScoreDao.insertBatch(scores); @@ -285,7 +292,7 @@ public class QuestionService implements IQuestionService { return CodeEnum.SUCCESS; } - private HtPatientScore getHtPatientScore(QuestionDto.Score score, String parentCode, HtPatientReport report, int i) { + private HtPatientScore getHtPatientScore(QuestionDto.Score score, String parentCode, HtPatientReport report, BigDecimal i) { HtPatientScore zeroScore = new HtPatientScore(); zeroScore.setId(snowflake.nextId()); zeroScore.setPatientReportId(score.getPatientReportId()); @@ -363,7 +370,7 @@ public class QuestionService implements IQuestionService { patientScore.set(next.getIntValue(Constant.Ht.Rule.SMALL_SCORE)); } } - HtPatientScore singleScore = getHtPatientScore(score, parentCode, report, patientScore.get()); + HtPatientScore singleScore = getHtPatientScore(score, parentCode, report, BigDecimal.valueOf(patientScore.get())); scores.add(singleScore); } @@ -378,7 +385,7 @@ public class QuestionService implements IQuestionService { return 0; } // 分数>0， 算1道题 - return scores.stream().mapToInt(score -> score.getScore() > 0 ? 1 : 0).sum(); + return scores.stream().mapToInt(score -> score.getScore().compareTo(BigDecimal.valueOf(0)) > 0 ? 1 : 0).sum(); } private void optionUniq(QuestionDto.Score score) { @@ -469,7 +476,7 @@ public class QuestionService implements IQuestionService { ScriptEngineManager manager = new ScriptEngineManager(); ScriptEngine js = manager.getEngineByName("js"); try { - Integer result = (Integer)js.eval(substring); + BigDecimal result = BigDecimal.valueOf((Integer)js.eval(substring)); patientScore.setScore(result); } catch (ScriptException e) { log.error("计算出现异常",e); @@ -637,7 +644,7 @@ public class QuestionService implements IQuestionService { //共几分钟 double d = (double) endTime / 1000 / 60; //每分钟几笔 - parameter.setAveTimes((int) Math.floor(canvasPoints.size() / d)); + parameter.setAveTimes((int) Math.round(canvasPoints.size() / d)); //每笔数据 List lineParameterList = new ArrayList<>(); long intervalDuration = 0; @@ -645,6 +652,18 @@ public class QuestionService implements IQuestionService { double longLine = 0; //最短的笔画 double shortLine = 0; + //思考总时间 每笔间隔相加 + long reflectOnTime = 0; + //X最小值 + int minX = 0; + //X最大值 + int maxX = 0; + //Y最小值 + int minY = 0; + //Y最大值 + int maxY = 0; + //总长度 + double totalLength = 0; for(QuestionVo.Point canvas : canvasPoints){ //时间 QuestionVo.LineParameter lineParameter = new QuestionVo.LineParameter(); @@ -652,6 +671,14 @@ public class QuestionService implements IQuestionService { if(a.length <= 0){ continue; } + //获取最边缘的四个点 + for (String value : a) { + String[] split1 = value.split(","); + minX = Math.min(Integer.parseInt(split1[0]), minX); + maxX = Math.max(Integer.parseInt(split1[0]), maxX); + minY = Math.min(Integer.parseInt(split1[1]), minY); + maxY = Math.max(Integer.parseInt(split1[1]), maxY); + } String[] s = a[0].split(","); if(s.length <= 0){ continue; @@ -664,6 +691,8 @@ public class QuestionService implements IQuestionService { lineParameter.setDuration(duration); //长度 double length = getLengthByCanvas(a); + //计算总长度 + totalLength += length; lineParameter.setLength(length); //计算最长最短 if(longLine == 0){ @@ -679,27 +708,69 @@ public class QuestionService implements IQuestionService { //速度 double speed = 0; if(length != 0 && duration != 0){ - speed = BigDecimal.valueOf(length / duration).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + speed = BigDecimal.valueOf(length / duration).setScale(2, RoundingMode.HALF_UP).doubleValue(); } lineParameter.setSpeed(speed); - //和上一笔的间隔 + //和上一笔的间隔 & 思考总时长 if(Long.parseLong(e[e.length - 1]) == 0){ lineParameter.setIntervalDuration(htPatientCanvas.getBeginTime() - htPatientCanvas.getOpenCanvasTime()); + reflectOnTime += htPatientCanvas.getBeginTime() - htPatientCanvas.getOpenCanvasTime(); }else { intervalDuration = Long.parseLong(e[e.length - 1]) - intervalDuration; lineParameter.setIntervalDuration(intervalDuration); + reflectOnTime += intervalDuration; } lineParameterList.add(lineParameter); + } parameter.setLineParameterList(lineParameterList); //最长笔画 parameter.setLongLine(longLine); //最短笔画 parameter.setShortLine(shortLine); + //思考总时长 + parameter.setReflectOnTime(reflectOnTime); + //计算中心 + int x = minX + ((maxX - minX) / 2); + int y = minY + ((maxY - minY) / 2); + String centreCoordinate = x + "," + y; + parameter.setCentreCoordinate(centreCoordinate); + //面积 + double acreage = (maxX - minX) * (maxY - minY); + parameter.setAcreage(acreage); + //平均长度 + double aveLength = BigDecimal.valueOf(totalLength / canvasPoints.size()).setScale(2, RoundingMode.HALF_UP).doubleValue(); + parameter.setAveLength(aveLength); + //短笔画数量 + double coefficient = 1.00; + int shortNums = getShortNums(aveLength,coefficient,lineParameterList); + parameter.setShortNums(shortNums); + //长笔画数量，等于总笔画减去短笔画的数量 + parameter.setLongNums(lineParameterList.size() - shortNums); //TODO 笔画中间值 return parameter; } + /** + * 获取短笔画的数量 + * @param aveLength 平均长度 + * @param coefficient 自定义系数 + * @param lineParameterList 所有笔画的参数 + * @return 返回短笔画的数量 + */ + private int getShortNums(double aveLength, double coefficient, List lineParameterList) { + int shortNums = 0; + double a = aveLength * coefficient; + if(CollectionUtil.isNotEmpty(lineParameterList)){ + for(QuestionVo.LineParameter lineParameter : lineParameterList){ + if(lineParameter.getLength() <= a){ + shortNums++; + } + } + } + return shortNums; + } + private double getLengthByCanvas(String[] canvas) { double l = 0; for (int i = 1; i < canvas.length; i++){ @@ -710,6 +781,19 @@ public class QuestionService implements IQuestionService { double sqrt = Math.sqrt(pow + pow1); l += sqrt; } - return BigDecimal.valueOf(l).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + return BigDecimal.valueOf(l).setScale(2, RoundingMode.HALF_UP).doubleValue(); + } + + + @Override + public void delCanvas(QuestionDto.DelPatientCanvas param, Long userId) { + if(CollectionUtil.isNotEmpty(param.getPointId())){ + param.getPointId().forEach(pointId ->{ + HtPatientCanvasLine patientCanvasLine = new HtPatientCanvasLine(); + patientCanvasLine.setId(pointId); + patientCanvasLine.setIsDel((byte) 2); + patientCanvasLineMapper.updateByPrimaryKeySelective(patientCanvasLine); + }); + } } } diff --git a/ht/src/main/java/com/ccsens/ht/uitl/Constant.java b/ht/src/main/java/com/ccsens/ht/uitl/Constant.java index c40bc7f2..93199c3a 100644 --- a/ht/src/main/java/com/ccsens/ht/uitl/Constant.java +++ b/ht/src/main/java/com/ccsens/ht/uitl/Constant.java @@ -2,6 +2,7 @@ package com.ccsens.ht.uitl; import com.ccsens.util.PropUtil; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -49,6 +50,8 @@ public class Constant { public static class Ht { /**数字默认值*/ public final static byte NUMBER_DEFAULT = 0; + /**数字默认值*/ + public final static BigDecimal NUMBER_DEFAULT_BIGDECIMAL = BigDecimal.valueOf(0); /**字符串默认值*/ public final static String STRING_DEFAULT = ""; public final static String DOCTOR_PARAM = "doctor"; @@ -117,6 +120,7 @@ public class Constant { QUESTION_TYPE.add("MMSE"); QUESTION_TYPE.add("MoCA"); QUESTION_TYPE.add("Rey"); + QUESTION_TYPE.add("XFXPD"); } } @@ -130,6 +134,7 @@ public class Constant { public final static String MMSE = "MMSE"; public final static String NPI = "NPI"; public final static String REY = "Rey"; + public final static String XFXPD = "XFXPD"; /**报告单未完成*/ public final static Byte COMPLETE_NO = 0; /**报告单已完成*/ diff --git a/ht/src/main/resources/application-dev.yml b/ht/src/main/resources/application-dev.yml index d43d9469..72c0e153 100644 --- a/ht/src/main/resources/application-dev.yml +++ b/ht/src/main/resources/application-dev.yml @@ -8,7 +8,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource rabbitmq: - host: api.ccsens.com + host: 127.0.0.1 password: 111111 port: 5672 username: admin diff --git a/ht/src/main/resources/application.yml b/ht/src/main/resources/application.yml index d082c0ea..5c2cd5c4 100644 --- a/ht/src/main/resources/application.yml +++ b/ht/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: prod - include: common, util-prod \ No newline at end of file + active: dev + include: common, util-dev \ No newline at end of file diff --git a/ht/src/main/resources/mapper_dao/HtPatientCanvasDao.xml b/ht/src/main/resources/mapper_dao/HtPatientCanvasDao.xml index a67948e0..2604b099 100644 --- a/ht/src/main/resources/mapper_dao/HtPatientCanvasDao.xml +++ b/ht/src/main/resources/mapper_dao/HtPatientCanvasDao.xml @@ -5,6 +5,7 @@ select t1.code,t1.name, t1.description, t1.total_score, t1.remark,t1.type,t1.parent_code, sum(t2.score) as score from - (select code,name, description, total_score, remark, type, parent_code, sort from t_ht_report where is_show = 1 and is_del = 0) t1 + (select code,name, description, total_score, remark, type, parent_code, sort from t_ht_report + where is_show = 1 and is_del = 0 + + and `code` != 'Rey' and `code` != 'XFXPD' and parent_code != 'Rey' + + + AND (`code` = 'Rey' or parent_code = 'Rey') + + ) t1 left join t_ht_patient_score t2 on t1.code = t2.question_parent_code and ( @@ -216,6 +224,38 @@ and a.questionId = t.question_id ORDER BY a.questionId ,a.sort + \ No newline at end of file diff --git a/ht/src/main/resources/mapper_dao/HtReportDao.xml b/ht/src/main/resources/mapper_dao/HtReportDao.xml index 6f67f6a3..5fb147b6 100644 --- a/ht/src/main/resources/mapper_dao/HtReportDao.xml +++ b/ht/src/main/resources/mapper_dao/HtReportDao.xml @@ -35,5 +35,36 @@ + \ No newline at end of file diff --git a/ht/src/main/resources/mapper_raw/HtPatientAcpMapper.xml b/ht/src/main/resources/mapper_raw/HtPatientAcpMapper.xml index b7a93044..09a6e282 100644 --- a/ht/src/main/resources/mapper_raw/HtPatientAcpMapper.xml +++ b/ht/src/main/resources/mapper_raw/HtPatientAcpMapper.xml @@ -1,368 +1,398 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, patient_id, ct, mri, hcy, vb12, folic_acid, tt3, tt4, tsh, remark, create_time, - update_time, is_del, recorder - - - - - delete from t_ht_patient_acp - where id = #{id,jdbcType=BIGINT} - - - delete from t_ht_patient_acp - - - - - - insert into t_ht_patient_acp (id, patient_id, ct, - mri, hcy, vb12, folic_acid, - tt3, tt4, tsh, remark, - create_time, update_time, is_del, - recorder) - values (#{id,jdbcType=BIGINT}, #{patientId,jdbcType=BIGINT}, #{ct,jdbcType=VARCHAR}, - #{mri,jdbcType=VARCHAR}, #{hcy,jdbcType=VARCHAR}, #{vb12,jdbcType=VARCHAR}, #{folicAcid,jdbcType=VARCHAR}, - #{tt3,jdbcType=VARCHAR}, #{tt4,jdbcType=VARCHAR}, #{tsh,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT}, - #{recorder,jdbcType=BIGINT}) - - - insert into t_ht_patient_acp - - - id, - - - patient_id, - - - ct, - - - mri, - - - hcy, - - - vb12, - - - folic_acid, - - - tt3, - - - tt4, - - - tsh, - - - remark, - - - create_time, - - - update_time, - - - is_del, - - - recorder, - - - - - #{id,jdbcType=BIGINT}, - - - #{patientId,jdbcType=BIGINT}, - - - #{ct,jdbcType=VARCHAR}, - - - #{mri,jdbcType=VARCHAR}, - - - #{hcy,jdbcType=VARCHAR}, - - - #{vb12,jdbcType=VARCHAR}, - - - #{folicAcid,jdbcType=VARCHAR}, - - - #{tt3,jdbcType=VARCHAR}, - - - #{tt4,jdbcType=VARCHAR}, - - - #{tsh,jdbcType=VARCHAR}, - - - #{remark,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - #{isDel,jdbcType=TINYINT}, - - - #{recorder,jdbcType=BIGINT}, - - - - - - update t_ht_patient_acp - - - id = #{record.id,jdbcType=BIGINT}, - - - patient_id = #{record.patientId,jdbcType=BIGINT}, - - - ct = #{record.ct,jdbcType=VARCHAR}, - - - mri = #{record.mri,jdbcType=VARCHAR}, - - - hcy = #{record.hcy,jdbcType=VARCHAR}, - - - vb12 = #{record.vb12,jdbcType=VARCHAR}, - - - folic_acid = #{record.folicAcid,jdbcType=VARCHAR}, - - - tt3 = #{record.tt3,jdbcType=VARCHAR}, - - - tt4 = #{record.tt4,jdbcType=VARCHAR}, - - - tsh = #{record.tsh,jdbcType=VARCHAR}, - - - remark = #{record.remark,jdbcType=VARCHAR}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - - - is_del = #{record.isDel,jdbcType=TINYINT}, - - - recorder = #{record.recorder,jdbcType=BIGINT}, - - - - - - - - update t_ht_patient_acp - set id = #{record.id,jdbcType=BIGINT}, - patient_id = #{record.patientId,jdbcType=BIGINT}, - ct = #{record.ct,jdbcType=VARCHAR}, - mri = #{record.mri,jdbcType=VARCHAR}, - hcy = #{record.hcy,jdbcType=VARCHAR}, - vb12 = #{record.vb12,jdbcType=VARCHAR}, - folic_acid = #{record.folicAcid,jdbcType=VARCHAR}, - tt3 = #{record.tt3,jdbcType=VARCHAR}, - tt4 = #{record.tt4,jdbcType=VARCHAR}, - tsh = #{record.tsh,jdbcType=VARCHAR}, - remark = #{record.remark,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - is_del = #{record.isDel,jdbcType=TINYINT}, - recorder = #{record.recorder,jdbcType=BIGINT} - - - - - - update t_ht_patient_acp - - - patient_id = #{patientId,jdbcType=BIGINT}, - - - ct = #{ct,jdbcType=VARCHAR}, - - - mri = #{mri,jdbcType=VARCHAR}, - - - hcy = #{hcy,jdbcType=VARCHAR}, - - - vb12 = #{vb12,jdbcType=VARCHAR}, - - - folic_acid = #{folicAcid,jdbcType=VARCHAR}, - - - tt3 = #{tt3,jdbcType=VARCHAR}, - - - tt4 = #{tt4,jdbcType=VARCHAR}, - - - tsh = #{tsh,jdbcType=VARCHAR}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - is_del = #{isDel,jdbcType=TINYINT}, - - - recorder = #{recorder,jdbcType=BIGINT}, - - - where id = #{id,jdbcType=BIGINT} - - - update t_ht_patient_acp - set patient_id = #{patientId,jdbcType=BIGINT}, - ct = #{ct,jdbcType=VARCHAR}, - mri = #{mri,jdbcType=VARCHAR}, - hcy = #{hcy,jdbcType=VARCHAR}, - vb12 = #{vb12,jdbcType=VARCHAR}, - folic_acid = #{folicAcid,jdbcType=VARCHAR}, - tt3 = #{tt3,jdbcType=VARCHAR}, - tt4 = #{tt4,jdbcType=VARCHAR}, - tsh = #{tsh,jdbcType=VARCHAR}, - remark = #{remark,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP}, - is_del = #{isDel,jdbcType=TINYINT}, - recorder = #{recorder,jdbcType=BIGINT} - where id = #{id,jdbcType=BIGINT} - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, patient_id, ct, mri, hcy, vb12, folic_acid, tt3, tt4, tsh, remark, create_time, + update_time, is_del, recorder, ta1, tpt + + + + + delete from t_ht_patient_acp + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_patient_acp + + + + + + insert into t_ht_patient_acp (id, patient_id, ct, + mri, hcy, vb12, folic_acid, + tt3, tt4, tsh, remark, + create_time, update_time, is_del, + recorder, ta1, tpt) + values (#{id,jdbcType=BIGINT}, #{patientId,jdbcType=BIGINT}, #{ct,jdbcType=VARCHAR}, + #{mri,jdbcType=VARCHAR}, #{hcy,jdbcType=VARCHAR}, #{vb12,jdbcType=VARCHAR}, #{folicAcid,jdbcType=VARCHAR}, + #{tt3,jdbcType=VARCHAR}, #{tt4,jdbcType=VARCHAR}, #{tsh,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT}, + #{recorder,jdbcType=BIGINT}, #{ta1,jdbcType=VARCHAR}, #{tpt,jdbcType=VARCHAR}) + + + insert into t_ht_patient_acp + + + id, + + + patient_id, + + + ct, + + + mri, + + + hcy, + + + vb12, + + + folic_acid, + + + tt3, + + + tt4, + + + tsh, + + + remark, + + + create_time, + + + update_time, + + + is_del, + + + recorder, + + + ta1, + + + tpt, + + + + + #{id,jdbcType=BIGINT}, + + + #{patientId,jdbcType=BIGINT}, + + + #{ct,jdbcType=VARCHAR}, + + + #{mri,jdbcType=VARCHAR}, + + + #{hcy,jdbcType=VARCHAR}, + + + #{vb12,jdbcType=VARCHAR}, + + + #{folicAcid,jdbcType=VARCHAR}, + + + #{tt3,jdbcType=VARCHAR}, + + + #{tt4,jdbcType=VARCHAR}, + + + #{tsh,jdbcType=VARCHAR}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + #{recorder,jdbcType=BIGINT}, + + + #{ta1,jdbcType=VARCHAR}, + + + #{tpt,jdbcType=VARCHAR}, + + + + + + update t_ht_patient_acp + + + id = #{record.id,jdbcType=BIGINT}, + + + patient_id = #{record.patientId,jdbcType=BIGINT}, + + + ct = #{record.ct,jdbcType=VARCHAR}, + + + mri = #{record.mri,jdbcType=VARCHAR}, + + + hcy = #{record.hcy,jdbcType=VARCHAR}, + + + vb12 = #{record.vb12,jdbcType=VARCHAR}, + + + folic_acid = #{record.folicAcid,jdbcType=VARCHAR}, + + + tt3 = #{record.tt3,jdbcType=VARCHAR}, + + + tt4 = #{record.tt4,jdbcType=VARCHAR}, + + + tsh = #{record.tsh,jdbcType=VARCHAR}, + + + remark = #{record.remark,jdbcType=VARCHAR}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + + + is_del = #{record.isDel,jdbcType=TINYINT}, + + + recorder = #{record.recorder,jdbcType=BIGINT}, + + + ta1 = #{record.ta1,jdbcType=VARCHAR}, + + + tpt = #{record.tpt,jdbcType=VARCHAR}, + + + + + + + + update t_ht_patient_acp + set id = #{record.id,jdbcType=BIGINT}, + patient_id = #{record.patientId,jdbcType=BIGINT}, + ct = #{record.ct,jdbcType=VARCHAR}, + mri = #{record.mri,jdbcType=VARCHAR}, + hcy = #{record.hcy,jdbcType=VARCHAR}, + vb12 = #{record.vb12,jdbcType=VARCHAR}, + folic_acid = #{record.folicAcid,jdbcType=VARCHAR}, + tt3 = #{record.tt3,jdbcType=VARCHAR}, + tt4 = #{record.tt4,jdbcType=VARCHAR}, + tsh = #{record.tsh,jdbcType=VARCHAR}, + remark = #{record.remark,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + is_del = #{record.isDel,jdbcType=TINYINT}, + recorder = #{record.recorder,jdbcType=BIGINT}, + ta1 = #{record.ta1,jdbcType=VARCHAR}, + tpt = #{record.tpt,jdbcType=VARCHAR} + + + + + + update t_ht_patient_acp + + + patient_id = #{patientId,jdbcType=BIGINT}, + + + ct = #{ct,jdbcType=VARCHAR}, + + + mri = #{mri,jdbcType=VARCHAR}, + + + hcy = #{hcy,jdbcType=VARCHAR}, + + + vb12 = #{vb12,jdbcType=VARCHAR}, + + + folic_acid = #{folicAcid,jdbcType=VARCHAR}, + + + tt3 = #{tt3,jdbcType=VARCHAR}, + + + tt4 = #{tt4,jdbcType=VARCHAR}, + + + tsh = #{tsh,jdbcType=VARCHAR}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + is_del = #{isDel,jdbcType=TINYINT}, + + + recorder = #{recorder,jdbcType=BIGINT}, + + + ta1 = #{ta1,jdbcType=VARCHAR}, + + + tpt = #{tpt,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_ht_patient_acp + set patient_id = #{patientId,jdbcType=BIGINT}, + ct = #{ct,jdbcType=VARCHAR}, + mri = #{mri,jdbcType=VARCHAR}, + hcy = #{hcy,jdbcType=VARCHAR}, + vb12 = #{vb12,jdbcType=VARCHAR}, + folic_acid = #{folicAcid,jdbcType=VARCHAR}, + tt3 = #{tt3,jdbcType=VARCHAR}, + tt4 = #{tt4,jdbcType=VARCHAR}, + tsh = #{tsh,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_time = #{updateTime,jdbcType=TIMESTAMP}, + is_del = #{isDel,jdbcType=TINYINT}, + recorder = #{recorder,jdbcType=BIGINT}, + ta1 = #{ta1,jdbcType=VARCHAR}, + tpt = #{tpt,jdbcType=VARCHAR} + where id = #{id,jdbcType=BIGINT} + \ No newline at end of file diff --git a/ht/src/main/resources/mapper_raw/HtPatientScoreMapper.xml b/ht/src/main/resources/mapper_raw/HtPatientScoreMapper.xml index 961b1e71..dc4a1b60 100644 --- a/ht/src/main/resources/mapper_raw/HtPatientScoreMapper.xml +++ b/ht/src/main/resources/mapper_raw/HtPatientScoreMapper.xml @@ -1,370 +1,370 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, patient_report_id, patient_id, question_parent_code, question_id, option_id, - option_name, score, type, answer, remark, create_time, update_time, is_del, answer_time - - - - - delete from t_ht_patient_score - where id = #{id,jdbcType=BIGINT} - - - delete from t_ht_patient_score - - - - - - insert into t_ht_patient_score (id, patient_report_id, patient_id, - question_parent_code, question_id, option_id, - option_name, score, type, - answer, remark, create_time, - update_time, is_del, answer_time - ) - values (#{id,jdbcType=BIGINT}, #{patientReportId,jdbcType=BIGINT}, #{patientId,jdbcType=BIGINT}, - #{questionParentCode,jdbcType=VARCHAR}, #{questionId,jdbcType=BIGINT}, #{optionId,jdbcType=BIGINT}, - #{optionName,jdbcType=VARCHAR}, #{score,jdbcType=INTEGER}, #{type,jdbcType=TINYINT}, - #{answer,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT}, #{answerTime,jdbcType=BIGINT} - ) - - - insert into t_ht_patient_score - - - id, - - - patient_report_id, - - - patient_id, - - - question_parent_code, - - - question_id, - - - option_id, - - - option_name, - - - score, - - - type, - - - answer, - - - remark, - - - create_time, - - - update_time, - - - is_del, - - - answer_time, - - - - - #{id,jdbcType=BIGINT}, - - - #{patientReportId,jdbcType=BIGINT}, - - - #{patientId,jdbcType=BIGINT}, - - - #{questionParentCode,jdbcType=VARCHAR}, - - - #{questionId,jdbcType=BIGINT}, - - - #{optionId,jdbcType=BIGINT}, - - - #{optionName,jdbcType=VARCHAR}, - - - #{score,jdbcType=INTEGER}, - - - #{type,jdbcType=TINYINT}, - - - #{answer,jdbcType=VARCHAR}, - - - #{remark,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - #{isDel,jdbcType=TINYINT}, - - - #{answerTime,jdbcType=BIGINT}, - - - - - - update t_ht_patient_score - - - id = #{record.id,jdbcType=BIGINT}, - - - patient_report_id = #{record.patientReportId,jdbcType=BIGINT}, - - - patient_id = #{record.patientId,jdbcType=BIGINT}, - - - question_parent_code = #{record.questionParentCode,jdbcType=VARCHAR}, - - - question_id = #{record.questionId,jdbcType=BIGINT}, - - - option_id = #{record.optionId,jdbcType=BIGINT}, - - - option_name = #{record.optionName,jdbcType=VARCHAR}, - - - score = #{record.score,jdbcType=INTEGER}, - - - type = #{record.type,jdbcType=TINYINT}, - - - answer = #{record.answer,jdbcType=VARCHAR}, - - - remark = #{record.remark,jdbcType=VARCHAR}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - - - is_del = #{record.isDel,jdbcType=TINYINT}, - - - answer_time = #{record.answerTime,jdbcType=BIGINT}, - - - - - - - - update t_ht_patient_score - set id = #{record.id,jdbcType=BIGINT}, - patient_report_id = #{record.patientReportId,jdbcType=BIGINT}, - patient_id = #{record.patientId,jdbcType=BIGINT}, - question_parent_code = #{record.questionParentCode,jdbcType=VARCHAR}, - question_id = #{record.questionId,jdbcType=BIGINT}, - option_id = #{record.optionId,jdbcType=BIGINT}, - option_name = #{record.optionName,jdbcType=VARCHAR}, - score = #{record.score,jdbcType=INTEGER}, - type = #{record.type,jdbcType=TINYINT}, - answer = #{record.answer,jdbcType=VARCHAR}, - remark = #{record.remark,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - is_del = #{record.isDel,jdbcType=TINYINT}, - answer_time = #{record.answerTime,jdbcType=BIGINT} - - - - - - update t_ht_patient_score - - - patient_report_id = #{patientReportId,jdbcType=BIGINT}, - - - patient_id = #{patientId,jdbcType=BIGINT}, - - - question_parent_code = #{questionParentCode,jdbcType=VARCHAR}, - - - question_id = #{questionId,jdbcType=BIGINT}, - - - option_id = #{optionId,jdbcType=BIGINT}, - - - option_name = #{optionName,jdbcType=VARCHAR}, - - - score = #{score,jdbcType=INTEGER}, - - - type = #{type,jdbcType=TINYINT}, - - - answer = #{answer,jdbcType=VARCHAR}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - is_del = #{isDel,jdbcType=TINYINT}, - - - answer_time = #{answerTime,jdbcType=BIGINT}, - - - where id = #{id,jdbcType=BIGINT} - - - update t_ht_patient_score - set patient_report_id = #{patientReportId,jdbcType=BIGINT}, - patient_id = #{patientId,jdbcType=BIGINT}, - question_parent_code = #{questionParentCode,jdbcType=VARCHAR}, - question_id = #{questionId,jdbcType=BIGINT}, - option_id = #{optionId,jdbcType=BIGINT}, - option_name = #{optionName,jdbcType=VARCHAR}, - score = #{score,jdbcType=INTEGER}, - type = #{type,jdbcType=TINYINT}, - answer = #{answer,jdbcType=VARCHAR}, - remark = #{remark,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP}, - is_del = #{isDel,jdbcType=TINYINT}, - answer_time = #{answerTime,jdbcType=BIGINT} - where id = #{id,jdbcType=BIGINT} - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, patient_report_id, patient_id, question_parent_code, question_id, option_id, + option_name, score, type, answer, remark, create_time, update_time, is_del, answer_time + + + + + delete from t_ht_patient_score + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_patient_score + + + + + + insert into t_ht_patient_score (id, patient_report_id, patient_id, + question_parent_code, question_id, option_id, + option_name, score, type, + answer, remark, create_time, + update_time, is_del, answer_time + ) + values (#{id,jdbcType=BIGINT}, #{patientReportId,jdbcType=BIGINT}, #{patientId,jdbcType=BIGINT}, + #{questionParentCode,jdbcType=VARCHAR}, #{questionId,jdbcType=BIGINT}, #{optionId,jdbcType=BIGINT}, + #{optionName,jdbcType=VARCHAR}, #{score,jdbcType=DECIMAL}, #{type,jdbcType=TINYINT}, + #{answer,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT}, #{answerTime,jdbcType=BIGINT} + ) + + + insert into t_ht_patient_score + + + id, + + + patient_report_id, + + + patient_id, + + + question_parent_code, + + + question_id, + + + option_id, + + + option_name, + + + score, + + + type, + + + answer, + + + remark, + + + create_time, + + + update_time, + + + is_del, + + + answer_time, + + + + + #{id,jdbcType=BIGINT}, + + + #{patientReportId,jdbcType=BIGINT}, + + + #{patientId,jdbcType=BIGINT}, + + + #{questionParentCode,jdbcType=VARCHAR}, + + + #{questionId,jdbcType=BIGINT}, + + + #{optionId,jdbcType=BIGINT}, + + + #{optionName,jdbcType=VARCHAR}, + + + #{score,jdbcType=DECIMAL}, + + + #{type,jdbcType=TINYINT}, + + + #{answer,jdbcType=VARCHAR}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + #{answerTime,jdbcType=BIGINT}, + + + + + + update t_ht_patient_score + + + id = #{record.id,jdbcType=BIGINT}, + + + patient_report_id = #{record.patientReportId,jdbcType=BIGINT}, + + + patient_id = #{record.patientId,jdbcType=BIGINT}, + + + question_parent_code = #{record.questionParentCode,jdbcType=VARCHAR}, + + + question_id = #{record.questionId,jdbcType=BIGINT}, + + + option_id = #{record.optionId,jdbcType=BIGINT}, + + + option_name = #{record.optionName,jdbcType=VARCHAR}, + + + score = #{record.score,jdbcType=DECIMAL}, + + + type = #{record.type,jdbcType=TINYINT}, + + + answer = #{record.answer,jdbcType=VARCHAR}, + + + remark = #{record.remark,jdbcType=VARCHAR}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + + + is_del = #{record.isDel,jdbcType=TINYINT}, + + + answer_time = #{record.answerTime,jdbcType=BIGINT}, + + + + + + + + update t_ht_patient_score + set id = #{record.id,jdbcType=BIGINT}, + patient_report_id = #{record.patientReportId,jdbcType=BIGINT}, + patient_id = #{record.patientId,jdbcType=BIGINT}, + question_parent_code = #{record.questionParentCode,jdbcType=VARCHAR}, + question_id = #{record.questionId,jdbcType=BIGINT}, + option_id = #{record.optionId,jdbcType=BIGINT}, + option_name = #{record.optionName,jdbcType=VARCHAR}, + score = #{record.score,jdbcType=DECIMAL}, + type = #{record.type,jdbcType=TINYINT}, + answer = #{record.answer,jdbcType=VARCHAR}, + remark = #{record.remark,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + is_del = #{record.isDel,jdbcType=TINYINT}, + answer_time = #{record.answerTime,jdbcType=BIGINT} + + + + + + update t_ht_patient_score + + + patient_report_id = #{patientReportId,jdbcType=BIGINT}, + + + patient_id = #{patientId,jdbcType=BIGINT}, + + + question_parent_code = #{questionParentCode,jdbcType=VARCHAR}, + + + question_id = #{questionId,jdbcType=BIGINT}, + + + option_id = #{optionId,jdbcType=BIGINT}, + + + option_name = #{optionName,jdbcType=VARCHAR}, + + + score = #{score,jdbcType=DECIMAL}, + + + type = #{type,jdbcType=TINYINT}, + + + answer = #{answer,jdbcType=VARCHAR}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + is_del = #{isDel,jdbcType=TINYINT}, + + + answer_time = #{answerTime,jdbcType=BIGINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_ht_patient_score + set patient_report_id = #{patientReportId,jdbcType=BIGINT}, + patient_id = #{patientId,jdbcType=BIGINT}, + question_parent_code = #{questionParentCode,jdbcType=VARCHAR}, + question_id = #{questionId,jdbcType=BIGINT}, + option_id = #{optionId,jdbcType=BIGINT}, + option_name = #{optionName,jdbcType=VARCHAR}, + score = #{score,jdbcType=DECIMAL}, + type = #{type,jdbcType=TINYINT}, + answer = #{answer,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_time = #{updateTime,jdbcType=TIMESTAMP}, + is_del = #{isDel,jdbcType=TINYINT}, + answer_time = #{answerTime,jdbcType=BIGINT} + where id = #{id,jdbcType=BIGINT} + \ No newline at end of file diff --git a/ht/src/main/resources/mapper_raw/HtQuestionOptionMapper.xml b/ht/src/main/resources/mapper_raw/HtQuestionOptionMapper.xml index cd7506d0..7ae095fb 100644 --- a/ht/src/main/resources/mapper_raw/HtQuestionOptionMapper.xml +++ b/ht/src/main/resources/mapper_raw/HtQuestionOptionMapper.xml @@ -1,306 +1,306 @@ - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, question_id, sort, type, name, score, display, remark, create_time, update_time, - is_del - - - - - delete from t_ht_question_option - where id = #{id,jdbcType=BIGINT} - - - delete from t_ht_question_option - - - - - - insert into t_ht_question_option (id, question_id, sort, - type, name, score, - display, remark, create_time, - update_time, is_del) - values (#{id,jdbcType=BIGINT}, #{questionId,jdbcType=BIGINT}, #{sort,jdbcType=INTEGER}, - #{type,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{score,jdbcType=INTEGER}, - #{display,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT}) - - - insert into t_ht_question_option - - - id, - - - question_id, - - - sort, - - - type, - - - name, - - - score, - - - display, - - - remark, - - - create_time, - - - update_time, - - - is_del, - - - - - #{id,jdbcType=BIGINT}, - - - #{questionId,jdbcType=BIGINT}, - - - #{sort,jdbcType=INTEGER}, - - - #{type,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - #{score,jdbcType=INTEGER}, - - - #{display,jdbcType=VARCHAR}, - - - #{remark,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - #{isDel,jdbcType=TINYINT}, - - - - - - update t_ht_question_option - - - id = #{record.id,jdbcType=BIGINT}, - - - question_id = #{record.questionId,jdbcType=BIGINT}, - - - sort = #{record.sort,jdbcType=INTEGER}, - - - type = #{record.type,jdbcType=VARCHAR}, - - - name = #{record.name,jdbcType=VARCHAR}, - - - score = #{record.score,jdbcType=INTEGER}, - - - display = #{record.display,jdbcType=VARCHAR}, - - - remark = #{record.remark,jdbcType=VARCHAR}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - - - is_del = #{record.isDel,jdbcType=TINYINT}, - - - - - - - - update t_ht_question_option - set id = #{record.id,jdbcType=BIGINT}, - question_id = #{record.questionId,jdbcType=BIGINT}, - sort = #{record.sort,jdbcType=INTEGER}, - type = #{record.type,jdbcType=VARCHAR}, - name = #{record.name,jdbcType=VARCHAR}, - score = #{record.score,jdbcType=INTEGER}, - display = #{record.display,jdbcType=VARCHAR}, - remark = #{record.remark,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - is_del = #{record.isDel,jdbcType=TINYINT} - - - - - - update t_ht_question_option - - - question_id = #{questionId,jdbcType=BIGINT}, - - - sort = #{sort,jdbcType=INTEGER}, - - - type = #{type,jdbcType=VARCHAR}, - - - name = #{name,jdbcType=VARCHAR}, - - - score = #{score,jdbcType=INTEGER}, - - - display = #{display,jdbcType=VARCHAR}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - is_del = #{isDel,jdbcType=TINYINT}, - - - where id = #{id,jdbcType=BIGINT} - - - update t_ht_question_option - set question_id = #{questionId,jdbcType=BIGINT}, - sort = #{sort,jdbcType=INTEGER}, - type = #{type,jdbcType=VARCHAR}, - name = #{name,jdbcType=VARCHAR}, - score = #{score,jdbcType=INTEGER}, - display = #{display,jdbcType=VARCHAR}, - remark = #{remark,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP}, - is_del = #{isDel,jdbcType=TINYINT} - where id = #{id,jdbcType=BIGINT} - + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, question_id, sort, type, name, score, display, remark, create_time, update_time, + is_del + + + + + delete from t_ht_question_option + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_question_option + + + + + + insert into t_ht_question_option (id, question_id, sort, + type, name, score, + display, remark, create_time, + update_time, is_del) + values (#{id,jdbcType=BIGINT}, #{questionId,jdbcType=BIGINT}, #{sort,jdbcType=INTEGER}, + #{type,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{score,jdbcType=DECIMAL}, + #{display,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT}) + + + insert into t_ht_question_option + + + id, + + + question_id, + + + sort, + + + type, + + + name, + + + score, + + + display, + + + remark, + + + create_time, + + + update_time, + + + is_del, + + + + + #{id,jdbcType=BIGINT}, + + + #{questionId,jdbcType=BIGINT}, + + + #{sort,jdbcType=INTEGER}, + + + #{type,jdbcType=VARCHAR}, + + + #{name,jdbcType=VARCHAR}, + + + #{score,jdbcType=DECIMAL}, + + + #{display,jdbcType=VARCHAR}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + + + + update t_ht_question_option + + + id = #{record.id,jdbcType=BIGINT}, + + + question_id = #{record.questionId,jdbcType=BIGINT}, + + + sort = #{record.sort,jdbcType=INTEGER}, + + + type = #{record.type,jdbcType=VARCHAR}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + score = #{record.score,jdbcType=DECIMAL}, + + + display = #{record.display,jdbcType=VARCHAR}, + + + remark = #{record.remark,jdbcType=VARCHAR}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + + + is_del = #{record.isDel,jdbcType=TINYINT}, + + + + + + + + update t_ht_question_option + set id = #{record.id,jdbcType=BIGINT}, + question_id = #{record.questionId,jdbcType=BIGINT}, + sort = #{record.sort,jdbcType=INTEGER}, + type = #{record.type,jdbcType=VARCHAR}, + name = #{record.name,jdbcType=VARCHAR}, + score = #{record.score,jdbcType=DECIMAL}, + display = #{record.display,jdbcType=VARCHAR}, + remark = #{record.remark,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + is_del = #{record.isDel,jdbcType=TINYINT} + + + + + + update t_ht_question_option + + + question_id = #{questionId,jdbcType=BIGINT}, + + + sort = #{sort,jdbcType=INTEGER}, + + + type = #{type,jdbcType=VARCHAR}, + + + name = #{name,jdbcType=VARCHAR}, + + + score = #{score,jdbcType=DECIMAL}, + + + display = #{display,jdbcType=VARCHAR}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + is_del = #{isDel,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_ht_question_option + set question_id = #{questionId,jdbcType=BIGINT}, + sort = #{sort,jdbcType=INTEGER}, + type = #{type,jdbcType=VARCHAR}, + name = #{name,jdbcType=VARCHAR}, + score = #{score,jdbcType=DECIMAL}, + display = #{display,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_time = #{updateTime,jdbcType=TIMESTAMP}, + is_del = #{isDel,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + \ No newline at end of file diff --git a/pom.xml b/pom.xml index beca0a44..ca3bc12a 100644 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,7 @@ health + question com.ccsens diff --git a/question/pom.xml b/question/pom.xml new file mode 100644 index 00000000..3c5e69c6 --- /dev/null +++ b/question/pom.xml @@ -0,0 +1,66 @@ + + + + ccsenscloud + com.ccsens + 1.0-SNAPSHOT + + 4.0.0 + + question + + + + cloudutil + com.ccsens + 1.0-SNAPSHOT + + + + util + com.ccsens + 1.0-SNAPSHOT + + + + + + + + + org.mybatis.generator + mybatis-generator-maven-plugin + 1.3.7 + + ${basedir}/src/main/resources/mbg.xml + true + + + + mysql + mysql-connector-java + 5.1.34 + + + + + org.springframework.boot + spring-boot-maven-plugin + + com.ccsens.question.QuestionApplication + + + + + + repackage + + + + + + + + + diff --git a/question/src/main/java/com/ccsens/question/QuestionApplication.java b/question/src/main/java/com/ccsens/question/QuestionApplication.java new file mode 100644 index 00000000..677f9ad6 --- /dev/null +++ b/question/src/main/java/com/ccsens/question/QuestionApplication.java @@ -0,0 +1,25 @@ +package com.ccsens.question; + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.scheduling.annotation.EnableAsync; + + +@MapperScan(basePackages = {"com.ccsens.question.persist.*"}) +@ServletComponentScan +@EnableAsync +//开启断路器功能 +@EnableCircuitBreaker +@EnableFeignClients(basePackages = "com.ccsens.cloudutil.feign") +@SpringBootApplication(scanBasePackages = "com.ccsens") +public class QuestionApplication { + + public static void main(String[] args) { + SpringApplication.run(QuestionApplication.class, args); + } + +} diff --git a/question/src/main/java/com/ccsens/question/annotation/DoctorAudit.java b/question/src/main/java/com/ccsens/question/annotation/DoctorAudit.java new file mode 100644 index 00000000..eaa4e691 --- /dev/null +++ b/question/src/main/java/com/ccsens/question/annotation/DoctorAudit.java @@ -0,0 +1,14 @@ +package com.ccsens.question.annotation; + +import java.lang.annotation.*; + +/** + * 医生是否审核通过 + * @author: wuHuiJuan + * @create: 2019/11/21 10:47 + */ +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) +public @interface DoctorAudit { +} diff --git a/question/src/main/java/com/ccsens/question/api/DoctorController.java b/question/src/main/java/com/ccsens/question/api/DoctorController.java new file mode 100644 index 00000000..1dab7388 --- /dev/null +++ b/question/src/main/java/com/ccsens/question/api/DoctorController.java @@ -0,0 +1,132 @@ +package com.ccsens.question.api; + + +import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.question.annotation.DoctorAudit; +import com.ccsens.question.bean.dto.DoctorDto; +import com.ccsens.question.bean.vo.DoctorVo; +import com.ccsens.question.bean.vo.PatientReportVo; +import com.ccsens.question.service.IDoctorService; +import com.ccsens.util.CodeEnum; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.*; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; +import java.util.List; + +/** + * @program: ptpro + * @description: + * @author: wu huijuan + * @create: 2019/10/24 17:03 + */ +@Slf4j +@Api(tags = "资格认证/审核",value = "医生进行资格认证和资格审核") +@RestController +public class DoctorController { + + @Autowired + private IDoctorService doctorService; + + + + + @MustLogin + @ApiOperation(value = "资格认证",notes = "医生提交基本信息进行资格认证") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "医生基本信息", required = true) + }) + @RequestMapping(value = "/doctorSubmit", method = RequestMethod.POST) + public JsonResponse doctorSubmit(@RequestBody @ApiParam @Valid QueryDto params) { + log.info("资格认证参数：{}", params); + DoctorDto.Submit submit = params.getParam(); + return doctorService.doctorSubmit(submit, params.getUserId()); + } + + + @MustLogin + @DoctorAudit + @ApiOperation(value = "资格认证列表",notes = "医生资格认证列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "医生查询条件", required = true) + }) + @RequestMapping(value = "/queryDoctors", method = RequestMethod.POST) + public JsonResponse> queryDoctors(@RequestBody @ApiParam @Valid QueryDto params) { + log.info("资格认证列表：{}", params); + PageInfo dtos = doctorService.queryDoctors(params.getParam(), params.getUserId()); + return JsonResponse.newInstance().ok(CodeEnum.SUCCESS, dtos); + } + + @MustLogin + @DoctorAudit + @ApiOperation(value = "资格审核",notes = "医生资格审核 通过/拒绝") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "医生基本信息", required = true) + }) + @RequestMapping(value = "/doctorAudit", method = RequestMethod.POST) + public JsonResponse doctorAudit(@RequestBody @ApiParam @Valid QueryDto params) throws Exception { + + log.info("资格审核：{}", params); + DoctorDto.Audit audit = params.getParam(); + CodeEnum codeEnum = doctorService.doctorAudit(audit, params.getUserId()); + log.info("审核结果：{}", codeEnum); + return JsonResponse.newInstance().ok(codeEnum); + } + + @MustLogin + @ApiOperation(value = "查询医生资格审核状态",notes = "查询医生资格审核状态") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "医生查询条件", required = true) + }) + @RequestMapping(value = "/queryDoctorStatus", method = RequestMethod.POST) + public JsonResponse queryDoctorStatus(@RequestBody @ApiParam QueryDto params) { + log.info("资格认证列表：{}", params); + DoctorVo.Query dtos = doctorService.queryDoctorStatus(params.getUserId()); + if (dtos == null) { + return JsonResponse.newInstance().ok(CodeEnum.DOCTOR_NOT_SUBMIT); + } + return JsonResponse.newInstance().ok(dtos); + } + + @MustLogin + @DoctorAudit + @ApiOperation(value = "分享编辑病友信息",notes = "分享编辑病友信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "分享编辑病友信息", required = true) + }) + @RequestMapping(value="/patientFillShare", method = RequestMethod.POST) + public JsonResponse patientFillShare(@RequestBody @ApiParam @Valid QueryDto params) throws Exception { + log.info("查询其他信息请求参数：{}", params); + Long userId = params.getUserId(); + String path = doctorService.getShareUrl(userId); + PatientReportVo.Export export = new PatientReportVo.Export(); + export.setPath(path); + log.info("{}分享路径:{}", userId, export); + return JsonResponse.newInstance().ok(export); + } + + + + @MustLogin + @DoctorAudit + @ApiOperation(value = "查询下属医生信息",notes = "查询下属医生信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "查询下属医生信息", required = true) + }) + @RequestMapping(value="/querySubordinate", method = RequestMethod.POST) + public JsonResponse> queryAllSubordinate(@RequestBody @ApiParam @Valid QueryDto params) { + log.info("查询下属信息请求参数：{}", params); + Long userId = params.getUserId(); + List subordinates = doctorService.queryAllSubordinate(userId); + log.info("{}查询下属返回结果:{}", userId, subordinates); + return JsonResponse.newInstance().ok(subordinates); + } +} diff --git a/question/src/main/java/com/ccsens/question/api/FileController.java b/question/src/main/java/com/ccsens/question/api/FileController.java new file mode 100644 index 00000000..dbc5a081 --- /dev/null +++ b/question/src/main/java/com/ccsens/question/api/FileController.java @@ -0,0 +1,41 @@ +package com.ccsens.question.api; + +import cn.hutool.core.date.DateUtil; +import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.question.bean.dto.FileDto; +import com.ccsens.question.bean.vo.FileVo; +import com.ccsens.util.Base64FileUtil; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.PropUtil; +import com.ccsens.util.bean.dto.QueryDto; +import io.swagger.annotations.*; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + * @description: + * @author: wuHuiJuan + * @create: 2019/12/17 18:03 + */ +@Slf4j +@Api(tags = "文件上传",value = "文件上传") +@RestController +public class FileController { + @MustLogin + @ApiOperation(value = "测评试题查询",notes = "测评试题查询") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "测评试题查询信息", required = true) + }) + @RequestMapping(value="/saveFile", method = RequestMethod.POST) + public JsonResponse saveFile(@RequestBody @ApiParam @Valid QueryDto queryDto) throws Exception { + String path = Base64FileUtil.base64ToFile(queryDto.getParam().getBase64(), PropUtil.path, "/file/" + DateUtil.today() + "/"); + FileVo.Save save = new FileVo.Save(); + save.setPath(PropUtil.imgDomain + path); + return JsonResponse.newInstance().ok(save); + } +} diff --git a/question/src/main/java/com/ccsens/question/api/ImportController.java b/question/src/main/java/com/ccsens/question/api/ImportController.java new file mode 100644 index 00000000..0ad768fc --- /dev/null +++ b/question/src/main/java/com/ccsens/question/api/ImportController.java @@ -0,0 +1,213 @@ +package com.ccsens.question.api; + +import com.ccsens.question.service.IImportService; +import com.ccsens.question.uitl.Constant; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.UploadFileUtil_Servlet3; +import com.ccsens.util.WebConstant; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.Part; +import java.io.File; + + +/** + * @program: ptpro + * @description: 医疗测评数据导入 + * @author: wu huijuan + * @create: 2019/10/21 09:51 + */ + +@Slf4j +@Api(tags = "数据导入",value = "导入医疗项目相关数据") +@RestController +public class ImportController { + + @Autowired + private IImportService importService; + + /** + *@Description: + *@Param: + *@return: com.ccsens.ptpro.util.JsonResponse + *@Author: wuhuijuan + *@date: 2019/10/21 10:04 + */ + @ApiOperation(value = "导入医疗项目相关数据",notes = "文件大小不能超过20M，支持后缀:.xls|.xlsx") + @ApiImplicitParams({ + @ApiImplicitParam(name = "file", value = "医疗项目表", required = true, paramType = "form",dataType = "__file") + }) + @RequestMapping(value = "/importBase", method = RequestMethod.POST) + public JsonResponse importAll(@RequestParam(required = true) Part file) throws Exception{ + + long time1 = System.currentTimeMillis(); + //1.上传文件 + String allowedExts = "xls,xlsx"; + String dir = WebConstant.UPLOAD_PROJECT_WBS + File.separator; + String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExts, dir); + File execlFile = new File(dir+path); + long time2 = System.currentTimeMillis(); + log.info("解析文件耗时：{}", (time2 - time1)); + importService.importPosition(execlFile, 0); + long time3 = System.currentTimeMillis(); + log.info("导入职务耗时：{}", (time3 - time2)); + importService.importTitle(execlFile, 1); + long time4 = System.currentTimeMillis(); + log.info("导入职称耗时：{}", (time4 - time3)); + importService.importReport(execlFile, 2); + long time5 = System.currentTimeMillis(); + log.info("导入报告单耗时：{}", (time5 - time4)); + importService.importQuestion(execlFile, Constant.Ht.Question.ALL); + return JsonResponse.newInstance().ok(); + } + + /** + *@Description: + *@Param: + *@return: com.ccsens.ptpro.util.JsonResponse + *@Author: wuhuijuan + *@date: 2019/10/21 10:04 + */ + @ApiOperation(value = "单独导入报告单类型",notes = "文件大小不能超过20M，支持后缀:.xls|.xlsx") + @ApiImplicitParams({ + @ApiImplicitParam(name = "file", value = "医疗项目表", required = true, paramType = "form",dataType = "__file") + }) + @RequestMapping(value = "/importReportType", method = RequestMethod.POST) + public JsonResponse importReportType(@RequestParam(required = true) Part file) throws Exception{ + + long time1 = System.currentTimeMillis(); + //1.上传文件 + String allowedExts = "xls,xlsx"; + String dir = WebConstant.UPLOAD_PROJECT_WBS + File.separator; + String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExts, dir); + File execlFile = new File(dir+path); + long time2 = System.currentTimeMillis(); + log.info("解析文件耗时：{}", (time2 - time1)); +// importService.importPosition(execlFile, 0); +// long time3 = System.currentTimeMillis(); +// log.info("导入职务耗时：{}", (time3 - time2)); +// importService.importTitle(execlFile, 1); + long time4 = System.currentTimeMillis(); +// log.info("导入职称耗时：{}", (time4 - time3)); + importService.importReport(execlFile, 2); + long time5 = System.currentTimeMillis(); + log.info("导入报告单耗时：{}", (time5 - time4)); +// importService.importQuestion(execlFile, Constant.Ht.Question.ALL); + return JsonResponse.newInstance().ok(); + } + + + /** + *@Description: + *@Param: + *@return: com.ccsens.ptpro.util.JsonResponse + *@Author: wuhuijuan + *@date: 2020/5/14 11:21 + */ + @ApiOperation(value = "导入importMoca",notes = "文件大小不能超过20M，支持后缀:.xls|.xlsx") + @ApiImplicitParams({ + @ApiImplicitParam(name = "file", value = "医疗项目表", required = true, paramType = "form",dataType = "__file") + }) + @RequestMapping(value = "/importMoca", method = RequestMethod.POST) + public JsonResponse importMoca(@RequestParam(required = true) Part file) throws Exception{ + + long time1 = System.currentTimeMillis(); + //1.上传文件 + String allowedExts = "xls,xlsx"; + String dir = WebConstant.UPLOAD_PROJECT_WBS + File.separator; + String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExts, dir); + File execlFile = new File(dir+path); + long time2 = System.currentTimeMillis(); + importService.importQuestion(execlFile, Constant.Ht.Report.MOCA); + log.info("导入moca"); + return JsonResponse.newInstance().ok(); + } + + /** + *@Description: + *@Param: + *@return: com.ccsens.ptpro.util.JsonResponse + *@Author: wuhuijuan + *@date: 2020/5/14 11:21 + */ + @ApiOperation(value = "导入importMoca",notes = "文件大小不能超过20M，支持后缀:.xls|.xlsx") + @ApiImplicitParams({ + @ApiImplicitParam(name = "file", value = "医疗项目表", required = true, paramType = "form",dataType = "__file") + }) + @RequestMapping(value = "/importMMSE", method = RequestMethod.POST) + public JsonResponse importMMSE(@RequestParam(required = true) Part file) throws Exception{ + + long time1 = System.currentTimeMillis(); + //1.上传文件 + String allowedExts = "xls,xlsx"; + String dir = WebConstant.UPLOAD_PROJECT_WBS + File.separator; + String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExts, dir); + File execlFile = new File(dir+path); + long time2 = System.currentTimeMillis(); + importService.importQuestion(execlFile, Constant.Ht.Report.MMSE); + log.info("导入mmse"); + return JsonResponse.newInstance().ok(); + } + + /** + *@Description: + *@Param: + *@return: com.ccsens.ptpro.util.JsonResponse + *@Author: wuhuijuan + *@date: 2020/5/14 11:21 + */ + @ApiOperation(value = "导入importRey",notes = "文件大小不能超过20M，支持后缀:.xls|.xlsx") + @ApiImplicitParams({ + @ApiImplicitParam(name = "file", value = "医疗项目表", required = true, paramType = "form",dataType = "__file") + }) + @RequestMapping(value = "/importRey", method = RequestMethod.POST) + public JsonResponse importRey(@RequestParam(required = true) Part file) throws Exception{ + + long time1 = System.currentTimeMillis(); + //1.上传文件 + String allowedExts = "xls,xlsx"; + String dir = WebConstant.UPLOAD_PROJECT_WBS + File.separator; + String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExts, dir); + File execlFile = new File(dir+path); + long time2 = System.currentTimeMillis(); + importService.importQuestion(execlFile, Constant.Ht.Report.REY); + log.info("导入Rey"); + return JsonResponse.newInstance().ok(); + } + + + /** + *@Description: + *@Param: + *@return: com.ccsens.ptpro.util.JsonResponse + *@Author: wuhuijuan + *@date: 2020/5/14 11:21 + */ + @ApiOperation(value = "导入importXFXPD",notes = "文件大小不能超过20M，支持后缀:.xls|.xlsx") + @ApiImplicitParams({ + @ApiImplicitParam(name = "file", value = "医疗项目表", required = true, paramType = "form",dataType = "__file") + }) + @RequestMapping(value = "/importXFXPD", method = RequestMethod.POST) + public JsonResponse importXFXPD(@RequestParam(required = true) Part file) throws Exception{ + + long time1 = System.currentTimeMillis(); + //1.上传文件 + String allowedExts = "xls,xlsx"; + String dir = WebConstant.UPLOAD_PROJECT_WBS + File.separator; + String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExts, dir); + File execlFile = new File(dir+path); + long time2 = System.currentTimeMillis(); + importService.importQuestion(execlFile, Constant.Ht.Report.XFXPD); + log.info("导入XFXPD"); + return JsonResponse.newInstance().ok(); + } +} diff --git a/question/src/main/java/com/ccsens/question/api/IndexController.java b/question/src/main/java/com/ccsens/question/api/IndexController.java new file mode 100644 index 00000000..86ce60eb --- /dev/null +++ b/question/src/main/java/com/ccsens/question/api/IndexController.java @@ -0,0 +1,50 @@ +package com.ccsens.question.api; + +import com.ccsens.cloudutil.bean.QueryParam; +import com.ccsens.cloudutil.feign.TallFeignClient; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.configurationprocessor.json.JSONException; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.HashMap; +import java.util.Map; + + +/** + * @description: + * @author: wuHuiJuan + * @create: 2019/11/26 15:01 + */ +@RestController +public class IndexController { + +// @Autowired +// private RestTemplate restTemplate; + @Autowired + private TallFeignClient tallFeignClient; + + @RequestMapping("get/{id}") + public String get(@PathVariable("id") Long id) throws JSONException { + +// return restTemplate.getForObject("http://tall/getPort", String.class); + + Map t = new HashMap(); + t.put("name","zs"); + t.put("age",1); + QueryParam json = new QueryParam(); + json.setT(t); + json.setUserId(id); + String s = tallFeignClient.get(json); +// String s = tallFeignClient.index(); + return s; + + } + + @RequestMapping({"","/","/index"}) + public String index(){ + return "hello ht" ; + } + +} diff --git a/question/src/main/java/com/ccsens/question/api/PatientController.java b/question/src/main/java/com/ccsens/question/api/PatientController.java new file mode 100644 index 00000000..37694372 --- /dev/null +++ b/question/src/main/java/com/ccsens/question/api/PatientController.java @@ -0,0 +1,163 @@ +package com.ccsens.question.api; + +import cn.hutool.core.util.IdcardUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.question.annotation.DoctorAudit; +import com.ccsens.question.bean.dto.PatientDto; +import com.ccsens.question.bean.po.HtPatient; +import com.ccsens.question.bean.vo.PatientVo; +import com.ccsens.question.service.IPatientService; +import com.ccsens.util.CodeEnum; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.*; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; +import java.util.List; + +/** + * @program: ptpro + * @description: 病人信息查询及编辑 + * @author: wu huijuan + * @create: 2019/10/28 17:48 + */ +@Slf4j +@Api(tags = "病友信息",value = "病友信息查询/编辑") +@RestController +public class PatientController { + + @Autowired + private IPatientService patientService; + + + @MustLogin + @ApiOperation(value = "查询医生录入的病人信息",notes = "查询医生录入的病人信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "分页条件", required = true) + }) + @RequestMapping(value="/queryByRecordId", method = RequestMethod.POST) + public JsonResponse> queryByRecordId(@RequestBody @ApiParam @Valid QueryDto params){ + log.info("查询医生记录的病人信息：{}", params); + PageInfo pageInfo = patientService.queryByRecorder(params.getParam(), params.getUserId()); + log.info("查询医生记录的病人信息结果：{}", pageInfo); + return JsonResponse.newInstance().ok(pageInfo); + } + + + /** + *@Description: + * @param params + *@return: com.ccsens.ptpro.util.JsonResponse + *@Author: wuhuijuan + *@date: 2019/10/29 9:24 + */ + @MustLogin + @DoctorAudit + @ApiOperation(value = "基础信息查询",notes = "病友基础信息查询") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "病友基础信息", required = true) + }) + @RequestMapping(value="/queryPatient", method = RequestMethod.POST) + public JsonResponse query(@RequestBody @ApiParam @Valid QueryDto params) { + log.info("病友信息查询：{}", params); + PatientDto.Query patient = params.getParam(); + + List patients = patientService.selectPatient(patient); + log.info("病友查询结果：{}", patients); + return JsonResponse.newInstance().ok(PatientVo.Query.copy(patients, params.getUserId())); + } + + /** + *@Description:病人基本信息编辑，返回病人ID + * 1.为用户注册账号 2有则修改，无则添加 + * @param params + *@return: com.ccsens.ptpro.util.JsonResponse + *@Author: wuhuijuan + *@date: 2019/10/30 9:27 + */ + @MustLogin + @DoctorAudit + @ApiOperation(value = "基础信息编辑",notes = "病友基础信息编辑") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "病友基础信息", required = true) + }) + @RequestMapping(value="/editPatient", method = RequestMethod.POST) + public JsonResponse edit(@RequestBody @ApiParam @Valid QueryDtoparams) { + log.info("病友信息编辑：{}", params); + PatientDto.Edit patient = params.getParam(); + if(StringUtils.isEmpty(patient.getMobile()) || StringUtils.isEmpty(patient.getName())) { + log.info("手机号或名字为空"); + return JsonResponse.newInstance().ok(CodeEnum.PARAM_NULL); + } + //校验身份证格式 + if (patient.getId() == null) { + if (StringUtils.isEmpty(patient.getIdcard())) { + return JsonResponse.newInstance().ok(CodeEnum.PARAM_NULL); + } + if (!IdcardUtil.isValidCard(patient.getIdcard())){ + return JsonResponse.newInstance().ok(CodeEnum.ID_CARD_ERROR); + } + } else if (StringUtils.isEmpty(patient.getIdcard()) || patient.getIdcard().contains("*")) { + patient.setIdcard(null); + } + //设置记录值 +// patient.setRecorder(patient.getId() == null ? Constant.Ht.NUMBER_DEFAULT : params.getUserId()); + long id = patientService.editPatient(patient.copy(), params.getUserId()); + log.info("病友编辑结果：{}", id); + if (id <= 0) { + log.info("病友编辑失败"); + return JsonResponse.newInstance().ok(CodeEnum.PARAM_ERROR); + } + PatientVo.Edit idModel = new PatientVo.Edit(); + idModel.setId(id); + return JsonResponse.newInstance().ok(idModel); + } + + @MustLogin + @DoctorAudit + @ApiOperation(value = "病友其他信息查询",notes = "病友其他信息查询") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "病友其他信息查询", required = true) + }) + @RequestMapping(value="/queryPatientOtherMsg", method = RequestMethod.POST) + public JsonResponse queryPatientOtherMsg(@RequestBody @ApiParam @Valid QueryDto params) { + log.info("查询其他信息请求参数：{}", params); + List list = patientService.queryPatientOtherMsg(params.getParam(), params.getUserId()); + JSONArray array = JSONObject.parseArray(JSONObject.toJSONString(list)); + String key = "recorder"; + for (Object obj: array) { + JSONObject json = (JSONObject) obj; + boolean isNotRecorder = json.get(key) != null + && json.getLongValue(key) != 0 + && json.getLongValue(key) != params.getUserId().longValue(); + json.put("modifyAuth", isNotRecorder ? 0 : 1); + } + return JsonResponse.newInstance().ok(array); + } + + @MustLogin + @DoctorAudit + @ApiOperation(value = "编辑其他病友信息",notes = "编辑其他病友信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "编辑其他病友信息", required = true) + }) + @RequestMapping(value="/editPatientOtherMsg", method = RequestMethod.POST) + public JsonResponse editPatientOtherMsg(@RequestBody @ApiParam @Valid QueryDto params) { + log.info("查询其他信息请求参数：{}", params); + long id = patientService.editPatientOtherMsg(params.getParam(), params.getUserId()); + JSONObject json = new JSONObject(); + json.put("id", id); + return JsonResponse.newInstance().ok(CodeEnum.SUCCESS, json); + } + +} diff --git a/question/src/main/java/com/ccsens/question/api/PatientReportController.java b/question/src/main/java/com/ccsens/question/api/PatientReportController.java new file mode 100644 index 00000000..2602f9a4 --- /dev/null +++ b/question/src/main/java/com/ccsens/question/api/PatientReportController.java @@ -0,0 +1,265 @@ +package com.ccsens.question.api; + + +import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.question.annotation.DoctorAudit; +import com.ccsens.question.bean.dto.PatientReportDto; +import com.ccsens.question.bean.po.HtDoctor; +import com.ccsens.question.bean.vo.PatientReportVo; +import com.ccsens.question.service.IPatientReportService; +import com.ccsens.question.uitl.Constant; +import com.ccsens.util.CodeEnum; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.*; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; +import java.io.IOException; +import java.util.List; + +/** + * @program: ptpro + * @description:病人报告单 + * @author: wu huijuan + * @create: 2019/10/30 16:22 + */ +@Slf4j +@Api(tags = "报告单信息",value = "报告单生成，查看，编辑，生成文件等") +@RestController +public class PatientReportController { + + @Autowired + private IPatientReportService patientReportService; + + @MustLogin + @DoctorAudit + @ApiOperation(value = "忽略未完成的报告单",notes = "忽略未完成的报告单") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "报告单信息", required = true) + }) + @RequestMapping(value="/ignoreComplete", method = RequestMethod.POST) + public JsonResponse ignoreComplete(@RequestBody @ApiParam @Valid QueryDto dto){ + log.info("忽略未完成的报告单：{}", dto); + patientReportService.ignoreComplete(dto.getParam(), dto.getUserId()); + log.info("忽略未完成的报告单已完成"); + return JsonResponse.newInstance().ok(); + } + + @MustLogin + @DoctorAudit + @ApiOperation(value = "检查是否有未完成的报告单",notes = "检查是否有未完成的报告单") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "报告单信息", required = true) + }) + @RequestMapping(value="/checkComplete", method = RequestMethod.POST) + public JsonResponse checkComplete(@RequestBody @ApiParam @Valid QueryDto dto){ + log.info("检查是否有未完成的报告单：{}", dto); + PatientReportVo.Complete complete = patientReportService.checkComplete(dto.getUserId()); + log.info("检查是否有未完成的报告单返回：{}", complete); + return JsonResponse.newInstance().ok(complete); + } + + @MustLogin + @DoctorAudit + @ApiOperation(value = "生成报告单",notes = "生成报告单") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "报告单信息", required = true) + }) + @RequestMapping(value="/generatePatientReport", method = RequestMethod.POST) + public JsonResponse generate(@RequestBody @ApiParam @Valid QueryDto dto){ + log.info("生成报告单请求参数：{}", dto); + PatientReportDto.Generate patientReport = dto.getParam(); + if (patientReport == null || patientReport.getPatientId() == null || patientReport.getPatientId() == 0) { + return JsonResponse.newInstance().ok(CodeEnum.PARAM_NULL); + } + //TODO 判断病友是否和当前医院绑定，未绑定，进行绑定 + JsonResponse response = patientReportService.generatePatientReport(patientReport, dto.getUserId()); + log.info("生成病友报告单返回：{}", response); + return response; + } + @MustLogin + @DoctorAudit + @ApiOperation(value = "编辑报告单",notes = "编辑报告单") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "编辑报告单信息", required = true) + }) + @RequestMapping(value="/editPatientReport", method = RequestMethod.POST) + public JsonResponse edit(@RequestBody @ApiParam @Valid QueryDto param){ + + //编辑报告单信息 + log.info("编辑报告单：{}", param); + CodeEnum codeEnum = patientReportService.editPatientReport(param.getParam(), param.getUserId()); + log.info("编辑报告单结果：{}", codeEnum); + return JsonResponse.newInstance().ok(codeEnum); + } + + @MustLogin + @ApiOperation(value = "查询报告单列表",notes = "根据病人ID/医生ID查询报告单列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "编辑报告单信息", required = true) + }) + @RequestMapping(value="/queryReports", method = RequestMethod.POST) + public JsonResponse> queryReports(@RequestBody @ApiParam @Valid QueryDto param){ + + //编辑报告单信息 + log.info("查询报告单列表：{}", param); + PageInfo reportNamePageInfo = patientReportService.queryReports(param.getParam(), param.getUserId()); + log.info("查询报告单结果：{}", reportNamePageInfo); + return JsonResponse.newInstance().ok(reportNamePageInfo); + } + + @ApiOperation(value = "查询报告单详情",notes = "根据病人ID查询报告单详情") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "查询报告单详情", required = true) + }) + @RequestMapping(value="/queryReportDetail", method = RequestMethod.POST) + public JsonResponse queryReportDetail(@RequestBody @ApiParam @Valid QueryDto param){ + //查询报告单信息 + log.info("查询报告单详情：{}", param); + PatientReportVo.ReprotDetail detail = patientReportService.queryReportDetail(param.getParam(), param.getUserId()); + log.info("查询报告单详情结果：{}", detail); + return JsonResponse.newInstance().ok(detail); + } + + @MustLogin + @ApiOperation(value = "查询医生对报告单的权限",notes = "查询医生对报告单的权限") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "报告单ID", required = true) + }) + @RequestMapping(value="/queryAuthority", method = RequestMethod.POST) + public JsonResponse queryAuthority(@RequestBody @ApiParam @Valid QueryDto param){ + //查询报告单信息 + log.info("查询医生对报告单的权限：{}", param); + PatientReportVo.Authority authority = patientReportService.queryReportAuthority(param.getParam(), param.getUserId()); + log.info("查询医生对报告单的权限结果：{}", authority); + return JsonResponse.newInstance().ok(authority); + } + + @ApiOperation(value = "导出报告单",notes = "导出报告单") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "导出报告单", required = true) + }) + @RequestMapping(value="/exportReport", method = RequestMethod.POST) + public JsonResponse 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({ + @ApiImplicitParam(name = "json", value = "分享报告单", required = true) + }) + @RequestMapping(value="/shareReport", method = RequestMethod.POST) + public JsonResponse shareReport(@RequestBody @ApiParam @Valid QueryDto param) throws IOException { + //查询报告单信息 + log.info("查询报告单详情：{}", param); + String path = patientReportService.generateQRCode(param.getParam(), param.getUserId()); + log.info("文件路径:{}", path); + PatientReportVo.Export export = new PatientReportVo.Export(); + export.setPath(path); + + return JsonResponse.newInstance().ok(export); + } + + @MustLogin + @DoctorAudit + @ApiOperation(value = "查询下属医生的报告单列表",notes = "根据医生ID查询报告单列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "查询下属医生的报告单列表", required = true) + }) + @RequestMapping(value="/querySubordinateReports", method = RequestMethod.POST) + public JsonResponse> querySubordinateReports(@RequestBody @ApiParam @Valid QueryDto param){ + + //编辑报告单信息 + log.info("查询某个医生的报告单列表：{}", param); + HtDoctor doctor = (HtDoctor) param.getOtherMsg().get(Constant.Ht.DOCTOR_PARAM); + PageInfo reportNamePageInfo = patientReportService.queryDoctorReports(param.getParam(), doctor, param.getUserId()); + log.info("查询某个医生的报告单结果：{}", reportNamePageInfo); + return JsonResponse.newInstance().ok(reportNamePageInfo); + } + + @MustLogin + @ApiOperation(value = "管理员查询报告单列表",notes = "管理员查询报告单列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "管理员查询报告单列表", required = true) + }) + @RequestMapping(value="/queryAllReports", method = RequestMethod.POST) + public JsonResponse> queryAllReports(@RequestBody @ApiParam @Valid QueryDto param){ + + //编辑报告单信息 + log.info("管理员查询报告单列表请求参数：{}", param); + HtDoctor doctor = (HtDoctor) param.getOtherMsg().get(Constant.Ht.DOCTOR_PARAM); + PageInfo reportNamePageInfo = patientReportService.queryAllReports(param.getParam(), param.getUserId()); + log.info("管理员查询报告单列表结果：{}", reportNamePageInfo); + return JsonResponse.newInstance().ok(reportNamePageInfo); + } + + + @MustLogin + @ApiOperation(value = "根据临床诊断统计",notes = "根据临床诊断统计") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "根据临床诊断统计", required = true) + }) + @RequestMapping(value="/countByClinicalDiagnosis", method = RequestMethod.POST) + public JsonResponse countByClinicalDiagnosis(@RequestBody @ApiParam @Valid QueryDto param){ + + //编辑报告单信息 + log.info("根据临床诊断统计请求参数：{}", param); + List list = patientReportService.countByClinicalDiagnosis(param.getParam(), param.getUserId()); + log.info("根据临床诊断统计结果：{}", list); + return JsonResponse.newInstance().ok(list); + } + + @MustLogin + @ApiOperation(value = "根据年龄+性别统计",notes = "根据年龄+性别统计") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "根据年龄+性别统计", required = true) + }) + @RequestMapping(value="/countBySexAndAge", method = RequestMethod.POST) + public JsonResponse countBySexAndAge(@RequestBody @ApiParam @Valid QueryDto param){ + log.info("根据临床诊断统计请求参数：{}", param); + List reportNamePageInfo = patientReportService.countBySexAndAge(param.getParam(), param.getUserId()); + log.info("根据临床诊断统计结果：{}", reportNamePageInfo); + return JsonResponse.newInstance().ok(reportNamePageInfo); + } + + @MustLogin + @ApiOperation(value = "根据日期统计",notes = "根据日期统计") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "根据日期统计", required = true) + }) + @RequestMapping(value="/countByDay", method = RequestMethod.POST) + public JsonResponse countByDay(@RequestBody @ApiParam @Valid QueryDto param){ + log.info("根据临床诊断统计请求参数：{}", param); + List reportNamePageInfo = patientReportService.countByDay(param.getParam(), param.getUserId()); + log.info("根据临床诊断统计结果：{}", reportNamePageInfo); + return JsonResponse.newInstance().ok(reportNamePageInfo); + } + + @MustLogin + @DoctorAudit + @ApiOperation(value = "查询报告单详细答题信息",notes = "根据报告单id和测评类型，查看报告单的详细信息") + @ApiImplicitParams({ + }) + @RequestMapping(value="/queryReportAnswer", method = RequestMethod.POST) + public JsonResponse> queryReportAnswer(@RequestBody @ApiParam @Valid QueryDto param){ + log.info("查询报告单详细答题信息：{}", param); + List reportDetailAnswers = patientReportService.queryReportAnswer(param.getParam(), param.getUserId()); + log.info("查询报告单详细答题信息完成"); + return JsonResponse.newInstance().ok(reportDetailAnswers); + } + + +} diff --git a/question/src/main/java/com/ccsens/question/api/PatientReportSearchController.java b/question/src/main/java/com/ccsens/question/api/PatientReportSearchController.java new file mode 100644 index 00000000..d725e739 --- /dev/null +++ b/question/src/main/java/com/ccsens/question/api/PatientReportSearchController.java @@ -0,0 +1,58 @@ +package com.ccsens.question.api; + +import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.question.bean.dto.PatientReportSearchDto; +import com.ccsens.question.bean.vo.PatientReportSearchVo; +import com.ccsens.question.service.IPatientReportService; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; +import io.swagger.annotations.*; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.List; + +/** + * @description: + * @author: whj + * @time: 2021/3/10 15:03 + */ +@Slf4j +@Api(tags = "报告单搜索",value = "报告单搜索条件，搜索") +@RestController +@RequestMapping("/patientReport") +public class PatientReportSearchController { + @Resource + private IPatientReportService patientReportService; + + @MustLogin + @ApiOperation(value = "查询搜索条件",notes = "whj 查询搜索条件") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "查询搜索条件", required = true) + }) + @RequestMapping(value="/searchParam", method = RequestMethod.POST) + public JsonResponse searchParam(@RequestBody @ApiParam @Valid QueryDto dto){ + log.info("查询搜索条件：{}", dto); + List params = patientReportService.searchParam(dto.getParam()); + log.info("查询搜索条件已完成：{}", params); + return JsonResponse.newInstance().ok(params); + } + + @MustLogin + @ApiOperation(value = "根据条件搜索报告单",notes = "whj 搜索报告单") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "查询搜索条件", required = true) + }) + @RequestMapping(value="/search", method = RequestMethod.POST) + public JsonResponse search(@RequestBody @ApiParam @Valid QueryDto dto){ + log.info("搜索报告单：{}", dto); + List params = patientReportService.search(dto.getParam()); + log.info("搜索报告单已完成"); + return JsonResponse.newInstance().ok(params); + } +} diff --git a/question/src/main/java/com/ccsens/question/api/PositionController.java b/question/src/main/java/com/ccsens/question/api/PositionController.java new file mode 100644 index 00000000..6f4c8c36 --- /dev/null +++ b/question/src/main/java/com/ccsens/question/api/PositionController.java @@ -0,0 +1,57 @@ +package com.ccsens.question.api; + +import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.question.bean.dto.PositionDto; +import com.ccsens.question.bean.vo.PositionVo; +import com.ccsens.question.service.IPositionService; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; +import io.swagger.annotations.*; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; +import java.util.List; + +/** + * @description: 查询职务职称 + * @author: wu huijuan + * @create: 2019/11/19 16:19 + */ +@Slf4j +@Api(tags = "部门 和 职称",value = "查询部门/职称") +@RestController +public class PositionController { + + @Autowired + private IPositionService positionService; + + @MustLogin + @ApiOperation(value = "医院/部门/职务查询",notes = "医院/部门/职务查询") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "医院/部门/职务查询", required = true) + }) + @RequestMapping(value="/queryPosition", method = RequestMethod.POST) + public JsonResponse> queryPosition(@RequestBody @ApiParam @Valid QueryDto params){ + log.info("查询职务：{}", params); + List positions = positionService.queryPosition(params.getParam(), params.getUserId()); + return JsonResponse.newInstance().ok(positions); + } + + @MustLogin + @ApiOperation(value = "职称查询",notes = "职称查询") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "职称查询", required = true) + }) + @RequestMapping(value="/queryTitle", method = RequestMethod.POST) + public JsonResponse> queryTitle(){ + log.info("查询职称"); + List titles = positionService.queryTitles(); + return JsonResponse.newInstance().ok(titles); + } + +} diff --git a/question/src/main/java/com/ccsens/question/api/QuestionController.java b/question/src/main/java/com/ccsens/question/api/QuestionController.java new file mode 100644 index 00000000..60353f79 --- /dev/null +++ b/question/src/main/java/com/ccsens/question/api/QuestionController.java @@ -0,0 +1,133 @@ +package com.ccsens.question.api; + + +import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.question.annotation.DoctorAudit; +import com.ccsens.question.bean.dto.QuestionDto; +import com.ccsens.question.bean.vo.QuestionVo; +import com.ccsens.question.service.IQuestionService; +import com.ccsens.util.CodeEnum; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.NotSupportedFileTypeException; +import com.ccsens.util.bean.dto.QueryDto; +import io.swagger.annotations.*; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; +import java.io.IOException; +import java.util.List; + +/** + * @description: + * @author: wu huijuan + * @create: 2019/11/08 15:33 + */ +@Slf4j +@Api(tags = "测评题目信息",value = "测评题目查询等") +@RestController +public class QuestionController { + + @Autowired + private IQuestionService questionService; + + @MustLogin + @DoctorAudit + @ApiOperation(value = "测评试题查询",notes = "测评试题查询") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "测评试题查询信息", required = true) + }) + @RequestMapping(value="/queryQuestion", method = RequestMethod.POST) + public JsonResponse 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); + } + + @MustLogin + @DoctorAudit + @ApiOperation(value = "通过报告单和试题id查询试题的答案",notes = "测评试题查询") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "测评试题查询信息", required = true) + }) + @RequestMapping(value="/optionJson", method = RequestMethod.POST) + public JsonResponse> queryOptionJson(@RequestBody @ApiParam @Valid QueryDto queryDto){ + log.info("查询试题：{}", queryDto); + + List optionJsonList = questionService.queryOptionJson(queryDto.getParam(), queryDto.getUserId()); + log.info("查询试题结果：{}", optionJsonList); + return JsonResponse.newInstance().ok(optionJsonList); + } + + @MustLogin + @DoctorAudit + @ApiOperation(value = "保存试题得分",notes = "保存试题得分") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "试题得分情况", required = true) + }) + @RequestMapping(value="/saveScore", method = RequestMethod.POST) + public JsonResponse saveScore(@RequestBody @ApiParam @Valid QueryDto queryDto) throws IOException, NotSupportedFileTypeException { + log.info("保存试题得分：{}", queryDto); + CodeEnum codeEnum = questionService.saveScore(queryDto.getParam(), queryDto.getUserId()); + log.info("保存试题得分结果：{}", codeEnum); + return JsonResponse.newInstance().ok(codeEnum); + } + + @MustLogin + @DoctorAudit + @ApiOperation(value = "保存用户画图信息",notes = "zy:保存画板信息画图轨迹等") + @ApiImplicitParams({ + }) + @RequestMapping(value="/saveCanvas", method = RequestMethod.POST) + public JsonResponse> saveCanvas(@RequestBody @ApiParam @Valid QueryDto queryDto) throws IOException, NotSupportedFileTypeException { + log.info("保存用户画图信息"); + List patientCanvas = questionService.saveCanvas(queryDto.getParam(), queryDto.getUserId()); + log.info("保存用户画图信息成功后返回"); + return JsonResponse.newInstance().ok(patientCanvas); + } + + @MustLogin + @DoctorAudit + @ApiOperation(value = "查看用户画图信息",notes = "zy:查看画板信息画图轨迹等") + @ApiImplicitParams({ + }) + @RequestMapping(value="/queryCanvas", method = RequestMethod.POST) + public JsonResponse> queryCanvas(@RequestBody @ApiParam @Valid QueryDto queryDto) throws IOException, NotSupportedFileTypeException { + log.info("查看用户画图信息"); + List patientCanvas = questionService.getCanvas(queryDto.getParam(), queryDto.getUserId()); + log.info("查看用户画图信息成功"); + return JsonResponse.newInstance().ok(patientCanvas); + } + + @MustLogin + @DoctorAudit + @ApiOperation(value = "删除画图轨迹",notes = "zy:删除画图的轨迹，可以一次删除多条") + @ApiImplicitParams({ + }) + @RequestMapping(value="/delCanvas", method = RequestMethod.POST) + public JsonResponse delCanvas(@RequestBody @ApiParam @Valid QueryDto queryDto) throws IOException, NotSupportedFileTypeException { + log.info("删除画图轨迹"); + questionService.delCanvas(queryDto.getParam(), queryDto.getUserId()); + log.info("删除画图轨迹成功"); + return JsonResponse.newInstance().ok(); + } + + @MustLogin + @DoctorAudit + @ApiOperation(value = "根据上级code查询测评类型",notes = "zy:删除画图的轨迹，可以一次删除多条") + @ApiImplicitParams({ + }) + @RequestMapping(value="/queryReportCode", method = RequestMethod.POST) + public JsonResponse> queryReportCode(@RequestBody @ApiParam @Valid QueryDto queryDto) throws IOException, NotSupportedFileTypeException { + log.info("根据上级code查询测评类型:{}",queryDto); + List reportCodeList = questionService.queryReportCode(queryDto.getParam(), queryDto.getUserId()); + log.info("查询测评类型:{}",reportCodeList); + return JsonResponse.newInstance().ok(reportCodeList); + } +} diff --git a/question/src/main/java/com/ccsens/question/aspect/DoctorAuditAspect.java b/question/src/main/java/com/ccsens/question/aspect/DoctorAuditAspect.java new file mode 100644 index 00000000..48caaa09 --- /dev/null +++ b/question/src/main/java/com/ccsens/question/aspect/DoctorAuditAspect.java @@ -0,0 +1,60 @@ +package com.ccsens.question.aspect; + +import com.ccsens.question.bean.po.HtDoctor; +import com.ccsens.question.bean.po.HtDoctorExample; +import com.ccsens.question.persist.mapper.HtDoctorMapper; +import com.ccsens.question.uitl.Constant; +import com.ccsens.util.CodeEnum; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; +import lombok.extern.slf4j.Slf4j; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Pointcut; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +/** + * 判断医生是否审核通过 + * @author: wuHuiJuan + * @create: 2019/11/21 10:51 + */ +@Order(2) +@Slf4j +@Aspect +@Component +public class DoctorAuditAspect { + + @Resource + private HtDoctorMapper htDoctorMapper; + +// @Pointcut("@annotation(com.ccsens.question.annotation.DoctorAudit)") +// public void doctorAuditAdvice(){} +// @Around("doctorAuditAdvice()") +// public Object around(ProceedingJoinPoint pjp) throws Throwable { +// +// Object[] args = pjp.getArgs(); +// QueryDto dto = (QueryDto) args[0]; +// Long userId = dto.getUserId(); +// HtDoctorExample doctorExample = new HtDoctorExample(); +// doctorExample.createCriteria().andUserIdEqualTo(userId).andAuditStateEqualTo(Constant.Ht.Doctor.CHECK_SUCCESS); +// List doctors = htDoctorMapper.selectByExample(doctorExample); +// if (CollectionUtils.isEmpty(doctors)) { +// log.info("{}没有审核信息", userId); +// return JsonResponse.newInstance().ok(CodeEnum.AUDIT_NOT_PASS); +// } +// +// Map map = dto.getOtherMsg(); +// map.put(Constant.Ht.DOCTOR_PARAM, doctors.get(0)); +// Object result =pjp.proceed(); +// +// return result; +// } + +} diff --git a/question/src/main/java/com/ccsens/question/bean/dto/DoctorDto.java b/question/src/main/java/com/ccsens/question/bean/dto/DoctorDto.java new file mode 100644 index 00000000..65761470 --- /dev/null +++ b/question/src/main/java/com/ccsens/question/bean/dto/DoctorDto.java @@ -0,0 +1,80 @@ +package com.ccsens.question.bean.dto; + +import com.ccsens.question.bean.po.HtDoctor; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.beans.BeanUtils; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; + +/** + * @program: ptpro + * @description: + * @author: wu huijuan + * @create: 2019/10/31 10:35 + */ +public class DoctorDto { + @ApiModel("DoctorDtoSubmit") + @Data + public static class Submit{ + @ApiModelProperty("职务ID") + @NotNull(message = "职务不能为空") + private Long positionId; + @ApiModelProperty("职称ID") + @NotNull(message = "职称不能为空") + private Long titleId; + @ApiModelProperty("姓名") + @NotNull(message = "姓名不能为空") + private String name; + @ApiModelProperty("性别（0：男 1：女）") + @NotNull(message = "性别不能为空") + @Min(value = 0, message = "请选择正确的性别") + @Max(value = 1, message = "请选择正确的性别") + private Byte sex; + @ApiModelProperty("年龄") + @NotNull(message = "年龄不能为空") + @Min(value = 0, message = "请输入正确年龄") + @Max(value = 150, message = "请输入正确年龄") + private Integer age; + + public HtDoctor copy() { + HtDoctor doctor = new HtDoctor(); + BeanUtils.copyProperties(this, doctor); + return doctor; + } + } + + + + @ApiModel("DoctorDtoAudit") + @Data + public static class Audit{ + @ApiModelProperty("待审核医生ID") + @NotNull(message="被审核医生信息不能为空") + private Long doctorId; + @ApiModelProperty("审核状态 1：审核通过 2：审核失败") + @NotNull(message = "医生审核状态不能为空") + private Byte auditState; + } + + @ApiModel("DoctorDtoQuery") + @Data + public static class Query{ + @ApiModelProperty("名字") + private String name; + @ApiModelProperty("职称ID") + private Long titleId; + @ApiModelProperty("医院/科室/职务ID") + private Long positionId; + @ApiModelProperty("第几页") + @Min(value = 1) + private int pageNum = 1; + @ApiModelProperty("每页多少条") + @Min(value = 1) + @Max(value=100) + private int pageSize = 10; + } +} diff --git a/question/src/main/java/com/ccsens/question/bean/dto/FileDto.java b/question/src/main/java/com/ccsens/question/bean/dto/FileDto.java new file mode 100644 index 00000000..ade204f1 --- /dev/null +++ b/question/src/main/java/com/ccsens/question/bean/dto/FileDto.java @@ -0,0 +1,24 @@ +package com.ccsens.question.bean.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @description: + * @author: wuHuiJuan + * @create: 2019/12/17 18:05 + */ +public class FileDto { + + @ApiModel("FileDtoSave") + @Data + public static class Save{ + + @ApiModelProperty("文件base64字符串") + @NotNull(message = "文件内容不允许为空") + private String base64; + } +} diff --git a/question/src/main/java/com/ccsens/question/bean/dto/PatientDto.java b/question/src/main/java/com/ccsens/question/bean/dto/PatientDto.java new file mode 100644 index 00000000..e9696939 --- /dev/null +++ b/question/src/main/java/com/ccsens/question/bean/dto/PatientDto.java @@ -0,0 +1,146 @@ +package com.ccsens.question.bean.dto; + +import com.alibaba.fastjson.JSONObject; +import com.ccsens.question.bean.po.HtPatient; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.beans.BeanUtils; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; + +/** + * @program: ptpro + * @description: 病人相关接口请求参数 + * @author: wu huijuan + * @create: 2019/10/31 09:28 + */ +public class PatientDto { + + @ApiModel("PatientDtoRecorder") + @Data + public static class Recorder{ + @ApiModelProperty("第几页") + @Min(value = 1) + private int pageNum = 1; + @ApiModelProperty("每页多少条") + @Min(value = 1) + @Max(value=100) + private int pageSize = 10; + } + + @ApiModel("PatientDtoQuery") + @Data + public static class Query{ + @ApiModelProperty("报告单ID") + private Long reportId; + @ApiModelProperty("病人ID") + private Long id; + @ApiModelProperty("病人名字") + private String name; + @ApiModelProperty("病人门诊号") + private String patientNumber; + @ApiModelProperty("病人住院号") + private String hospitalNumber; + @ApiModelProperty("病人身份证号") + private String idcard; + } + + @Data + @ApiModel("PatientDtoEdit") + public static class Edit{ + @ApiModelProperty("病人id") + private Long id; + @ApiModelProperty("病人用户id") + private Long userId; + @NotNull(message = "请填写名字") + @ApiModelProperty("病人名字") + private String name; + @ApiModelProperty("病人门诊号") + private String patientNumber; + @ApiModelProperty("病人住院号") + private String hospitalNumber; + @NotNull(message="请填写身份证号") + @ApiModelProperty("病人身份证号") + private String idcard; + @NotNull(message = "请选择性别") + @ApiModelProperty("性别（0：男 1：女）") + private Byte sex; + @NotNull(message = "请选择婚姻状况") + @ApiModelProperty("婚姻状况（1：未婚2：已婚 3：离异 4：分居 5：丧偶 6：同居 7：其他 ）") + private Byte maritalStatus; + @NotNull(message = "请选择教育程度") + @ApiModelProperty("教育程度（1：文盲 2：小学 3：初中 4：高中 5：大学 6：大学以上 7：其他）") + private Byte educationalStatus; + @NotNull(message = "请选择受教育时间") + @ApiModelProperty("受教育时间（年或月）") + private String educationalStatusUnit; + @ApiModelProperty("民族") + private String nation; + @ApiModelProperty("籍贯") + private String nativePlace; + @NotNull(message="请选择职业") + @ApiModelProperty("职业（1：农林牧渔水利生产人员 2：教师 3：医务工作者 4：专业技术人员 5：生产、运输设备操作人员及有关人员6：商业、服务业人员7：国家机关、事业单位、企业负责人8：国家机关、事业单位、企业办事人员和有关人员9：军人 10：媒体、文体类工作人员 11：在校学生 12：未就业 13：家务 14：其他") + private Byte career; + @NotNull(message="请填写生育数量") + @ApiModelProperty("生育数量") + private Integer birthNumber; + @ApiModelProperty("绝经年龄（女）") + private Integer menopauseAge; + @NotNull(message="请填写联系人") + @ApiModelProperty("联系人") + private String contact; + @NotNull(message = "请填写手机") + @ApiModelProperty("手机") + private String mobile; + @ApiModelProperty("电话") + private String phone; + @ApiModelProperty("省份") + private String province; + @ApiModelProperty("城市") + private String city; + @ApiModelProperty("住址") + private String address; + @ApiModelProperty("住所（1：自己家中 2：养老院 3：其他）") + private Byte domicile; + @ApiModelProperty("独立生活能力（1：能够独立生活 2：需要他人帮助完成复杂活动 3：需要他人帮助完成基本活动 4：完全依赖他人生活 5：未知 6：其他）") + private Byte independentLivingSkills; + @ApiModelProperty("居住状态（1：独居 2：与配偶或对象或子女 3：与亲戚或朋友居住）") + private Byte dwellingState; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("第一次录入人ID") + private Long recorder; + + /**复制当前的对象为HtPatient*/ + public HtPatient copy(){ + HtPatient patient = new HtPatient(); + BeanUtils.copyProperties(this, patient); + return patient; + } + } + + @Data + @ApiModel("PatientDtoQueryOtherMsg") + public static class QueryOtherMsg { + @ApiModelProperty("病人id") + @NotNull(message = "病人ID不能为空") + private Long patientId; + @ApiModelProperty("类型") + @NotNull(message="查询类型不能为空") + private String queryType; + } + + @Data + @ApiModel("PatientDtoEditOtherMsg") + public static class EditOtherMsg { + @ApiModelProperty("病人其他信息") + @NotNull(message="病人其他信息不能为空") + private JSONObject model; + @ApiModelProperty("类型") + @NotNull(message="病人类型不能为空") + private String editType; + } +} diff --git a/question/src/main/java/com/ccsens/question/bean/dto/PatientReportDto.java b/question/src/main/java/com/ccsens/question/bean/dto/PatientReportDto.java new file mode 100644 index 00000000..54528126 --- /dev/null +++ b/question/src/main/java/com/ccsens/question/bean/dto/PatientReportDto.java @@ -0,0 +1,186 @@ +package com.ccsens.question.bean.dto; + +import com.ccsens.question.bean.po.HtPatientReport; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.beans.BeanUtils; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * @program: ptpro + * @description: 报告单请求参数 + * @author: wu huijuan + * @create: 2019/10/31 10:22 + */ +public class PatientReportDto { + + @Data + @ApiModel("忽略未完成的报告单") + public static class Ignore{ + @ApiModelProperty("病人报告单ID") + @NotNull(message = "病人报告单ID不能为空") + private Long id; + } + + @ApiModel("PatientReportDtoGenerate") + @Data + public static class Generate{ + @ApiModelProperty("病人ID") + @NotNull(message = "病人ID不能为空") + private Long patientId; + } + + @ApiModel("PatientReportDtoEdit") + @Data + public static class Edit{ + @ApiModelProperty("初步印象") + @NotNull(message="初步印象不能为空") + private String initialImpression; + @ApiModelProperty("临床诊断") + @NotNull(message = "临床诊断不能为空") + private String clinicalDiagnosis; + @ApiModelProperty("床号") + private String bedNumber; + @ApiModelProperty("病人年龄 ") + private Byte patientAge; + @ApiModelProperty("严重程度(1:轻度 2：中度 3：重度) ") + private Byte pasi; + @ApiModelProperty("科别") + private String department; + @ApiModelProperty("病人报告单ID") + @NotNull(message = "报告单ID不允许为空") + private Long id; + + public HtPatientReport copy(){ + HtPatientReport report = new HtPatientReport(); + BeanUtils.copyProperties(this, report); + report.setReportTime(System.currentTimeMillis()); + return report; + } + } + + @ApiModel("PatientReportDtoQueryReports") + @Data + public static class QueryReports{ + @ApiModelProperty("病人ID") + private Long patientId; + @ApiModelProperty("第几页") + @Min(value = 1) + private int pageNum = 1; + @ApiModelProperty("每页多少条") + @Min(value = 1) + @Max(value=100) + private int pageSize = 10; + } + + @ApiModel("PatientReportDtoQueryDetail") + @Data + public static class QueryDetail{ + @ApiModelProperty("病人报告单ID") + @NotNull(message = "病人报告单ID不能为空") + private Long id; + @ApiModelProperty("是否需要rey 默认为0 0全部查询导出 1不导出rey 2只导出rey") + private int rey = 0; + } + + + /**医生对报告单权限*/ + @ApiModel("PatientReportDtoAuthority") + @Data + public static class Authority{ + @ApiModelProperty("病人报告单ID") + @NotNull(message = "病人报告单ID不能为空") + private Long id; + } + + @ApiModel("医生ID") + @Data + public static class Doctor{ + @ApiModelProperty("医生ID") + @NotNull(message = "医生ID不能为空") + private Long id; + @ApiModelProperty("第几页") + @Min(value = 1) + private int pageNum = 1; + @ApiModelProperty("每页多少条") + @Min(value = 1) + @Max(value=100) + private int pageSize = 10; + } + + + @ApiModel("查询报告单") + @Data + public static class AdminQueryReport { + @ApiModelProperty("病人年龄-开始") + private Byte startAge; + @ApiModelProperty("病人年龄-结束") + private Byte endAge; + @ApiModelProperty("性别") + private Byte patientSex; + @ApiModelProperty("临床诊断") + private String clinicalDiagnosis; + @ApiModelProperty("严重程度") + private Byte pasi; + @ApiModelProperty("开始时间") + private Long startTime; + @ApiModelProperty("结束时间") + private Long endTime; + @ApiModelProperty("第几页") + @Min(value = 1) + private int pageNum = 1; + @ApiModelProperty("每页多少条") + @Min(value = 1) + @Max(value=100) + private int pageSize = 10; + } + + @ApiModel("临床诊断统计请求") + @Data + public static class ClinicalDiagnosis{ + + } + + @ApiModel("年龄性别统计请求") + @Data + public static class AgeAndSex{ + + } + + + @ApiModel("日期统计请求") + @Data + public static class Day { + @ApiModelProperty("开始时间") + private Long startTime; + @ApiModelProperty("结束时间") + private Long endTime; + } + + @ApiModel("查询报告单答题信息") + @Data + public static class QueryReportAnswer { + @NotNull(message = "报到单id不能为空") + @ApiModelProperty("报告单id") + private Long id; + @NotBlank(message = "测评类型不能为空") + @ApiModelProperty("测评类型") + private String evaluationCode; + } + + @ApiModel("查询病友画图原图") + @Data + public static class QueryQuestionImg { + @NotNull(message = "报到单id不能为空") + @ApiModelProperty("报告单id") + private Long id; + @NotNull(message = "题目id不能为空") + @ApiModelProperty("题目id") + private Long questionId; + } +} diff --git a/question/src/main/java/com/ccsens/question/bean/dto/PatientReportSearchDto.java b/question/src/main/java/com/ccsens/question/bean/dto/PatientReportSearchDto.java new file mode 100644 index 00000000..5c368fd2 --- /dev/null +++ b/question/src/main/java/com/ccsens/question/bean/dto/PatientReportSearchDto.java @@ -0,0 +1,38 @@ +package com.ccsens.question.bean.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import java.util.List; + +/** + * @description: + * @author: whj + * @time: 2021/3/10 16:21 + */ +public class PatientReportSearchDto { + @Data + @ApiModel("搜索条件-请求参数") + public static class SearchParam{ + @ApiModelProperty("查询类型") + @NotEmpty(message = "请输入查询报告单类型") + private String parentCode; + } + + @Data + @ApiModel("搜索报告单参数列表-请求") + public static class SearchList { + private List codes; + } + + @Data + @ApiModel("搜索报告单参数-请求") + public static class Search { + @NotEmpty(message="请选择查询类型") + private String code; + private Integer start; + private Integer end; + } +} diff --git a/question/src/main/java/com/ccsens/question/bean/dto/PositionDto.java b/question/src/main/java/com/ccsens/question/bean/dto/PositionDto.java new file mode 100644 index 00000000..aff3b362 --- /dev/null +++ b/question/src/main/java/com/ccsens/question/bean/dto/PositionDto.java @@ -0,0 +1,21 @@ +package com.ccsens.question.bean.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description:职务和职称 + * @author: wu huijuan + * @create: 2019/11/19 16:24 + */ +public class PositionDto { + @ApiModel("PositionDtoPosition") + @Data + public static class Position { + @ApiModelProperty("上级部门ID 为空，默认查所有医院") + private Long superiorDepartmentId; + } + + +} diff --git a/question/src/main/java/com/ccsens/question/bean/dto/QuestionDto.java b/question/src/main/java/com/ccsens/question/bean/dto/QuestionDto.java new file mode 100644 index 00000000..16498849 --- /dev/null +++ b/question/src/main/java/com/ccsens/question/bean/dto/QuestionDto.java @@ -0,0 +1,122 @@ +package com.ccsens.question.bean.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @description: + * @author: wu huijuan + * @create: 2019/11/08 15:37 + */ +public class QuestionDto { + + @Data + @ApiModel("QuestionDtoQuery") + public static class Query{ + + @ApiModelProperty("病人报告单ID") + private Long patientReportId; + @ApiModelProperty("测评类型") + @NotNull(message = "测评类型不能为空") + private String code; + @ApiModelProperty("题号") + @NotNull(message = "题号不能为空") + private int num; + } + + @Data + @ApiModel("QuestionDtoScore") + public static class Score{ + @ApiModelProperty("病人报告单ID") + private Long patientReportId; + @ApiModelProperty("试题ID") + @NotNull(message = "试题ID不能为空") + private Long questionId; + @ApiModelProperty("选项集合") + private List