diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java index 2617b86a..84bac65e 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java @@ -28,7 +28,7 @@ import java.util.Map; * @create: 2019/11/27 10:03 */ -@FeignClient(name = "tall", path = "v1.0", fallbackFactory = TallFeignClientFallBack.class) +@FeignClient(name = "tall-ht", path = "v1.0", fallbackFactory = TallFeignClientFallBack.class) public interface TallFeignClient { /** 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/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/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/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/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..c028cf97 100644 --- a/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java +++ b/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java @@ -258,7 +258,7 @@ 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"))); carer.setType((byte)3); carer.setParentCode("NPI"); score.addSub(carer); @@ -266,7 +266,7 @@ 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"))); patient.setType((byte)3); patient.setParentCode("NPI"); score.addSub(patient); @@ -318,23 +318,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; 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..96d2c69c 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; @@ -273,7 +274,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 +286,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 +364,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 +379,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 +470,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 +638,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 +646,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 +665,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 +685,8 @@ public class QuestionService implements IQuestionService { lineParameter.setDuration(duration); //长度 double length = getLengthByCanvas(a); + //计算总长度 + totalLength += length; lineParameter.setLength(length); //计算最长最短 if(longLine == 0){ @@ -679,27 +702,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 +775,6 @@ 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(); } } 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/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 - - distinct - - - from t_ht_patient_acp - - - - - order by ${orderByClause} - - - - - 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/tall/src/main/java/com/ccsens/tall/rabbitMQ/MessageTest.java b/tall/src/main/java/com/ccsens/tall/rabbitMQ/MessageTest.java index 84c9fa2d..5c4bee9e 100644 --- a/tall/src/main/java/com/ccsens/tall/rabbitMQ/MessageTest.java +++ b/tall/src/main/java/com/ccsens/tall/rabbitMQ/MessageTest.java @@ -1,25 +1,25 @@ -package com.ccsens.tall.rabbitMQ; - -import com.ccsens.util.JacksonUtil; -import com.ccsens.util.bean.message.common.InMessage; -import com.ccsens.util.bean.message.common.MessageConstant; -import com.ccsens.util.bean.message.common.ServerMessage; -import com.ccsens.util.config.RabbitMQConfig; - -import org.springframework.amqp.core.AmqpTemplate; -import org.springframework.beans.factory.annotation.Autowired; - -public class MessageTest { - @Autowired - private AmqpTemplate rabbitTemplate; - - public void messageTest() throws Exception { - ServerMessage serverMessage = new ServerMessage(); - serverMessage.setType("Ping"); - InMessage inMessage = InMessage.newToServerMessage(MessageConstant.DomainType.Server,serverMessage); - String j = JacksonUtil.beanToJson(inMessage); - System.out.println(j); - //FixMe 发送到消息队列 - rabbitTemplate.convertAndSend(RabbitMQConfig.TALL_MESSAGE_1,j); - } -} +//package com.ccsens.tall.rabbitMQ; +// +//import com.ccsens.util.JacksonUtil; +//import com.ccsens.util.bean.message.common.InMessage; +//import com.ccsens.util.bean.message.common.MessageConstant; +//import com.ccsens.util.bean.message.common.ServerMessage; +//import com.ccsens.util.config.RabbitMQConfig; +// +//import org.springframework.amqp.core.AmqpTemplate; +//import org.springframework.beans.factory.annotation.Autowired; +// +//public class MessageTest { +// @Autowired +// private AmqpTemplate rabbitTemplate; +// +// public void messageTest() throws Exception { +// ServerMessage serverMessage = new ServerMessage(); +// serverMessage.setType("Ping"); +// InMessage inMessage = InMessage.newToServerMessage(MessageConstant.DomainType.Server,serverMessage); +// String j = JacksonUtil.beanToJson(inMessage); +// System.out.println(j); +// //FixMe 发送到消息队列 +// rabbitTemplate.convertAndSend(RabbitMQConfig.TALL_MESSAGE_1,j); +// } +//} diff --git a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java index 337a08be..cad67aa4 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java @@ -374,6 +374,7 @@ public class ProTaskDetailService implements IProTaskDetailService { longSet.add(secondTaskVo.getEndTime()); } timeList.addAll(longSet); + for (int i = 0; i < timeList.size(); i++) { for (int j = 0; j < timeList.size() - i - 1; j++) { if (timeList.get(j) > timeList.get(j + 1)) { @@ -383,6 +384,7 @@ public class ProTaskDetailService implements IProTaskDetailService { } } } + timeList.forEach(System.out::println); int sequence = 1; for (int i = 0; i < timeList.size() - 1; i++) { TaskVo.NormalTask normalTask = null; @@ -1181,9 +1183,11 @@ public class ProTaskDetailService implements IProTaskDetailService { //返回的任务详细信息 Long subTimeId = taskDeliverService.isTaskOrSubTime(taskDetail.getId()); normalTask = getTaskInfoByTaskId(currentUserId,project.getId(),subTimeId); + }else { + throw new BaseException(CodeEnum.NOT_POWER); } }else { - throw new BaseException(CodeEnum.NOT_POWER); + throw new BaseException(CodeEnum.NOT_PROJECT); } }else { throw new BaseException(CodeEnum.NOT_TASK); diff --git a/tall/src/main/java/com/ccsens/tall/service/UserService.java b/tall/src/main/java/com/ccsens/tall/service/UserService.java index b5662700..d7aa5f2a 100644 --- a/tall/src/main/java/com/ccsens/tall/service/UserService.java +++ b/tall/src/main/java/com/ccsens/tall/service/UserService.java @@ -622,18 +622,35 @@ public class UserService implements IUserService { throw new SmsException(SmsException.Error_SendTooFast); } + +//// String verifyCode = RandomUtil.randomNumbers(4); +// String verifyCode = "1111"; +// +// //3.保存到redis中 +// Integer codeValidInSeconds = WebConstant.Expired_Verify_Code_In_Seconds; +// Integer codeExistINSeconds = WebConstant.Exist_Verify_Code_In_Seconds; +// redisUtil.set(RedisKeyManager.getSigninSmsKey(phone), verifyCode, codeValidInSeconds); +// redisUtil.set(RedisKeyManager.getSigninSmsExistKey(phone), verifyCode, codeExistINSeconds); +// +// //5.发送验证码 +// SmsUtil.sendSms(phone, verifyCode, client_type.phase, codeValidInSeconds); + //2.生成随机验证码 -// String verifyCode = RandomUtil.randomNumbers(4); String verifyCode = "1111"; + if("1".equalsIgnoreCase(PropUtil.smsCode)){ + verifyCode = RandomUtil.randomNumbers(4); + } //3.保存到redis中 Integer codeValidInSeconds = WebConstant.Expired_Verify_Code_In_Seconds; - Integer codeExistINSeconds = WebConstant.Exist_Verify_Code_In_Seconds; + Integer codeExistInSeconds = WebConstant.Exist_Verify_Code_In_Seconds; redisUtil.set(RedisKeyManager.getSigninSmsKey(phone), verifyCode, codeValidInSeconds); - redisUtil.set(RedisKeyManager.getSigninSmsExistKey(phone), verifyCode, codeExistINSeconds); + redisUtil.set(RedisKeyManager.getSigninSmsExistKey(phone), verifyCode, codeExistInSeconds); //5.发送验证码 -// SmsUtil.sendSms(phone, verifyCode, client_type.phase, codeValidInSeconds); + if("1".equalsIgnoreCase(PropUtil.smsCode)) { + SmsUtil.sendSms(phone, verifyCode,"", codeValidInSeconds); + } //6.返回 smsCodeVo = new UserVo.SmsCode(); diff --git a/tall/src/main/resources/application-dev.yml b/tall/src/main/resources/application-dev.yml index 488106b8..600b2ab9 100644 --- a/tall/src/main/resources/application-dev.yml +++ b/tall/src/main/resources/application-dev.yml @@ -11,10 +11,11 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource rabbitmq: - host: 192.168.0.99 - password: 111111 +# host: 192.168.0.99 + host: 127.0.0.1 + password: guest port: 5672 - username: admin + username: guest redis: database: 0 host: 127.0.0.1 @@ -30,3 +31,4 @@ spring: swagger: enable: true +smsCode: 0 diff --git a/tall/src/main/resources/application-prod.yml b/tall/src/main/resources/application-prod.yml index f1924938..82900ec9 100644 --- a/tall/src/main/resources/application-prod.yml +++ b/tall/src/main/resources/application-prod.yml @@ -7,7 +7,7 @@ spring: datacenterId: 1 workerId: 1 application: - name: tall + name: tall-ht datasource: type: com.alibaba.druid.pool.DruidDataSource rabbitmq: @@ -36,4 +36,5 @@ eureka: # ip-address: 192.144.182.42 ip-address: 81.70.54.64 -gatewayUrl: https://sd.tall.wiki/gateway/ \ No newline at end of file +gatewayUrl: https://sd.tall.wiki/gateway/ +smsCode: 1 \ No newline at end of file diff --git a/tall/src/main/resources/application-test.yml b/tall/src/main/resources/application-test.yml index 87c77335..d5551bdd 100644 --- a/tall/src/main/resources/application-test.yml +++ b/tall/src/main/resources/application-test.yml @@ -1,5 +1,5 @@ server: - port: 7030 + port: 7031 servlet: context-path: /v1.0 spring: @@ -7,7 +7,7 @@ spring: datacenterId: 1 workerId: 1 application: - name: tall + name: tall-ht datasource: type: com.alibaba.druid.pool.DruidDataSource rabbitmq: @@ -32,4 +32,5 @@ swagger: eureka: instance: ip-address: 192.168.0.99 -gatewayUrl: http://192.168.0.99/gateway/ \ No newline at end of file +gatewayUrl: http://192.168.0.99/gateway/ +smsCode: 0 \ No newline at end of file diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index 1d881c2f..af245946 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: dev - include: util-dev,common \ No newline at end of file + active: prod + include: util-prod,common \ No newline at end of file diff --git a/util/src/main/java/com/ccsens/util/PropUtil.java b/util/src/main/java/com/ccsens/util/PropUtil.java index eaa353e5..b5201acc 100644 --- a/util/src/main/java/com/ccsens/util/PropUtil.java +++ b/util/src/main/java/com/ccsens/util/PropUtil.java @@ -18,6 +18,7 @@ public class PropUtil { public static String contextPath; public static String gatewayUrl; public static String qrCode; + public static String smsCode; @Value("${gatewayUrl:}") public void setGatewayUrl(String gatewayUrl) { @@ -49,4 +50,9 @@ public class PropUtil { PropUtil.contextPath = contextPath; } + @Value("${smsCode:}") + public void setSmsCode(String smsCode) { + PropUtil.smsCode = smsCode; + } + } diff --git a/util/src/main/java/com/ccsens/util/SmsUtil.java b/util/src/main/java/com/ccsens/util/SmsUtil.java index 5161c03f..3198c535 100644 --- a/util/src/main/java/com/ccsens/util/SmsUtil.java +++ b/util/src/main/java/com/ccsens/util/SmsUtil.java @@ -11,20 +11,61 @@ import java.io.IOException; @Component public class SmsUtil { - private static final int appid = 1400188778; // 1400开头 +// private static final int appid = 1400188778; // 1400开头 +// private static final String appkey = "c86ca104521ab2e28e1d4b558fdd665e"; +// private static final int templateId = 286731; //{1} 验证码{1}， 您正在通过{2}登录传控科技“时物链条”会议管理系统，请与{3}分钟内填写，如非本人操作，请忽略本短信。 +// private static final int templateId1 = 286682; //{1} 您正在通过{2}登录传控科技“时物链条”会议管理系统，请与{2}分钟内填写，如非本人操作，请忽略本短信。 +// private static final String smsSign = "传控科技"; +// +// public static void sendSms(String phone,String code,String appName,Integer seconds){ +// String phoneNumbers[] = {phone}; +// Integer minutes = (seconds - 1) / 60 + 1; +// try { +// String[] params = {code,appName,String.valueOf(minutes)};//数组具体的元素个数和模板中变量个数必须一致，例如事例中templateId:5678对应一个变量，参数数组中元素个数也必须是一个 +// SmsSingleSender ssender = new SmsSingleSender(appid, appkey); +// SmsSingleSenderResult result = ssender.sendWithParam("86", phoneNumbers[0], +// templateId, params, smsSign, "", ""); // 签名参数未提供或者为空时，会使用默认签名发送短信 +// System.out.println(result); +// } catch (HTTPException e) { +// // HTTP响应码错误 +// e.printStackTrace(); +// } catch (JSONException e) { +// // json解析错误 +// e.printStackTrace(); +// } catch (IOException e) { +// // 网络IO错误 +// e.printStackTrace(); +// } +// } + + + // 1400开头 + private static final int appid = 1400188778; private static final String appkey = "c86ca104521ab2e28e1d4b558fdd665e"; - private static final int templateId = 286731; //{1} 验证码{1}， 您正在通过{2}登录传控科技“时物链条”会议管理系统，请与{3}分钟内填写，如非本人操作，请忽略本短信。 - private static final int templateId1 = 286682; //{1} 您正在通过{2}登录传控科技“时物链条”会议管理系统，请与{2}分钟内填写，如非本人操作，请忽略本短信。 + /** + * {1} 验证码{1}， 您正在通过{2}登录传控科技“时物链条”会议管理系统，请与{3}分钟内填写，如非本人操作，请忽略本短信。\ + */ + private static final int templateId = 286731; + /** + * {1} 您正在通过{2}登录传控科技“时物链条”会议管理系统，请与{2}分钟内填写，如非本人操作，请忽略本短信。 + */ + private static final int templateId1 = 286682; + /**验证码{1},{2}分钟内有效,如非本人操作请忽略 + * + */ + private static final int templateId2 = 686476; private static final String smsSign = "传控科技"; public static void sendSms(String phone,String code,String appName,Integer seconds){ String phoneNumbers[] = {phone}; Integer minutes = (seconds - 1) / 60 + 1; try { - String[] params = {code,appName,String.valueOf(minutes)};//数组具体的元素个数和模板中变量个数必须一致，例如事例中templateId:5678对应一个变量，参数数组中元素个数也必须是一个 + //数组具体的元素个数和模板中变量个数必须一致，例如事例中templateId:5678对应一个变量，参数数组中元素个数也必须是一个 + String[] params = {code,String.valueOf(minutes)}; SmsSingleSender ssender = new SmsSingleSender(appid, appkey); + // 签名参数未提供或者为空时，会使用默认签名发送短信 SmsSingleSenderResult result = ssender.sendWithParam("86", phoneNumbers[0], - templateId, params, smsSign, "", ""); // 签名参数未提供或者为空时，会使用默认签名发送短信 + templateId2, params, smsSign, "", ""); System.out.println(result); } catch (HTTPException e) { // HTTP响应码错误