From 590282b10e6c3d2af137479347c7ab57b24f6b4c Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Mon, 25 Jan 2021 09:17:24 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=B0=86=E5=88=86=E6=95=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BAbigDecimal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloudutil/feign/TallFeignClient.java | 2 +- .../com/ccsens/ht/api/ImportController.java | 61 + .../com/ccsens/ht/bean/po/HtPatientAcp.java | 386 +-- .../ht/bean/po/HtPatientAcpExample.java | 2520 +++++++++-------- .../com/ccsens/ht/bean/po/HtPatientScore.java | 365 +-- .../ht/bean/po/HtPatientScoreExample.java | 2281 +++++++-------- .../ccsens/ht/bean/po/HtQuestionOption.java | 277 +- .../ht/bean/po/HtQuestionOptionExample.java | 1801 ++++++------ .../ccsens/ht/bean/vo/PatientReportVo.java | 3 +- .../com/ccsens/ht/bean/vo/QuestionVo.java | 19 +- .../ht/persist/mapper/HtPatientAcpMapper.java | 58 +- .../persist/mapper/HtPatientScoreMapper.java | 58 +- .../mapper/HtQuestionOptionMapper.java | 58 +- .../com/ccsens/ht/service/ImportService.java | 2 +- .../ht/service/PatientReportService.java | 16 +- .../ccsens/ht/service/QuestionService.java | 83 +- .../java/com/ccsens/ht/uitl/Constant.java | 5 + ht/src/main/resources/application-dev.yml | 2 +- .../mapper_dao/HtPatientCanvasDao.xml | 1 + .../mapper_raw/HtPatientAcpMapper.xml | 764 ++--- .../mapper_raw/HtPatientScoreMapper.xml | 738 ++--- .../mapper_raw/HtQuestionOptionMapper.xml | 610 ++-- .../com/ccsens/tall/rabbitMQ/MessageTest.java | 50 +- .../tall/service/ProTaskDetailService.java | 6 +- .../com/ccsens/tall/service/UserService.java | 25 +- tall/src/main/resources/application-dev.yml | 8 +- tall/src/main/resources/application-prod.yml | 5 +- tall/src/main/resources/application-test.yml | 7 +- tall/src/main/resources/application.yml | 4 +- .../main/java/com/ccsens/util/PropUtil.java | 6 + .../main/java/com/ccsens/util/SmsUtil.java | 51 +- 31 files changed, 5345 insertions(+), 4927 deletions(-) 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响应码错误 From 774fe4654fbca49fb39652b555b45b5b09c4a9b7 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Fri, 29 Jan 2021 12:45:48 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=97=B6=E5=8E=BB=E9=99=A4=E5=B0=8F=E6=95=B0=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloudutil/feign/TallFeignClient.java | 2 +- .../ccsens/ht/bean/dto/PatientReportDto.java | 3 +++ .../ht/persist/dao/HtPatientReportDao.java | 2 +- .../ht/service/PatientReportService.java | 19 +++++++++++++++++-- .../ccsens/ht/service/QuestionService.java | 6 ++++++ .../mapper_dao/HtPatientReportDao.xml | 10 +++++++++- tall/src/main/resources/application-prod.yml | 2 +- tall/src/main/resources/application.yml | 4 ++-- 8 files changed, 40 insertions(+), 8 deletions(-) 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 84bac65e..2617b86a 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-ht", path = "v1.0", fallbackFactory = TallFeignClientFallBack.class) +@FeignClient(name = "tall", path = "v1.0", fallbackFactory = TallFeignClientFallBack.class) public interface TallFeignClient { /** diff --git a/ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportDto.java b/ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportDto.java index 90e73931..5f82f7aa 100644 --- a/ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportDto.java +++ b/ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportDto.java @@ -81,7 +81,10 @@ public class PatientReportDto { @ApiModelProperty("病人报告单ID") @NotNull(message = "病人报告单ID不能为空") private Long id; + @ApiModelProperty("是否需要rey 默认为0 0全部查询导出 1不导出rey 2只导出rey") + private int rey = 0; } + /**医生对报告单权限*/ @ApiModel("PatientReportDtoAuthority") diff --git a/ht/src/main/java/com/ccsens/ht/persist/dao/HtPatientReportDao.java b/ht/src/main/java/com/ccsens/ht/persist/dao/HtPatientReportDao.java index 5e8ecf12..86aece6b 100644 --- a/ht/src/main/java/com/ccsens/ht/persist/dao/HtPatientReportDao.java +++ b/ht/src/main/java/com/ccsens/ht/persist/dao/HtPatientReportDao.java @@ -29,7 +29,7 @@ public interface HtPatientReportDao extends HtPatientReportMapper { *@Author: wuHuiJuan *@date: 2019/11/19 11:46 */ - List queryReportScore(@Param("id") Long id); + List queryReportScore(@Param("id") Long id,@Param("rey") int rey); /** * 查询NPI的分数 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 c028cf97..0743a34c 100644 --- a/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java +++ b/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.IdcardUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.ccsens.ht.bean.dto.PatientReportDto; import com.ccsens.ht.bean.po.*; @@ -217,11 +218,16 @@ public class PatientReportService implements IPatientReportService { //查询报告单信息和病人信息 PatientReportVo.ReprotPatient reportPatient = htPatientReportDao.queryReportResult(queryDetail.getId()); //查询报告单分数 - List reportScore = htPatientReportDao.queryReportScore(queryDetail.getId()); + List reportScore = htPatientReportDao.queryReportScore(queryDetail.getId(),queryDetail.getRey()); //重新封装报告单信息 Map map = new HashMap<>(32); List scores = new ArrayList<>(); reportScore.forEach(score -> { + if(ObjectUtil.isNotNull(score.getScore())){ + if(BigDecimal.valueOf(score.getScore().intValue()).compareTo(score.getScore()) == 0){ + score.setScore(score.getScore().setScale(0,BigDecimal.ROUND_HALF_UP)); + } + } map.put(score.getCode(), score); //测评类（MOCA等） if (Constant.Ht.Report.TYPE_EVALUATION.equals(score.getType())) { @@ -231,6 +237,7 @@ public class PatientReportService implements IPatientReportService { } scores.add(score); } else { + log.info("score:{}", score); map.get(score.getParentCode()).addSub(score); } @@ -258,7 +265,10 @@ public class PatientReportService implements IPatientReportService { carer.setCode("carer"); carer.setName("照顾者"); carer.setTotalScore(-1); - carer.setScore(npiScore == null || npiScore.get("carer") == null ? null : ((BigDecimal) npiScore.get("carer"))); + carer.setScore(npiScore == null || npiScore.get("carer") == null ? null : ((BigDecimal)npiScore.get("carer"))); + if(ObjectUtil.isNotNull(carer.getScore())){ + carer.setScore(carer.getScore().setScale(0,BigDecimal.ROUND_HALF_UP)); + } carer.setType((byte)3); carer.setParentCode("NPI"); score.addSub(carer); @@ -267,6 +277,9 @@ public class PatientReportService implements IPatientReportService { patient.setName("患者"); patient.setTotalScore(-1); patient.setScore(npiScore == null || npiScore.get("result") == null ? null : ((BigDecimal) npiScore.get("result"))); + if(ObjectUtil.isNotNull(patient.getScore())){ + patient.setScore(patient.getScore().setScale(0,BigDecimal.ROUND_HALF_UP)); + } patient.setType((byte)3); patient.setParentCode("NPI"); score.addSub(patient); @@ -354,6 +367,8 @@ public class PatientReportService implements IPatientReportService { @Override public String exportReport(PatientReportDto.QueryDetail queryDetail, Long userId) { log.info("导出报告单：{}， 操作用户：{}", queryDetail, userId); + // TODO 暂时不导出rey试题，将传入参数改为1 + queryDetail.setRey(1); //查看是否已生成对应文件路径 HtPatientReport report = htPatientReportDao.selectByPrimaryKey(queryDetail.getId()); if (report == null) { 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 96d2c69c..4435a7d9 100644 --- a/ht/src/main/java/com/ccsens/ht/service/QuestionService.java +++ b/ht/src/main/java/com/ccsens/ht/service/QuestionService.java @@ -244,6 +244,12 @@ public class QuestionService implements IQuestionService { for(QuestionDto.Option option : score.getOptions()) { HtQuestionOption questionOption = htQuestionOptionDao.selectByPrimaryKey(option.getId()); + //去除整数后多余的小数点 + if(ObjectUtil.isNotNull(questionOption.getScore())){ + if(BigDecimal.valueOf(questionOption.getScore().intValue()).compareTo(questionOption.getScore()) == 0){ + questionOption.setScore(questionOption.getScore().setScale(0,BigDecimal.ROUND_HALF_UP)); + } + } //未找到对应选项 或选项不是该试题的选项 if (questionOption == null || questionOption.getQuestionId().longValue() != question.getId()) { log.info("选项不存在或不是对应试题的选项"); diff --git a/ht/src/main/resources/mapper_dao/HtPatientReportDao.xml b/ht/src/main/resources/mapper_dao/HtPatientReportDao.xml index 7ff89458..4582b170 100644 --- a/ht/src/main/resources/mapper_dao/HtPatientReportDao.xml +++ b/ht/src/main/resources/mapper_dao/HtPatientReportDao.xml @@ -47,7 +47,15 @@ + select d.*, t.title as title_name, p.`name` as position_name, pt.name as department + from t_ht_doctor d, t_ht_doctor_audit a, t_ht_title t, t_ht_position p, t_ht_position pt + where d.id = a.doctor_id and d.title_id = t.id and d.position_id = p.id and p.superior_department_id = pt.id + and a.auditor_id = #{auditorId,jdbcType=BIGINT} and d.is_del = 0 and a.is_del = 0 and t.is_del = 0 and p.is_del = 0 and pt.is_del = 0 + + and d.name = #{name,jdbcType=VARCHAR} + + + and d.title_id = #{titleId,jdbcType=BIGINT} + + + and d.position_id = #{jobId,jdbcType=BIGINT} + + + and p.superior_department_id in ( + + select id from ( + select t1.id , name, t1.type, if(find_in_set(superior_department_id, @pids) > 0 or id=@pids, @pids:=concat(@pids, ',', id), 0) as ischild + from + (select id, name, type, superior_department_id from t_ht_position where is_del = 0 ORDER BY superior_department_id, id) t1, + (select @pids := #{recursionId,jdbcType=BIGINT}) t2 + ) t3 where t3.type <> 3 and ischild != 0 + ) + + order by d.audit_state, d.create_time desc + + + + + \ No newline at end of file diff --git a/question/src/main/resources/mapper_dao/HtDoctorDao.xml b/question/src/main/resources/mapper_dao/HtDoctorDao.xml new file mode 100644 index 00000000..3c11d8d1 --- /dev/null +++ b/question/src/main/resources/mapper_dao/HtDoctorDao.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/question/src/main/resources/mapper_dao/HtPatientCanvasDao.xml b/question/src/main/resources/mapper_dao/HtPatientCanvasDao.xml new file mode 100644 index 00000000..8a8f6b3a --- /dev/null +++ b/question/src/main/resources/mapper_dao/HtPatientCanvasDao.xml @@ -0,0 +1,16 @@ + + + + + + + \ No newline at end of file diff --git a/question/src/main/resources/mapper_dao/HtPatientReportDao.xml b/question/src/main/resources/mapper_dao/HtPatientReportDao.xml new file mode 100644 index 00000000..950e170c --- /dev/null +++ b/question/src/main/resources/mapper_dao/HtPatientReportDao.xml @@ -0,0 +1,229 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/question/src/main/resources/mapper_dao/HtPatientScoreDao.xml b/question/src/main/resources/mapper_dao/HtPatientScoreDao.xml new file mode 100644 index 00000000..71c4f8b5 --- /dev/null +++ b/question/src/main/resources/mapper_dao/HtPatientScoreDao.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + 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) + values + + (#{score.id,jdbcType=BIGINT}, #{score.patientReportId,jdbcType=BIGINT}, #{score.patientId,jdbcType=BIGINT}, + #{score.questionParentCode,jdbcType=VARCHAR}, #{score.questionId,jdbcType=BIGINT}, #{score.optionId,jdbcType=BIGINT}, + #{score.optionName,jdbcType=VARCHAR}, #{score.score,jdbcType=INTEGER}, #{score.type,jdbcType=TINYINT}, + #{score.answer,jdbcType=VARCHAR}, #{score.remark,jdbcType=VARCHAR}, now()) + + + + \ No newline at end of file diff --git a/question/src/main/resources/mapper_dao/HtPositionDao.xml b/question/src/main/resources/mapper_dao/HtPositionDao.xml new file mode 100644 index 00000000..cdd3e3d3 --- /dev/null +++ b/question/src/main/resources/mapper_dao/HtPositionDao.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + replace into t_ht_position (id, type, name, + superior_department_id, superior_id, relevancy, + has_manage, has_audit, remark, + create_time, update_time, is_del + )values + + (#{position.id,jdbcType=BIGINT}, #{position.type,jdbcType=TINYINT}, #{position.name,jdbcType=VARCHAR}, + #{position.superiorDepartmentId,jdbcType=BIGINT}, #{position.superiorId,jdbcType=BIGINT}, #{position.relevancy,jdbcType=VARCHAR}, + #{position.hasManage,jdbcType=TINYINT}, #{position.hasAudit,jdbcType=TINYINT}, #{position.remark,jdbcType=VARCHAR}, + #{position.createTime,jdbcType=TIMESTAMP}, now(), 0 + ) + + + + + + + + \ No newline at end of file diff --git a/question/src/main/resources/mapper_dao/HtQuestionDao.xml b/question/src/main/resources/mapper_dao/HtQuestionDao.xml new file mode 100644 index 00000000..eac8f7ea --- /dev/null +++ b/question/src/main/resources/mapper_dao/HtQuestionDao.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + replace into t_ht_question (id, evaluation_code, parent_code, + sort, question, type, + record_type, record_content, relation_code, + operate_type, recode_starttime, time_wabei, + allow_clear, clear_times, timing_length, + remark, create_time, update_time, + is_del) + values + + (#{question.id,jdbcType=BIGINT}, #{question.evaluationCode,jdbcType=VARCHAR}, #{question.parentCode,jdbcType=VARCHAR}, + #{question.sort,jdbcType=INTEGER}, #{question.question,jdbcType=VARCHAR}, #{question.type,jdbcType=TINYINT}, + #{question.recordType,jdbcType=VARCHAR}, #{question.recordContent,jdbcType=VARCHAR}, #{question.relationCode,jdbcType=VARCHAR}, + #{question.operateType,jdbcType=TINYINT}, #{question.recodeStarttime,jdbcType=TINYINT}, #{question.timeWabei,jdbcType=TINYINT}, + #{question.allowClear,jdbcType=TINYINT}, #{question.clearTimes,jdbcType=INTEGER}, #{question.timingLength,jdbcType=INTEGER}, + #{question.remark,jdbcType=VARCHAR}, #{question.createTime,jdbcType=TIMESTAMP}, now(), 0 ) + + + + + \ No newline at end of file diff --git a/question/src/main/resources/mapper_dao/HtQuestionIntroducerDao.xml b/question/src/main/resources/mapper_dao/HtQuestionIntroducerDao.xml new file mode 100644 index 00000000..4ca862c0 --- /dev/null +++ b/question/src/main/resources/mapper_dao/HtQuestionIntroducerDao.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + replace into t_ht_question_introducer (id, question_id, content, + sort, remark, create_time, + update_time, is_del) + values + + (#{intorduce.id,jdbcType=BIGINT}, #{intorduce.questionId,jdbcType=BIGINT}, #{intorduce.content,jdbcType=VARCHAR}, + #{intorduce.sort,jdbcType=INTEGER}, #{intorduce.remark,jdbcType=VARCHAR}, #{intorduce.createTime,jdbcType=TIMESTAMP}, + now(), 0) + + + + \ No newline at end of file diff --git a/question/src/main/resources/mapper_dao/HtQuestionOptionDao.xml b/question/src/main/resources/mapper_dao/HtQuestionOptionDao.xml new file mode 100644 index 00000000..b1ae1cb8 --- /dev/null +++ b/question/src/main/resources/mapper_dao/HtQuestionOptionDao.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + replace into t_ht_question_option (id, question_id, sort, + type, name, score, + display, remark, create_time, + update_time, is_del) + values + + (#{option.id,jdbcType=BIGINT}, #{option.questionId,jdbcType=BIGINT}, #{option.sort,jdbcType=INTEGER}, + #{option.type,jdbcType=VARCHAR}, #{option.name,jdbcType=VARCHAR}, #{option.score,jdbcType=INTEGER}, + #{option.display,jdbcType=VARCHAR}, #{option.remark,jdbcType=VARCHAR}, #{option.createTime,jdbcType=TIMESTAMP}, + now(),0) + + + + + + \ No newline at end of file diff --git a/question/src/main/resources/mapper_dao/HtQuestionScoringRuleDao.xml b/question/src/main/resources/mapper_dao/HtQuestionScoringRuleDao.xml new file mode 100644 index 00000000..c5ed68fa --- /dev/null +++ b/question/src/main/resources/mapper_dao/HtQuestionScoringRuleDao.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + replace into t_ht_question_scoring_rule (id, question_id, type, + detail, remark, create_time, + update_time, is_del) + values + + (#{rule.id,jdbcType=BIGINT}, #{rule.questionId,jdbcType=BIGINT}, #{rule.type,jdbcType=TINYINT}, + #{rule.detail,jdbcType=VARCHAR}, #{rule.remark,jdbcType=VARCHAR}, #{rule.createTime,jdbcType=TIMESTAMP}, + now(), 0) + + + + \ No newline at end of file diff --git a/question/src/main/resources/mapper_dao/HtReportDao.xml b/question/src/main/resources/mapper_dao/HtReportDao.xml new file mode 100644 index 00000000..fbd671bd --- /dev/null +++ b/question/src/main/resources/mapper_dao/HtReportDao.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + replace into t_ht_report (id, code, name, + parent_code, description, total_score, + type, is_show, sort, + remark, create_time, update_time, + is_del) + values + + (#{report.id,jdbcType=BIGINT}, #{report.code,jdbcType=VARCHAR}, #{report.name,jdbcType=VARCHAR}, + #{report.parentCode,jdbcType=VARCHAR}, #{report.description,jdbcType=VARCHAR}, #{report.totalScore,jdbcType=INTEGER}, + #{report.type,jdbcType=TINYINT}, #{report.isShow,jdbcType=TINYINT}, #{report.sort,jdbcType=INTEGER}, + #{report.remark,jdbcType=VARCHAR}, #{report.createTime,jdbcType=TIMESTAMP}, now(), 0) + + + + + + + + \ No newline at end of file diff --git a/question/src/main/resources/mapper_dao/HtTitleDao.xml b/question/src/main/resources/mapper_dao/HtTitleDao.xml new file mode 100644 index 00000000..b6f4f6a7 --- /dev/null +++ b/question/src/main/resources/mapper_dao/HtTitleDao.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + replace into t_ht_title (id, type, title, + superidor_id, remark, create_time, + update_time, is_del)values + + (#{title.id,jdbcType=BIGINT}, #{title.type,jdbcType=TINYINT}, #{title.title,jdbcType=VARCHAR}, + #{title.superidorId,jdbcType=BIGINT}, #{title.remark,jdbcType=VARCHAR}, + #{title.createTime,jdbcType=TIMESTAMP}, now(), 0 + ) + + + + + \ No newline at end of file diff --git a/question/src/main/resources/mapper_raw/HtDoctorAuditMapper.xml b/question/src/main/resources/mapper_raw/HtDoctorAuditMapper.xml new file mode 100644 index 00000000..95e1029f --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtDoctorAuditMapper.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + 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, doctor_id, auditor_id, remark, create_time, update_time, is_del + + + + + delete from t_ht_doctor_audit + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_doctor_audit + + + + + + insert into t_ht_doctor_audit (id, doctor_id, auditor_id, + remark, create_time, update_time, + is_del) + values (#{id,jdbcType=BIGINT}, #{doctorId,jdbcType=BIGINT}, #{auditorId,jdbcType=BIGINT}, + #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, + #{isDel,jdbcType=TINYINT}) + + + insert into t_ht_doctor_audit + + + id, + + + doctor_id, + + + auditor_id, + + + remark, + + + create_time, + + + update_time, + + + is_del, + + + + + #{id,jdbcType=BIGINT}, + + + #{doctorId,jdbcType=BIGINT}, + + + #{auditorId,jdbcType=BIGINT}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + + + + update t_ht_doctor_audit + + + id = #{record.id,jdbcType=BIGINT}, + + + doctor_id = #{record.doctorId,jdbcType=BIGINT}, + + + auditor_id = #{record.auditorId,jdbcType=BIGINT}, + + + 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_doctor_audit + set id = #{record.id,jdbcType=BIGINT}, + doctor_id = #{record.doctorId,jdbcType=BIGINT}, + auditor_id = #{record.auditorId,jdbcType=BIGINT}, + 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_doctor_audit + + + doctor_id = #{doctorId,jdbcType=BIGINT}, + + + auditor_id = #{auditorId,jdbcType=BIGINT}, + + + 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_doctor_audit + set doctor_id = #{doctorId,jdbcType=BIGINT}, + auditor_id = #{auditorId,jdbcType=BIGINT}, + 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/question/src/main/resources/mapper_raw/HtDoctorMapper.xml b/question/src/main/resources/mapper_raw/HtDoctorMapper.xml new file mode 100644 index 00000000..cfe72e0a --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtDoctorMapper.xml @@ -0,0 +1,353 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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, user_id, position_id, title_id, name, sex, age, auditor_id, audit_state, remark, + share_patient_edit, create_time, update_time, is_del + + + + + delete from t_ht_doctor + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_doctor + + + + + + insert into t_ht_doctor (id, user_id, position_id, + title_id, name, sex, + age, auditor_id, audit_state, + remark, share_patient_edit, create_time, + update_time, is_del) + values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{positionId,jdbcType=BIGINT}, + #{titleId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{sex,jdbcType=TINYINT}, + #{age,jdbcType=INTEGER}, #{auditorId,jdbcType=BIGINT}, #{auditState,jdbcType=TINYINT}, + #{remark,jdbcType=VARCHAR}, #{sharePatientEdit,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT}) + + + insert into t_ht_doctor + + + id, + + + user_id, + + + position_id, + + + title_id, + + + name, + + + sex, + + + age, + + + auditor_id, + + + audit_state, + + + remark, + + + share_patient_edit, + + + create_time, + + + update_time, + + + is_del, + + + + + #{id,jdbcType=BIGINT}, + + + #{userId,jdbcType=BIGINT}, + + + #{positionId,jdbcType=BIGINT}, + + + #{titleId,jdbcType=BIGINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{sex,jdbcType=TINYINT}, + + + #{age,jdbcType=INTEGER}, + + + #{auditorId,jdbcType=BIGINT}, + + + #{auditState,jdbcType=TINYINT}, + + + #{remark,jdbcType=VARCHAR}, + + + #{sharePatientEdit,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + + + + update t_ht_doctor + + + id = #{record.id,jdbcType=BIGINT}, + + + user_id = #{record.userId,jdbcType=BIGINT}, + + + position_id = #{record.positionId,jdbcType=BIGINT}, + + + title_id = #{record.titleId,jdbcType=BIGINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + sex = #{record.sex,jdbcType=TINYINT}, + + + age = #{record.age,jdbcType=INTEGER}, + + + auditor_id = #{record.auditorId,jdbcType=BIGINT}, + + + audit_state = #{record.auditState,jdbcType=TINYINT}, + + + remark = #{record.remark,jdbcType=VARCHAR}, + + + share_patient_edit = #{record.sharePatientEdit,jdbcType=VARCHAR}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + + + is_del = #{record.isDel,jdbcType=TINYINT}, + + + + + + + + update t_ht_doctor + set id = #{record.id,jdbcType=BIGINT}, + user_id = #{record.userId,jdbcType=BIGINT}, + position_id = #{record.positionId,jdbcType=BIGINT}, + title_id = #{record.titleId,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + sex = #{record.sex,jdbcType=TINYINT}, + age = #{record.age,jdbcType=INTEGER}, + auditor_id = #{record.auditorId,jdbcType=BIGINT}, + audit_state = #{record.auditState,jdbcType=TINYINT}, + remark = #{record.remark,jdbcType=VARCHAR}, + share_patient_edit = #{record.sharePatientEdit,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + is_del = #{record.isDel,jdbcType=TINYINT} + + + + + + update t_ht_doctor + + + user_id = #{userId,jdbcType=BIGINT}, + + + position_id = #{positionId,jdbcType=BIGINT}, + + + title_id = #{titleId,jdbcType=BIGINT}, + + + name = #{name,jdbcType=VARCHAR}, + + + sex = #{sex,jdbcType=TINYINT}, + + + age = #{age,jdbcType=INTEGER}, + + + auditor_id = #{auditorId,jdbcType=BIGINT}, + + + audit_state = #{auditState,jdbcType=TINYINT}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + share_patient_edit = #{sharePatientEdit,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_doctor + set user_id = #{userId,jdbcType=BIGINT}, + position_id = #{positionId,jdbcType=BIGINT}, + title_id = #{titleId,jdbcType=BIGINT}, + name = #{name,jdbcType=VARCHAR}, + sex = #{sex,jdbcType=TINYINT}, + age = #{age,jdbcType=INTEGER}, + auditor_id = #{auditorId,jdbcType=BIGINT}, + audit_state = #{auditState,jdbcType=TINYINT}, + remark = #{remark,jdbcType=VARCHAR}, + share_patient_edit = #{sharePatientEdit,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/question/src/main/resources/mapper_raw/HtOperationLogMapper.xml b/question/src/main/resources/mapper_raw/HtOperationLogMapper.xml new file mode 100644 index 00000000..a1e610de --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtOperationLogMapper.xml @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + 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, user_id, type, table_name, data_id, content, remark, create_time, update_time, + is_del + + + + + delete from t_ht_opretion_log + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_opretion_log + + + + + + insert into t_ht_opretion_log (id, user_id, type, + table_name, data_id, content, + remark, create_time, update_time, + is_del) + values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{type,jdbcType=TINYINT}, + #{tableName,jdbcType=VARCHAR}, #{dataId,jdbcType=VARCHAR}, #{content,jdbcType=VARCHAR}, + #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, + #{isDel,jdbcType=TINYINT}) + + + insert into t_ht_opretion_log + + + id, + + + user_id, + + + type, + + + table_name, + + + data_id, + + + content, + + + remark, + + + create_time, + + + update_time, + + + is_del, + + + + + #{id,jdbcType=BIGINT}, + + + #{userId,jdbcType=BIGINT}, + + + #{type,jdbcType=TINYINT}, + + + #{tableName,jdbcType=VARCHAR}, + + + #{dataId,jdbcType=VARCHAR}, + + + #{content,jdbcType=VARCHAR}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + + + + update t_ht_opretion_log + + + id = #{record.id,jdbcType=BIGINT}, + + + user_id = #{record.userId,jdbcType=BIGINT}, + + + type = #{record.type,jdbcType=TINYINT}, + + + table_name = #{record.tableName,jdbcType=VARCHAR}, + + + data_id = #{record.dataId,jdbcType=VARCHAR}, + + + content = #{record.content,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_opretion_log + set id = #{record.id,jdbcType=BIGINT}, + user_id = #{record.userId,jdbcType=BIGINT}, + type = #{record.type,jdbcType=TINYINT}, + table_name = #{record.tableName,jdbcType=VARCHAR}, + data_id = #{record.dataId,jdbcType=VARCHAR}, + content = #{record.content,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_opretion_log + + + user_id = #{userId,jdbcType=BIGINT}, + + + type = #{type,jdbcType=TINYINT}, + + + table_name = #{tableName,jdbcType=VARCHAR}, + + + data_id = #{dataId,jdbcType=VARCHAR}, + + + content = #{content,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_opretion_log + set user_id = #{userId,jdbcType=BIGINT}, + type = #{type,jdbcType=TINYINT}, + table_name = #{tableName,jdbcType=VARCHAR}, + data_id = #{dataId,jdbcType=VARCHAR}, + content = #{content,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/question/src/main/resources/mapper_raw/HtPatientAcpMapper.xml b/question/src/main/resources/mapper_raw/HtPatientAcpMapper.xml new file mode 100644 index 00000000..b5ffc39c --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtPatientAcpMapper.xml @@ -0,0 +1,398 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, patient_id, ct, mri, hcy, vb12, folic_acid, tt3, tt4, tsh, remark, create_time, + update_time, is_del, recorder, 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/question/src/main/resources/mapper_raw/HtPatientBodyMapper.xml b/question/src/main/resources/mapper_raw/HtPatientBodyMapper.xml new file mode 100644 index 00000000..4abbb5a9 --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtPatientBodyMapper.xml @@ -0,0 +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_id, height, weight, waistline, blood_pressure_shrink, blood_pressure_diastole, + resting_heart_rate, vision, auditory, remark, create_time, update_time, is_del, recorder + + + + + delete from t_ht_patient_body + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_patient_body + + + + + + insert into t_ht_patient_body (id, patient_id, height, + weight, waistline, blood_pressure_shrink, + blood_pressure_diastole, resting_heart_rate, + vision, auditory, remark, + create_time, update_time, is_del, + recorder) + values (#{id,jdbcType=BIGINT}, #{patientId,jdbcType=BIGINT}, #{height,jdbcType=VARCHAR}, + #{weight,jdbcType=VARCHAR}, #{waistline,jdbcType=VARCHAR}, #{bloodPressureShrink,jdbcType=VARCHAR}, + #{bloodPressureDiastole,jdbcType=VARCHAR}, #{restingHeartRate,jdbcType=VARCHAR}, + #{vision,jdbcType=TINYINT}, #{auditory,jdbcType=TINYINT}, #{remark,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT}, + #{recorder,jdbcType=BIGINT}) + + + insert into t_ht_patient_body + + + id, + + + patient_id, + + + height, + + + weight, + + + waistline, + + + blood_pressure_shrink, + + + blood_pressure_diastole, + + + resting_heart_rate, + + + vision, + + + auditory, + + + remark, + + + create_time, + + + update_time, + + + is_del, + + + recorder, + + + + + #{id,jdbcType=BIGINT}, + + + #{patientId,jdbcType=BIGINT}, + + + #{height,jdbcType=VARCHAR}, + + + #{weight,jdbcType=VARCHAR}, + + + #{waistline,jdbcType=VARCHAR}, + + + #{bloodPressureShrink,jdbcType=VARCHAR}, + + + #{bloodPressureDiastole,jdbcType=VARCHAR}, + + + #{restingHeartRate,jdbcType=VARCHAR}, + + + #{vision,jdbcType=TINYINT}, + + + #{auditory,jdbcType=TINYINT}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + #{recorder,jdbcType=BIGINT}, + + + + + + update t_ht_patient_body + + + id = #{record.id,jdbcType=BIGINT}, + + + patient_id = #{record.patientId,jdbcType=BIGINT}, + + + height = #{record.height,jdbcType=VARCHAR}, + + + weight = #{record.weight,jdbcType=VARCHAR}, + + + waistline = #{record.waistline,jdbcType=VARCHAR}, + + + blood_pressure_shrink = #{record.bloodPressureShrink,jdbcType=VARCHAR}, + + + blood_pressure_diastole = #{record.bloodPressureDiastole,jdbcType=VARCHAR}, + + + resting_heart_rate = #{record.restingHeartRate,jdbcType=VARCHAR}, + + + vision = #{record.vision,jdbcType=TINYINT}, + + + auditory = #{record.auditory,jdbcType=TINYINT}, + + + 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_body + set id = #{record.id,jdbcType=BIGINT}, + patient_id = #{record.patientId,jdbcType=BIGINT}, + height = #{record.height,jdbcType=VARCHAR}, + weight = #{record.weight,jdbcType=VARCHAR}, + waistline = #{record.waistline,jdbcType=VARCHAR}, + blood_pressure_shrink = #{record.bloodPressureShrink,jdbcType=VARCHAR}, + blood_pressure_diastole = #{record.bloodPressureDiastole,jdbcType=VARCHAR}, + resting_heart_rate = #{record.restingHeartRate,jdbcType=VARCHAR}, + vision = #{record.vision,jdbcType=TINYINT}, + auditory = #{record.auditory,jdbcType=TINYINT}, + 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_body + + + patient_id = #{patientId,jdbcType=BIGINT}, + + + height = #{height,jdbcType=VARCHAR}, + + + weight = #{weight,jdbcType=VARCHAR}, + + + waistline = #{waistline,jdbcType=VARCHAR}, + + + blood_pressure_shrink = #{bloodPressureShrink,jdbcType=VARCHAR}, + + + blood_pressure_diastole = #{bloodPressureDiastole,jdbcType=VARCHAR}, + + + resting_heart_rate = #{restingHeartRate,jdbcType=VARCHAR}, + + + vision = #{vision,jdbcType=TINYINT}, + + + auditory = #{auditory,jdbcType=TINYINT}, + + + 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_body + set patient_id = #{patientId,jdbcType=BIGINT}, + height = #{height,jdbcType=VARCHAR}, + weight = #{weight,jdbcType=VARCHAR}, + waistline = #{waistline,jdbcType=VARCHAR}, + blood_pressure_shrink = #{bloodPressureShrink,jdbcType=VARCHAR}, + blood_pressure_diastole = #{bloodPressureDiastole,jdbcType=VARCHAR}, + resting_heart_rate = #{restingHeartRate,jdbcType=VARCHAR}, + vision = #{vision,jdbcType=TINYINT}, + auditory = #{auditory,jdbcType=TINYINT}, + 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} + + \ No newline at end of file diff --git a/question/src/main/resources/mapper_raw/HtPatientCanvasLineMapper.xml b/question/src/main/resources/mapper_raw/HtPatientCanvasLineMapper.xml new file mode 100644 index 00000000..6940bc7d --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtPatientCanvasLineMapper.xml @@ -0,0 +1,270 @@ + + + + + + + + + + + + + + + + + + + + + + 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_canvas_id, create_time, update_time, is_del + + + points + + + + + + delete from t_ht_patient_canvas_line + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_patient_canvas_line + + + + + + insert into t_ht_patient_canvas_line (id, patient_canvas_id, create_time, + update_time, is_del, points + ) + values (#{id,jdbcType=BIGINT}, #{patientCanvasId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, + #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT}, #{points,jdbcType=LONGVARCHAR} + ) + + + insert into t_ht_patient_canvas_line + + + id, + + + patient_canvas_id, + + + create_time, + + + update_time, + + + is_del, + + + points, + + + + + #{id,jdbcType=BIGINT}, + + + #{patientCanvasId,jdbcType=BIGINT}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + #{points,jdbcType=LONGVARCHAR}, + + + + + + update t_ht_patient_canvas_line + + + id = #{record.id,jdbcType=BIGINT}, + + + patient_canvas_id = #{record.patientCanvasId,jdbcType=BIGINT}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + + + is_del = #{record.isDel,jdbcType=TINYINT}, + + + points = #{record.points,jdbcType=LONGVARCHAR}, + + + + + + + + update t_ht_patient_canvas_line + set id = #{record.id,jdbcType=BIGINT}, + patient_canvas_id = #{record.patientCanvasId,jdbcType=BIGINT}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + is_del = #{record.isDel,jdbcType=TINYINT}, + points = #{record.points,jdbcType=LONGVARCHAR} + + + + + + update t_ht_patient_canvas_line + set id = #{record.id,jdbcType=BIGINT}, + patient_canvas_id = #{record.patientCanvasId,jdbcType=BIGINT}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + is_del = #{record.isDel,jdbcType=TINYINT} + + + + + + update t_ht_patient_canvas_line + + + patient_canvas_id = #{patientCanvasId,jdbcType=BIGINT}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + is_del = #{isDel,jdbcType=TINYINT}, + + + points = #{points,jdbcType=LONGVARCHAR}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_ht_patient_canvas_line + set patient_canvas_id = #{patientCanvasId,jdbcType=BIGINT}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_time = #{updateTime,jdbcType=TIMESTAMP}, + is_del = #{isDel,jdbcType=TINYINT}, + points = #{points,jdbcType=LONGVARCHAR} + where id = #{id,jdbcType=BIGINT} + + + update t_ht_patient_canvas_line + set patient_canvas_id = #{patientCanvasId,jdbcType=BIGINT}, + 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/question/src/main/resources/mapper_raw/HtPatientCanvasMapper.xml b/question/src/main/resources/mapper_raw/HtPatientCanvasMapper.xml new file mode 100644 index 00000000..1d395b88 --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtPatientCanvasMapper.xml @@ -0,0 +1,338 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + 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, question_id, begin_time, canvas_width, canvas_height, line_color, + line_width, create_time, update_time, is_del, open_canvas_time, beyond_proportion + + + + + delete from t_ht_patient_canvas + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_patient_canvas + + + + + + insert into t_ht_patient_canvas (id, patient_report_id, question_id, + begin_time, canvas_width, canvas_height, + line_color, line_width, create_time, + update_time, is_del, open_canvas_time, + beyond_proportion) + values (#{id,jdbcType=BIGINT}, #{patientReportId,jdbcType=BIGINT}, #{questionId,jdbcType=BIGINT}, + #{beginTime,jdbcType=BIGINT}, #{canvasWidth,jdbcType=INTEGER}, #{canvasHeight,jdbcType=INTEGER}, + #{lineColor,jdbcType=VARCHAR}, #{lineWidth,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, + #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT}, #{openCanvasTime,jdbcType=BIGINT}, + #{beyondProportion,jdbcType=VARCHAR}) + + + insert into t_ht_patient_canvas + + + id, + + + patient_report_id, + + + question_id, + + + begin_time, + + + canvas_width, + + + canvas_height, + + + line_color, + + + line_width, + + + create_time, + + + update_time, + + + is_del, + + + open_canvas_time, + + + beyond_proportion, + + + + + #{id,jdbcType=BIGINT}, + + + #{patientReportId,jdbcType=BIGINT}, + + + #{questionId,jdbcType=BIGINT}, + + + #{beginTime,jdbcType=BIGINT}, + + + #{canvasWidth,jdbcType=INTEGER}, + + + #{canvasHeight,jdbcType=INTEGER}, + + + #{lineColor,jdbcType=VARCHAR}, + + + #{lineWidth,jdbcType=INTEGER}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + #{openCanvasTime,jdbcType=BIGINT}, + + + #{beyondProportion,jdbcType=VARCHAR}, + + + + + + update t_ht_patient_canvas + + + id = #{record.id,jdbcType=BIGINT}, + + + patient_report_id = #{record.patientReportId,jdbcType=BIGINT}, + + + question_id = #{record.questionId,jdbcType=BIGINT}, + + + begin_time = #{record.beginTime,jdbcType=BIGINT}, + + + canvas_width = #{record.canvasWidth,jdbcType=INTEGER}, + + + canvas_height = #{record.canvasHeight,jdbcType=INTEGER}, + + + line_color = #{record.lineColor,jdbcType=VARCHAR}, + + + line_width = #{record.lineWidth,jdbcType=INTEGER}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + + + is_del = #{record.isDel,jdbcType=TINYINT}, + + + open_canvas_time = #{record.openCanvasTime,jdbcType=BIGINT}, + + + beyond_proportion = #{record.beyondProportion,jdbcType=VARCHAR}, + + + + + + + + update t_ht_patient_canvas + set id = #{record.id,jdbcType=BIGINT}, + patient_report_id = #{record.patientReportId,jdbcType=BIGINT}, + question_id = #{record.questionId,jdbcType=BIGINT}, + begin_time = #{record.beginTime,jdbcType=BIGINT}, + canvas_width = #{record.canvasWidth,jdbcType=INTEGER}, + canvas_height = #{record.canvasHeight,jdbcType=INTEGER}, + line_color = #{record.lineColor,jdbcType=VARCHAR}, + line_width = #{record.lineWidth,jdbcType=INTEGER}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + is_del = #{record.isDel,jdbcType=TINYINT}, + open_canvas_time = #{record.openCanvasTime,jdbcType=BIGINT}, + beyond_proportion = #{record.beyondProportion,jdbcType=VARCHAR} + + + + + + update t_ht_patient_canvas + + + patient_report_id = #{patientReportId,jdbcType=BIGINT}, + + + question_id = #{questionId,jdbcType=BIGINT}, + + + begin_time = #{beginTime,jdbcType=BIGINT}, + + + canvas_width = #{canvasWidth,jdbcType=INTEGER}, + + + canvas_height = #{canvasHeight,jdbcType=INTEGER}, + + + line_color = #{lineColor,jdbcType=VARCHAR}, + + + line_width = #{lineWidth,jdbcType=INTEGER}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + is_del = #{isDel,jdbcType=TINYINT}, + + + open_canvas_time = #{openCanvasTime,jdbcType=BIGINT}, + + + beyond_proportion = #{beyondProportion,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_ht_patient_canvas + set patient_report_id = #{patientReportId,jdbcType=BIGINT}, + question_id = #{questionId,jdbcType=BIGINT}, + begin_time = #{beginTime,jdbcType=BIGINT}, + canvas_width = #{canvasWidth,jdbcType=INTEGER}, + canvas_height = #{canvasHeight,jdbcType=INTEGER}, + line_color = #{lineColor,jdbcType=VARCHAR}, + line_width = #{lineWidth,jdbcType=INTEGER}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_time = #{updateTime,jdbcType=TIMESTAMP}, + is_del = #{isDel,jdbcType=TINYINT}, + open_canvas_time = #{openCanvasTime,jdbcType=BIGINT}, + beyond_proportion = #{beyondProportion,jdbcType=VARCHAR} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/question/src/main/resources/mapper_raw/HtPatientFamilyIllnessMapper.xml b/question/src/main/resources/mapper_raw/HtPatientFamilyIllnessMapper.xml new file mode 100644 index 00000000..ab5366eb --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtPatientFamilyIllnessMapper.xml @@ -0,0 +1,323 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + 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, name, relation, diagnose, onset_age, now_age, remark, create_time, + update_time, is_del, recorder + + + + + delete from t_ht_patient_family_illness + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_patient_family_illness + + + + + + insert into t_ht_patient_family_illness (id, patient_id, name, + relation, diagnose, onset_age, + now_age, remark, create_time, + update_time, is_del, recorder + ) + values (#{id,jdbcType=BIGINT}, #{patientId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, + #{relation,jdbcType=VARCHAR}, #{diagnose,jdbcType=VARCHAR}, #{onsetAge,jdbcType=INTEGER}, + #{nowAge,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT}, #{recorder,jdbcType=BIGINT} + ) + + + insert into t_ht_patient_family_illness + + + id, + + + patient_id, + + + name, + + + relation, + + + diagnose, + + + onset_age, + + + now_age, + + + remark, + + + create_time, + + + update_time, + + + is_del, + + + recorder, + + + + + #{id,jdbcType=BIGINT}, + + + #{patientId,jdbcType=BIGINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{relation,jdbcType=VARCHAR}, + + + #{diagnose,jdbcType=VARCHAR}, + + + #{onsetAge,jdbcType=INTEGER}, + + + #{nowAge,jdbcType=INTEGER}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + #{recorder,jdbcType=BIGINT}, + + + + + + update t_ht_patient_family_illness + + + id = #{record.id,jdbcType=BIGINT}, + + + patient_id = #{record.patientId,jdbcType=BIGINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + relation = #{record.relation,jdbcType=VARCHAR}, + + + diagnose = #{record.diagnose,jdbcType=VARCHAR}, + + + onset_age = #{record.onsetAge,jdbcType=INTEGER}, + + + now_age = #{record.nowAge,jdbcType=INTEGER}, + + + 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_family_illness + set id = #{record.id,jdbcType=BIGINT}, + patient_id = #{record.patientId,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + relation = #{record.relation,jdbcType=VARCHAR}, + diagnose = #{record.diagnose,jdbcType=VARCHAR}, + onset_age = #{record.onsetAge,jdbcType=INTEGER}, + now_age = #{record.nowAge,jdbcType=INTEGER}, + 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_family_illness + + + patient_id = #{patientId,jdbcType=BIGINT}, + + + name = #{name,jdbcType=VARCHAR}, + + + relation = #{relation,jdbcType=VARCHAR}, + + + diagnose = #{diagnose,jdbcType=VARCHAR}, + + + onset_age = #{onsetAge,jdbcType=INTEGER}, + + + now_age = #{nowAge,jdbcType=INTEGER}, + + + 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_family_illness + set patient_id = #{patientId,jdbcType=BIGINT}, + name = #{name,jdbcType=VARCHAR}, + relation = #{relation,jdbcType=VARCHAR}, + diagnose = #{diagnose,jdbcType=VARCHAR}, + onset_age = #{onsetAge,jdbcType=INTEGER}, + now_age = #{nowAge,jdbcType=INTEGER}, + 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} + + \ No newline at end of file diff --git a/question/src/main/resources/mapper_raw/HtPatientFamilyMapper.xml b/question/src/main/resources/mapper_raw/HtPatientFamilyMapper.xml new file mode 100644 index 00000000..62899b6f --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtPatientFamilyMapper.xml @@ -0,0 +1,338 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + 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, name, age, sex, educational_status, relation, is_live_together, remark, + create_time, update_time, is_del, recorder + + + + + delete from t_ht_patient_family + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_patient_family + + + + + + insert into t_ht_patient_family (id, patient_id, name, + age, sex, educational_status, + relation, is_live_together, remark, + create_time, update_time, is_del, + recorder) + values (#{id,jdbcType=BIGINT}, #{patientId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, + #{age,jdbcType=TINYINT}, #{sex,jdbcType=TINYINT}, #{educationalStatus,jdbcType=TINYINT}, + #{relation,jdbcType=TINYINT}, #{isLiveTogether,jdbcType=TINYINT}, #{remark,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT}, + #{recorder,jdbcType=BIGINT}) + + + insert into t_ht_patient_family + + + id, + + + patient_id, + + + name, + + + age, + + + sex, + + + educational_status, + + + relation, + + + is_live_together, + + + remark, + + + create_time, + + + update_time, + + + is_del, + + + recorder, + + + + + #{id,jdbcType=BIGINT}, + + + #{patientId,jdbcType=BIGINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{age,jdbcType=TINYINT}, + + + #{sex,jdbcType=TINYINT}, + + + #{educationalStatus,jdbcType=TINYINT}, + + + #{relation,jdbcType=TINYINT}, + + + #{isLiveTogether,jdbcType=TINYINT}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + #{recorder,jdbcType=BIGINT}, + + + + + + update t_ht_patient_family + + + id = #{record.id,jdbcType=BIGINT}, + + + patient_id = #{record.patientId,jdbcType=BIGINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + age = #{record.age,jdbcType=TINYINT}, + + + sex = #{record.sex,jdbcType=TINYINT}, + + + educational_status = #{record.educationalStatus,jdbcType=TINYINT}, + + + relation = #{record.relation,jdbcType=TINYINT}, + + + is_live_together = #{record.isLiveTogether,jdbcType=TINYINT}, + + + 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_family + set id = #{record.id,jdbcType=BIGINT}, + patient_id = #{record.patientId,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + age = #{record.age,jdbcType=TINYINT}, + sex = #{record.sex,jdbcType=TINYINT}, + educational_status = #{record.educationalStatus,jdbcType=TINYINT}, + relation = #{record.relation,jdbcType=TINYINT}, + is_live_together = #{record.isLiveTogether,jdbcType=TINYINT}, + 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_family + + + patient_id = #{patientId,jdbcType=BIGINT}, + + + name = #{name,jdbcType=VARCHAR}, + + + age = #{age,jdbcType=TINYINT}, + + + sex = #{sex,jdbcType=TINYINT}, + + + educational_status = #{educationalStatus,jdbcType=TINYINT}, + + + relation = #{relation,jdbcType=TINYINT}, + + + is_live_together = #{isLiveTogether,jdbcType=TINYINT}, + + + 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_family + set patient_id = #{patientId,jdbcType=BIGINT}, + name = #{name,jdbcType=VARCHAR}, + age = #{age,jdbcType=TINYINT}, + sex = #{sex,jdbcType=TINYINT}, + educational_status = #{educationalStatus,jdbcType=TINYINT}, + relation = #{relation,jdbcType=TINYINT}, + is_live_together = #{isLiveTogether,jdbcType=TINYINT}, + 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} + + \ No newline at end of file diff --git a/question/src/main/resources/mapper_raw/HtPatientFollowUpMapper.xml b/question/src/main/resources/mapper_raw/HtPatientFollowUpMapper.xml new file mode 100644 index 00000000..914df7e9 --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtPatientFollowUpMapper.xml @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + 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, follow_up_datetime, follow_up_times, recorder, diagnose, remark, + create_time, update_time, is_del + + + + + delete from t_ht_patient_follow_up + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_patient_follow_up + + + + + + insert into t_ht_patient_follow_up (id, patient_id, follow_up_datetime, + follow_up_times, recorder, diagnose, + remark, create_time, update_time, + is_del) + values (#{id,jdbcType=BIGINT}, #{patientId,jdbcType=BIGINT}, #{followUpDatetime,jdbcType=TIMESTAMP}, + #{followUpTimes,jdbcType=INTEGER}, #{recorder,jdbcType=BIGINT}, #{diagnose,jdbcType=BIGINT}, + #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, + #{isDel,jdbcType=TINYINT}) + + + insert into t_ht_patient_follow_up + + + id, + + + patient_id, + + + follow_up_datetime, + + + follow_up_times, + + + recorder, + + + diagnose, + + + remark, + + + create_time, + + + update_time, + + + is_del, + + + + + #{id,jdbcType=BIGINT}, + + + #{patientId,jdbcType=BIGINT}, + + + #{followUpDatetime,jdbcType=TIMESTAMP}, + + + #{followUpTimes,jdbcType=INTEGER}, + + + #{recorder,jdbcType=BIGINT}, + + + #{diagnose,jdbcType=BIGINT}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + + + + update t_ht_patient_follow_up + + + id = #{record.id,jdbcType=BIGINT}, + + + patient_id = #{record.patientId,jdbcType=BIGINT}, + + + follow_up_datetime = #{record.followUpDatetime,jdbcType=TIMESTAMP}, + + + follow_up_times = #{record.followUpTimes,jdbcType=INTEGER}, + + + recorder = #{record.recorder,jdbcType=BIGINT}, + + + diagnose = #{record.diagnose,jdbcType=BIGINT}, + + + 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_patient_follow_up + set id = #{record.id,jdbcType=BIGINT}, + patient_id = #{record.patientId,jdbcType=BIGINT}, + follow_up_datetime = #{record.followUpDatetime,jdbcType=TIMESTAMP}, + follow_up_times = #{record.followUpTimes,jdbcType=INTEGER}, + recorder = #{record.recorder,jdbcType=BIGINT}, + diagnose = #{record.diagnose,jdbcType=BIGINT}, + 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_patient_follow_up + + + patient_id = #{patientId,jdbcType=BIGINT}, + + + follow_up_datetime = #{followUpDatetime,jdbcType=TIMESTAMP}, + + + follow_up_times = #{followUpTimes,jdbcType=INTEGER}, + + + recorder = #{recorder,jdbcType=BIGINT}, + + + diagnose = #{diagnose,jdbcType=BIGINT}, + + + 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_patient_follow_up + set patient_id = #{patientId,jdbcType=BIGINT}, + follow_up_datetime = #{followUpDatetime,jdbcType=TIMESTAMP}, + follow_up_times = #{followUpTimes,jdbcType=INTEGER}, + recorder = #{recorder,jdbcType=BIGINT}, + diagnose = #{diagnose,jdbcType=BIGINT}, + 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/question/src/main/resources/mapper_raw/HtPatientIllnessHistoryMapper.xml b/question/src/main/resources/mapper_raw/HtPatientIllnessHistoryMapper.xml new file mode 100644 index 00000000..9d19e995 --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtPatientIllnessHistoryMapper.xml @@ -0,0 +1,638 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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, cardiac_arrest_history, angina, mi, atrial_fibrillation, chf, other_cardiovascular_diseases, + wuis, hcvd, parkinson_disease, epilepsy, brain_trauma, hypertension, diabetes, hlp, + hyperhomocysteinemia, vb12_deficiency, thyroid_disease, copd, asthma, insomnia, sleep_suspend, + ckd, rheumatoid, depression, general_anesthesia_surgery, remark, create_time, update_time, + is_del, recorder + + + + + delete from t_ht_patient_illness_history + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_patient_illness_history + + + + + + insert into t_ht_patient_illness_history (id, patient_id, cardiac_arrest_history, + angina, mi, atrial_fibrillation, + chf, other_cardiovascular_diseases, wuis, + hcvd, parkinson_disease, epilepsy, + brain_trauma, hypertension, diabetes, + hlp, hyperhomocysteinemia, vb12_deficiency, + thyroid_disease, copd, asthma, + insomnia, sleep_suspend, ckd, + rheumatoid, depression, general_anesthesia_surgery, + remark, create_time, update_time, + is_del, recorder) + values (#{id,jdbcType=BIGINT}, #{patientId,jdbcType=BIGINT}, #{cardiacArrestHistory,jdbcType=TINYINT}, + #{angina,jdbcType=TINYINT}, #{mi,jdbcType=TINYINT}, #{atrialFibrillation,jdbcType=TINYINT}, + #{chf,jdbcType=TINYINT}, #{otherCardiovascularDiseases,jdbcType=TINYINT}, #{wuis,jdbcType=TINYINT}, + #{hcvd,jdbcType=TINYINT}, #{parkinsonDisease,jdbcType=TINYINT}, #{epilepsy,jdbcType=TINYINT}, + #{brainTrauma,jdbcType=TINYINT}, #{hypertension,jdbcType=TINYINT}, #{diabetes,jdbcType=TINYINT}, + #{hlp,jdbcType=TINYINT}, #{hyperhomocysteinemia,jdbcType=TINYINT}, #{vb12Deficiency,jdbcType=TINYINT}, + #{thyroidDisease,jdbcType=TINYINT}, #{copd,jdbcType=TINYINT}, #{asthma,jdbcType=TINYINT}, + #{insomnia,jdbcType=TINYINT}, #{sleepSuspend,jdbcType=TINYINT}, #{ckd,jdbcType=TINYINT}, + #{rheumatoid,jdbcType=TINYINT}, #{depression,jdbcType=TINYINT}, #{generalAnesthesiaSurgery,jdbcType=INTEGER}, + #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, + #{isDel,jdbcType=TINYINT}, #{recorder,jdbcType=BIGINT}) + + + insert into t_ht_patient_illness_history + + + id, + + + patient_id, + + + cardiac_arrest_history, + + + angina, + + + mi, + + + atrial_fibrillation, + + + chf, + + + other_cardiovascular_diseases, + + + wuis, + + + hcvd, + + + parkinson_disease, + + + epilepsy, + + + brain_trauma, + + + hypertension, + + + diabetes, + + + hlp, + + + hyperhomocysteinemia, + + + vb12_deficiency, + + + thyroid_disease, + + + copd, + + + asthma, + + + insomnia, + + + sleep_suspend, + + + ckd, + + + rheumatoid, + + + depression, + + + general_anesthesia_surgery, + + + remark, + + + create_time, + + + update_time, + + + is_del, + + + recorder, + + + + + #{id,jdbcType=BIGINT}, + + + #{patientId,jdbcType=BIGINT}, + + + #{cardiacArrestHistory,jdbcType=TINYINT}, + + + #{angina,jdbcType=TINYINT}, + + + #{mi,jdbcType=TINYINT}, + + + #{atrialFibrillation,jdbcType=TINYINT}, + + + #{chf,jdbcType=TINYINT}, + + + #{otherCardiovascularDiseases,jdbcType=TINYINT}, + + + #{wuis,jdbcType=TINYINT}, + + + #{hcvd,jdbcType=TINYINT}, + + + #{parkinsonDisease,jdbcType=TINYINT}, + + + #{epilepsy,jdbcType=TINYINT}, + + + #{brainTrauma,jdbcType=TINYINT}, + + + #{hypertension,jdbcType=TINYINT}, + + + #{diabetes,jdbcType=TINYINT}, + + + #{hlp,jdbcType=TINYINT}, + + + #{hyperhomocysteinemia,jdbcType=TINYINT}, + + + #{vb12Deficiency,jdbcType=TINYINT}, + + + #{thyroidDisease,jdbcType=TINYINT}, + + + #{copd,jdbcType=TINYINT}, + + + #{asthma,jdbcType=TINYINT}, + + + #{insomnia,jdbcType=TINYINT}, + + + #{sleepSuspend,jdbcType=TINYINT}, + + + #{ckd,jdbcType=TINYINT}, + + + #{rheumatoid,jdbcType=TINYINT}, + + + #{depression,jdbcType=TINYINT}, + + + #{generalAnesthesiaSurgery,jdbcType=INTEGER}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + #{recorder,jdbcType=BIGINT}, + + + + + + update t_ht_patient_illness_history + + + id = #{record.id,jdbcType=BIGINT}, + + + patient_id = #{record.patientId,jdbcType=BIGINT}, + + + cardiac_arrest_history = #{record.cardiacArrestHistory,jdbcType=TINYINT}, + + + angina = #{record.angina,jdbcType=TINYINT}, + + + mi = #{record.mi,jdbcType=TINYINT}, + + + atrial_fibrillation = #{record.atrialFibrillation,jdbcType=TINYINT}, + + + chf = #{record.chf,jdbcType=TINYINT}, + + + other_cardiovascular_diseases = #{record.otherCardiovascularDiseases,jdbcType=TINYINT}, + + + wuis = #{record.wuis,jdbcType=TINYINT}, + + + hcvd = #{record.hcvd,jdbcType=TINYINT}, + + + parkinson_disease = #{record.parkinsonDisease,jdbcType=TINYINT}, + + + epilepsy = #{record.epilepsy,jdbcType=TINYINT}, + + + brain_trauma = #{record.brainTrauma,jdbcType=TINYINT}, + + + hypertension = #{record.hypertension,jdbcType=TINYINT}, + + + diabetes = #{record.diabetes,jdbcType=TINYINT}, + + + hlp = #{record.hlp,jdbcType=TINYINT}, + + + hyperhomocysteinemia = #{record.hyperhomocysteinemia,jdbcType=TINYINT}, + + + vb12_deficiency = #{record.vb12Deficiency,jdbcType=TINYINT}, + + + thyroid_disease = #{record.thyroidDisease,jdbcType=TINYINT}, + + + copd = #{record.copd,jdbcType=TINYINT}, + + + asthma = #{record.asthma,jdbcType=TINYINT}, + + + insomnia = #{record.insomnia,jdbcType=TINYINT}, + + + sleep_suspend = #{record.sleepSuspend,jdbcType=TINYINT}, + + + ckd = #{record.ckd,jdbcType=TINYINT}, + + + rheumatoid = #{record.rheumatoid,jdbcType=TINYINT}, + + + depression = #{record.depression,jdbcType=TINYINT}, + + + general_anesthesia_surgery = #{record.generalAnesthesiaSurgery,jdbcType=INTEGER}, + + + 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_illness_history + set id = #{record.id,jdbcType=BIGINT}, + patient_id = #{record.patientId,jdbcType=BIGINT}, + cardiac_arrest_history = #{record.cardiacArrestHistory,jdbcType=TINYINT}, + angina = #{record.angina,jdbcType=TINYINT}, + mi = #{record.mi,jdbcType=TINYINT}, + atrial_fibrillation = #{record.atrialFibrillation,jdbcType=TINYINT}, + chf = #{record.chf,jdbcType=TINYINT}, + other_cardiovascular_diseases = #{record.otherCardiovascularDiseases,jdbcType=TINYINT}, + wuis = #{record.wuis,jdbcType=TINYINT}, + hcvd = #{record.hcvd,jdbcType=TINYINT}, + parkinson_disease = #{record.parkinsonDisease,jdbcType=TINYINT}, + epilepsy = #{record.epilepsy,jdbcType=TINYINT}, + brain_trauma = #{record.brainTrauma,jdbcType=TINYINT}, + hypertension = #{record.hypertension,jdbcType=TINYINT}, + diabetes = #{record.diabetes,jdbcType=TINYINT}, + hlp = #{record.hlp,jdbcType=TINYINT}, + hyperhomocysteinemia = #{record.hyperhomocysteinemia,jdbcType=TINYINT}, + vb12_deficiency = #{record.vb12Deficiency,jdbcType=TINYINT}, + thyroid_disease = #{record.thyroidDisease,jdbcType=TINYINT}, + copd = #{record.copd,jdbcType=TINYINT}, + asthma = #{record.asthma,jdbcType=TINYINT}, + insomnia = #{record.insomnia,jdbcType=TINYINT}, + sleep_suspend = #{record.sleepSuspend,jdbcType=TINYINT}, + ckd = #{record.ckd,jdbcType=TINYINT}, + rheumatoid = #{record.rheumatoid,jdbcType=TINYINT}, + depression = #{record.depression,jdbcType=TINYINT}, + general_anesthesia_surgery = #{record.generalAnesthesiaSurgery,jdbcType=INTEGER}, + 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_illness_history + + + patient_id = #{patientId,jdbcType=BIGINT}, + + + cardiac_arrest_history = #{cardiacArrestHistory,jdbcType=TINYINT}, + + + angina = #{angina,jdbcType=TINYINT}, + + + mi = #{mi,jdbcType=TINYINT}, + + + atrial_fibrillation = #{atrialFibrillation,jdbcType=TINYINT}, + + + chf = #{chf,jdbcType=TINYINT}, + + + other_cardiovascular_diseases = #{otherCardiovascularDiseases,jdbcType=TINYINT}, + + + wuis = #{wuis,jdbcType=TINYINT}, + + + hcvd = #{hcvd,jdbcType=TINYINT}, + + + parkinson_disease = #{parkinsonDisease,jdbcType=TINYINT}, + + + epilepsy = #{epilepsy,jdbcType=TINYINT}, + + + brain_trauma = #{brainTrauma,jdbcType=TINYINT}, + + + hypertension = #{hypertension,jdbcType=TINYINT}, + + + diabetes = #{diabetes,jdbcType=TINYINT}, + + + hlp = #{hlp,jdbcType=TINYINT}, + + + hyperhomocysteinemia = #{hyperhomocysteinemia,jdbcType=TINYINT}, + + + vb12_deficiency = #{vb12Deficiency,jdbcType=TINYINT}, + + + thyroid_disease = #{thyroidDisease,jdbcType=TINYINT}, + + + copd = #{copd,jdbcType=TINYINT}, + + + asthma = #{asthma,jdbcType=TINYINT}, + + + insomnia = #{insomnia,jdbcType=TINYINT}, + + + sleep_suspend = #{sleepSuspend,jdbcType=TINYINT}, + + + ckd = #{ckd,jdbcType=TINYINT}, + + + rheumatoid = #{rheumatoid,jdbcType=TINYINT}, + + + depression = #{depression,jdbcType=TINYINT}, + + + general_anesthesia_surgery = #{generalAnesthesiaSurgery,jdbcType=INTEGER}, + + + 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_illness_history + set patient_id = #{patientId,jdbcType=BIGINT}, + cardiac_arrest_history = #{cardiacArrestHistory,jdbcType=TINYINT}, + angina = #{angina,jdbcType=TINYINT}, + mi = #{mi,jdbcType=TINYINT}, + atrial_fibrillation = #{atrialFibrillation,jdbcType=TINYINT}, + chf = #{chf,jdbcType=TINYINT}, + other_cardiovascular_diseases = #{otherCardiovascularDiseases,jdbcType=TINYINT}, + wuis = #{wuis,jdbcType=TINYINT}, + hcvd = #{hcvd,jdbcType=TINYINT}, + parkinson_disease = #{parkinsonDisease,jdbcType=TINYINT}, + epilepsy = #{epilepsy,jdbcType=TINYINT}, + brain_trauma = #{brainTrauma,jdbcType=TINYINT}, + hypertension = #{hypertension,jdbcType=TINYINT}, + diabetes = #{diabetes,jdbcType=TINYINT}, + hlp = #{hlp,jdbcType=TINYINT}, + hyperhomocysteinemia = #{hyperhomocysteinemia,jdbcType=TINYINT}, + vb12_deficiency = #{vb12Deficiency,jdbcType=TINYINT}, + thyroid_disease = #{thyroidDisease,jdbcType=TINYINT}, + copd = #{copd,jdbcType=TINYINT}, + asthma = #{asthma,jdbcType=TINYINT}, + insomnia = #{insomnia,jdbcType=TINYINT}, + sleep_suspend = #{sleepSuspend,jdbcType=TINYINT}, + ckd = #{ckd,jdbcType=TINYINT}, + rheumatoid = #{rheumatoid,jdbcType=TINYINT}, + depression = #{depression,jdbcType=TINYINT}, + general_anesthesia_surgery = #{generalAnesthesiaSurgery,jdbcType=INTEGER}, + 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} + + \ No newline at end of file diff --git a/question/src/main/resources/mapper_raw/HtPatientMapper.xml b/question/src/main/resources/mapper_raw/HtPatientMapper.xml new file mode 100644 index 00000000..ac0c220b --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtPatientMapper.xml @@ -0,0 +1,590 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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, user_id, name, patient_number, hospital_number, idcard, sex, marital_status, + educational_status, educational_status_unit, nation, native_place, career, birth_number, + menopause_age, contact, mobile, phone, province, city, address, domicile, independent_living_skills, + dwelling_state, remark, recorder, create_time, update_time, is_del + + + + + delete from t_ht_patient + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_patient + + + + + + insert into t_ht_patient (id, user_id, name, + patient_number, hospital_number, idcard, + sex, marital_status, educational_status, + educational_status_unit, nation, native_place, + career, birth_number, menopause_age, + contact, mobile, phone, + province, city, address, + domicile, independent_living_skills, dwelling_state, + remark, recorder, create_time, + update_time, is_del) + values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, + #{patientNumber,jdbcType=VARCHAR}, #{hospitalNumber,jdbcType=VARCHAR}, #{idcard,jdbcType=VARCHAR}, + #{sex,jdbcType=TINYINT}, #{maritalStatus,jdbcType=TINYINT}, #{educationalStatus,jdbcType=TINYINT}, + #{educationalStatusUnit,jdbcType=VARCHAR}, #{nation,jdbcType=VARCHAR}, #{nativePlace,jdbcType=VARCHAR}, + #{career,jdbcType=TINYINT}, #{birthNumber,jdbcType=INTEGER}, #{menopauseAge,jdbcType=INTEGER}, + #{contact,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, + #{province,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, + #{domicile,jdbcType=TINYINT}, #{independentLivingSkills,jdbcType=TINYINT}, #{dwellingState,jdbcType=TINYINT}, + #{remark,jdbcType=VARCHAR}, #{recorder,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, + #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT}) + + + insert into t_ht_patient + + + id, + + + user_id, + + + name, + + + patient_number, + + + hospital_number, + + + idcard, + + + sex, + + + marital_status, + + + educational_status, + + + educational_status_unit, + + + nation, + + + native_place, + + + career, + + + birth_number, + + + menopause_age, + + + contact, + + + mobile, + + + phone, + + + province, + + + city, + + + address, + + + domicile, + + + independent_living_skills, + + + dwelling_state, + + + remark, + + + recorder, + + + create_time, + + + update_time, + + + is_del, + + + + + #{id,jdbcType=BIGINT}, + + + #{userId,jdbcType=BIGINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{patientNumber,jdbcType=VARCHAR}, + + + #{hospitalNumber,jdbcType=VARCHAR}, + + + #{idcard,jdbcType=VARCHAR}, + + + #{sex,jdbcType=TINYINT}, + + + #{maritalStatus,jdbcType=TINYINT}, + + + #{educationalStatus,jdbcType=TINYINT}, + + + #{educationalStatusUnit,jdbcType=VARCHAR}, + + + #{nation,jdbcType=VARCHAR}, + + + #{nativePlace,jdbcType=VARCHAR}, + + + #{career,jdbcType=TINYINT}, + + + #{birthNumber,jdbcType=INTEGER}, + + + #{menopauseAge,jdbcType=INTEGER}, + + + #{contact,jdbcType=VARCHAR}, + + + #{mobile,jdbcType=VARCHAR}, + + + #{phone,jdbcType=VARCHAR}, + + + #{province,jdbcType=VARCHAR}, + + + #{city,jdbcType=VARCHAR}, + + + #{address,jdbcType=VARCHAR}, + + + #{domicile,jdbcType=TINYINT}, + + + #{independentLivingSkills,jdbcType=TINYINT}, + + + #{dwellingState,jdbcType=TINYINT}, + + + #{remark,jdbcType=VARCHAR}, + + + #{recorder,jdbcType=BIGINT}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + + + + update t_ht_patient + + + id = #{record.id,jdbcType=BIGINT}, + + + user_id = #{record.userId,jdbcType=BIGINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + patient_number = #{record.patientNumber,jdbcType=VARCHAR}, + + + hospital_number = #{record.hospitalNumber,jdbcType=VARCHAR}, + + + idcard = #{record.idcard,jdbcType=VARCHAR}, + + + sex = #{record.sex,jdbcType=TINYINT}, + + + marital_status = #{record.maritalStatus,jdbcType=TINYINT}, + + + educational_status = #{record.educationalStatus,jdbcType=TINYINT}, + + + educational_status_unit = #{record.educationalStatusUnit,jdbcType=VARCHAR}, + + + nation = #{record.nation,jdbcType=VARCHAR}, + + + native_place = #{record.nativePlace,jdbcType=VARCHAR}, + + + career = #{record.career,jdbcType=TINYINT}, + + + birth_number = #{record.birthNumber,jdbcType=INTEGER}, + + + menopause_age = #{record.menopauseAge,jdbcType=INTEGER}, + + + contact = #{record.contact,jdbcType=VARCHAR}, + + + mobile = #{record.mobile,jdbcType=VARCHAR}, + + + phone = #{record.phone,jdbcType=VARCHAR}, + + + province = #{record.province,jdbcType=VARCHAR}, + + + city = #{record.city,jdbcType=VARCHAR}, + + + address = #{record.address,jdbcType=VARCHAR}, + + + domicile = #{record.domicile,jdbcType=TINYINT}, + + + independent_living_skills = #{record.independentLivingSkills,jdbcType=TINYINT}, + + + dwelling_state = #{record.dwellingState,jdbcType=TINYINT}, + + + remark = #{record.remark,jdbcType=VARCHAR}, + + + recorder = #{record.recorder,jdbcType=BIGINT}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + + + is_del = #{record.isDel,jdbcType=TINYINT}, + + + + + + + + update t_ht_patient + set id = #{record.id,jdbcType=BIGINT}, + user_id = #{record.userId,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + patient_number = #{record.patientNumber,jdbcType=VARCHAR}, + hospital_number = #{record.hospitalNumber,jdbcType=VARCHAR}, + idcard = #{record.idcard,jdbcType=VARCHAR}, + sex = #{record.sex,jdbcType=TINYINT}, + marital_status = #{record.maritalStatus,jdbcType=TINYINT}, + educational_status = #{record.educationalStatus,jdbcType=TINYINT}, + educational_status_unit = #{record.educationalStatusUnit,jdbcType=VARCHAR}, + nation = #{record.nation,jdbcType=VARCHAR}, + native_place = #{record.nativePlace,jdbcType=VARCHAR}, + career = #{record.career,jdbcType=TINYINT}, + birth_number = #{record.birthNumber,jdbcType=INTEGER}, + menopause_age = #{record.menopauseAge,jdbcType=INTEGER}, + contact = #{record.contact,jdbcType=VARCHAR}, + mobile = #{record.mobile,jdbcType=VARCHAR}, + phone = #{record.phone,jdbcType=VARCHAR}, + province = #{record.province,jdbcType=VARCHAR}, + city = #{record.city,jdbcType=VARCHAR}, + address = #{record.address,jdbcType=VARCHAR}, + domicile = #{record.domicile,jdbcType=TINYINT}, + independent_living_skills = #{record.independentLivingSkills,jdbcType=TINYINT}, + dwelling_state = #{record.dwellingState,jdbcType=TINYINT}, + remark = #{record.remark,jdbcType=VARCHAR}, + recorder = #{record.recorder,jdbcType=BIGINT}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + is_del = #{record.isDel,jdbcType=TINYINT} + + + + + + update t_ht_patient + + + user_id = #{userId,jdbcType=BIGINT}, + + + name = #{name,jdbcType=VARCHAR}, + + + patient_number = #{patientNumber,jdbcType=VARCHAR}, + + + hospital_number = #{hospitalNumber,jdbcType=VARCHAR}, + + + idcard = #{idcard,jdbcType=VARCHAR}, + + + sex = #{sex,jdbcType=TINYINT}, + + + marital_status = #{maritalStatus,jdbcType=TINYINT}, + + + educational_status = #{educationalStatus,jdbcType=TINYINT}, + + + educational_status_unit = #{educationalStatusUnit,jdbcType=VARCHAR}, + + + nation = #{nation,jdbcType=VARCHAR}, + + + native_place = #{nativePlace,jdbcType=VARCHAR}, + + + career = #{career,jdbcType=TINYINT}, + + + birth_number = #{birthNumber,jdbcType=INTEGER}, + + + menopause_age = #{menopauseAge,jdbcType=INTEGER}, + + + contact = #{contact,jdbcType=VARCHAR}, + + + mobile = #{mobile,jdbcType=VARCHAR}, + + + phone = #{phone,jdbcType=VARCHAR}, + + + province = #{province,jdbcType=VARCHAR}, + + + city = #{city,jdbcType=VARCHAR}, + + + address = #{address,jdbcType=VARCHAR}, + + + domicile = #{domicile,jdbcType=TINYINT}, + + + independent_living_skills = #{independentLivingSkills,jdbcType=TINYINT}, + + + dwelling_state = #{dwellingState,jdbcType=TINYINT}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + recorder = #{recorder,jdbcType=BIGINT}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + is_del = #{isDel,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_ht_patient + set user_id = #{userId,jdbcType=BIGINT}, + name = #{name,jdbcType=VARCHAR}, + patient_number = #{patientNumber,jdbcType=VARCHAR}, + hospital_number = #{hospitalNumber,jdbcType=VARCHAR}, + idcard = #{idcard,jdbcType=VARCHAR}, + sex = #{sex,jdbcType=TINYINT}, + marital_status = #{maritalStatus,jdbcType=TINYINT}, + educational_status = #{educationalStatus,jdbcType=TINYINT}, + educational_status_unit = #{educationalStatusUnit,jdbcType=VARCHAR}, + nation = #{nation,jdbcType=VARCHAR}, + native_place = #{nativePlace,jdbcType=VARCHAR}, + career = #{career,jdbcType=TINYINT}, + birth_number = #{birthNumber,jdbcType=INTEGER}, + menopause_age = #{menopauseAge,jdbcType=INTEGER}, + contact = #{contact,jdbcType=VARCHAR}, + mobile = #{mobile,jdbcType=VARCHAR}, + phone = #{phone,jdbcType=VARCHAR}, + province = #{province,jdbcType=VARCHAR}, + city = #{city,jdbcType=VARCHAR}, + address = #{address,jdbcType=VARCHAR}, + domicile = #{domicile,jdbcType=TINYINT}, + independent_living_skills = #{independentLivingSkills,jdbcType=TINYINT}, + dwelling_state = #{dwellingState,jdbcType=TINYINT}, + remark = #{remark,jdbcType=VARCHAR}, + recorder = #{recorder,jdbcType=BIGINT}, + 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/question/src/main/resources/mapper_raw/HtPatientParentIllnessMapper.xml b/question/src/main/resources/mapper_raw/HtPatientParentIllnessMapper.xml new file mode 100644 index 00000000..853bb9ed --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtPatientParentIllnessMapper.xml @@ -0,0 +1,465 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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, memory, language, space, emotion, depression, illusion, delusion, + derepression, irritable, personality_changes, exercise, first_illness, reason, change_form, + remark, create_time, update_time, is_del, recorder + + + + + delete from t_ht_patient_parent_illness + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_patient_parent_illness + + + + + + insert into t_ht_patient_parent_illness (id, patient_id, memory, + language, space, emotion, + depression, illusion, delusion, + derepression, irritable, personality_changes, + exercise, first_illness, reason, + change_form, remark, create_time, + update_time, is_del, recorder + ) + values (#{id,jdbcType=BIGINT}, #{patientId,jdbcType=BIGINT}, #{memory,jdbcType=TINYINT}, + #{language,jdbcType=TINYINT}, #{space,jdbcType=TINYINT}, #{emotion,jdbcType=TINYINT}, + #{depression,jdbcType=TINYINT}, #{illusion,jdbcType=TINYINT}, #{delusion,jdbcType=TINYINT}, + #{derepression,jdbcType=TINYINT}, #{irritable,jdbcType=TINYINT}, #{personalityChanges,jdbcType=TINYINT}, + #{exercise,jdbcType=TINYINT}, #{firstIllness,jdbcType=TINYINT}, #{reason,jdbcType=TINYINT}, + #{changeForm,jdbcType=TINYINT}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT}, #{recorder,jdbcType=BIGINT} + ) + + + insert into t_ht_patient_parent_illness + + + id, + + + patient_id, + + + memory, + + + language, + + + space, + + + emotion, + + + depression, + + + illusion, + + + delusion, + + + derepression, + + + irritable, + + + personality_changes, + + + exercise, + + + first_illness, + + + reason, + + + change_form, + + + remark, + + + create_time, + + + update_time, + + + is_del, + + + recorder, + + + + + #{id,jdbcType=BIGINT}, + + + #{patientId,jdbcType=BIGINT}, + + + #{memory,jdbcType=TINYINT}, + + + #{language,jdbcType=TINYINT}, + + + #{space,jdbcType=TINYINT}, + + + #{emotion,jdbcType=TINYINT}, + + + #{depression,jdbcType=TINYINT}, + + + #{illusion,jdbcType=TINYINT}, + + + #{delusion,jdbcType=TINYINT}, + + + #{derepression,jdbcType=TINYINT}, + + + #{irritable,jdbcType=TINYINT}, + + + #{personalityChanges,jdbcType=TINYINT}, + + + #{exercise,jdbcType=TINYINT}, + + + #{firstIllness,jdbcType=TINYINT}, + + + #{reason,jdbcType=TINYINT}, + + + #{changeForm,jdbcType=TINYINT}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + #{recorder,jdbcType=BIGINT}, + + + + + + update t_ht_patient_parent_illness + + + id = #{record.id,jdbcType=BIGINT}, + + + patient_id = #{record.patientId,jdbcType=BIGINT}, + + + memory = #{record.memory,jdbcType=TINYINT}, + + + language = #{record.language,jdbcType=TINYINT}, + + + space = #{record.space,jdbcType=TINYINT}, + + + emotion = #{record.emotion,jdbcType=TINYINT}, + + + depression = #{record.depression,jdbcType=TINYINT}, + + + illusion = #{record.illusion,jdbcType=TINYINT}, + + + delusion = #{record.delusion,jdbcType=TINYINT}, + + + derepression = #{record.derepression,jdbcType=TINYINT}, + + + irritable = #{record.irritable,jdbcType=TINYINT}, + + + personality_changes = #{record.personalityChanges,jdbcType=TINYINT}, + + + exercise = #{record.exercise,jdbcType=TINYINT}, + + + first_illness = #{record.firstIllness,jdbcType=TINYINT}, + + + reason = #{record.reason,jdbcType=TINYINT}, + + + change_form = #{record.changeForm,jdbcType=TINYINT}, + + + 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_parent_illness + set id = #{record.id,jdbcType=BIGINT}, + patient_id = #{record.patientId,jdbcType=BIGINT}, + memory = #{record.memory,jdbcType=TINYINT}, + language = #{record.language,jdbcType=TINYINT}, + space = #{record.space,jdbcType=TINYINT}, + emotion = #{record.emotion,jdbcType=TINYINT}, + depression = #{record.depression,jdbcType=TINYINT}, + illusion = #{record.illusion,jdbcType=TINYINT}, + delusion = #{record.delusion,jdbcType=TINYINT}, + derepression = #{record.derepression,jdbcType=TINYINT}, + irritable = #{record.irritable,jdbcType=TINYINT}, + personality_changes = #{record.personalityChanges,jdbcType=TINYINT}, + exercise = #{record.exercise,jdbcType=TINYINT}, + first_illness = #{record.firstIllness,jdbcType=TINYINT}, + reason = #{record.reason,jdbcType=TINYINT}, + change_form = #{record.changeForm,jdbcType=TINYINT}, + 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_parent_illness + + + patient_id = #{patientId,jdbcType=BIGINT}, + + + memory = #{memory,jdbcType=TINYINT}, + + + language = #{language,jdbcType=TINYINT}, + + + space = #{space,jdbcType=TINYINT}, + + + emotion = #{emotion,jdbcType=TINYINT}, + + + depression = #{depression,jdbcType=TINYINT}, + + + illusion = #{illusion,jdbcType=TINYINT}, + + + delusion = #{delusion,jdbcType=TINYINT}, + + + derepression = #{derepression,jdbcType=TINYINT}, + + + irritable = #{irritable,jdbcType=TINYINT}, + + + personality_changes = #{personalityChanges,jdbcType=TINYINT}, + + + exercise = #{exercise,jdbcType=TINYINT}, + + + first_illness = #{firstIllness,jdbcType=TINYINT}, + + + reason = #{reason,jdbcType=TINYINT}, + + + change_form = #{changeForm,jdbcType=TINYINT}, + + + 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_parent_illness + set patient_id = #{patientId,jdbcType=BIGINT}, + memory = #{memory,jdbcType=TINYINT}, + language = #{language,jdbcType=TINYINT}, + space = #{space,jdbcType=TINYINT}, + emotion = #{emotion,jdbcType=TINYINT}, + depression = #{depression,jdbcType=TINYINT}, + illusion = #{illusion,jdbcType=TINYINT}, + delusion = #{delusion,jdbcType=TINYINT}, + derepression = #{derepression,jdbcType=TINYINT}, + irritable = #{irritable,jdbcType=TINYINT}, + personality_changes = #{personalityChanges,jdbcType=TINYINT}, + exercise = #{exercise,jdbcType=TINYINT}, + first_illness = #{firstIllness,jdbcType=TINYINT}, + reason = #{reason,jdbcType=TINYINT}, + change_form = #{changeForm,jdbcType=TINYINT}, + 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} + + \ No newline at end of file diff --git a/question/src/main/resources/mapper_raw/HtPatientPersionalMapper.xml b/question/src/main/resources/mapper_raw/HtPatientPersionalMapper.xml new file mode 100644 index 00000000..d7ac82af --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtPatientPersionalMapper.xml @@ -0,0 +1,576 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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, smoking_history, smoking_year, smoking_amount, smoking_quit, smoking_quit_year, + drink_history, drink_year, drink_type, drink_amount, tea_coffee_history, tea_coffee_year, + tea_coffee_type, tea_coffee_frequency, tea_coffee_quit, tea_coffee_quit_year, dietary_habit, + workout_time, sleep_time, snore, remark, create_time, update_time, is_del, recorder, + drink_quit, drink_quit_year + + + + + delete from t_ht_patient_persional + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_patient_persional + + + + + + insert into t_ht_patient_persional (id, patient_id, smoking_history, + smoking_year, smoking_amount, smoking_quit, + smoking_quit_year, drink_history, drink_year, + drink_type, drink_amount, tea_coffee_history, + tea_coffee_year, tea_coffee_type, tea_coffee_frequency, + tea_coffee_quit, tea_coffee_quit_year, dietary_habit, + workout_time, sleep_time, snore, + remark, create_time, update_time, + is_del, recorder, drink_quit, + drink_quit_year) + values (#{id,jdbcType=BIGINT}, #{patientId,jdbcType=BIGINT}, #{smokingHistory,jdbcType=TINYINT}, + #{smokingYear,jdbcType=INTEGER}, #{smokingAmount,jdbcType=INTEGER}, #{smokingQuit,jdbcType=TINYINT}, + #{smokingQuitYear,jdbcType=INTEGER}, #{drinkHistory,jdbcType=TINYINT}, #{drinkYear,jdbcType=INTEGER}, + #{drinkType,jdbcType=VARCHAR}, #{drinkAmount,jdbcType=INTEGER}, #{teaCoffeeHistory,jdbcType=TINYINT}, + #{teaCoffeeYear,jdbcType=INTEGER}, #{teaCoffeeType,jdbcType=VARCHAR}, #{teaCoffeeFrequency,jdbcType=TINYINT}, + #{teaCoffeeQuit,jdbcType=TINYINT}, #{teaCoffeeQuitYear,jdbcType=INTEGER}, #{dietaryHabit,jdbcType=VARCHAR}, + #{workoutTime,jdbcType=TINYINT}, #{sleepTime,jdbcType=INTEGER}, #{snore,jdbcType=TINYINT}, + #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, + #{isDel,jdbcType=TINYINT}, #{recorder,jdbcType=BIGINT}, #{drinkQuit,jdbcType=TINYINT}, + #{drinkQuitYear,jdbcType=INTEGER}) + + + insert into t_ht_patient_persional + + + id, + + + patient_id, + + + smoking_history, + + + smoking_year, + + + smoking_amount, + + + smoking_quit, + + + smoking_quit_year, + + + drink_history, + + + drink_year, + + + drink_type, + + + drink_amount, + + + tea_coffee_history, + + + tea_coffee_year, + + + tea_coffee_type, + + + tea_coffee_frequency, + + + tea_coffee_quit, + + + tea_coffee_quit_year, + + + dietary_habit, + + + workout_time, + + + sleep_time, + + + snore, + + + remark, + + + create_time, + + + update_time, + + + is_del, + + + recorder, + + + drink_quit, + + + drink_quit_year, + + + + + #{id,jdbcType=BIGINT}, + + + #{patientId,jdbcType=BIGINT}, + + + #{smokingHistory,jdbcType=TINYINT}, + + + #{smokingYear,jdbcType=INTEGER}, + + + #{smokingAmount,jdbcType=INTEGER}, + + + #{smokingQuit,jdbcType=TINYINT}, + + + #{smokingQuitYear,jdbcType=INTEGER}, + + + #{drinkHistory,jdbcType=TINYINT}, + + + #{drinkYear,jdbcType=INTEGER}, + + + #{drinkType,jdbcType=VARCHAR}, + + + #{drinkAmount,jdbcType=INTEGER}, + + + #{teaCoffeeHistory,jdbcType=TINYINT}, + + + #{teaCoffeeYear,jdbcType=INTEGER}, + + + #{teaCoffeeType,jdbcType=VARCHAR}, + + + #{teaCoffeeFrequency,jdbcType=TINYINT}, + + + #{teaCoffeeQuit,jdbcType=TINYINT}, + + + #{teaCoffeeQuitYear,jdbcType=INTEGER}, + + + #{dietaryHabit,jdbcType=VARCHAR}, + + + #{workoutTime,jdbcType=TINYINT}, + + + #{sleepTime,jdbcType=INTEGER}, + + + #{snore,jdbcType=TINYINT}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + #{recorder,jdbcType=BIGINT}, + + + #{drinkQuit,jdbcType=TINYINT}, + + + #{drinkQuitYear,jdbcType=INTEGER}, + + + + + + update t_ht_patient_persional + + + id = #{record.id,jdbcType=BIGINT}, + + + patient_id = #{record.patientId,jdbcType=BIGINT}, + + + smoking_history = #{record.smokingHistory,jdbcType=TINYINT}, + + + smoking_year = #{record.smokingYear,jdbcType=INTEGER}, + + + smoking_amount = #{record.smokingAmount,jdbcType=INTEGER}, + + + smoking_quit = #{record.smokingQuit,jdbcType=TINYINT}, + + + smoking_quit_year = #{record.smokingQuitYear,jdbcType=INTEGER}, + + + drink_history = #{record.drinkHistory,jdbcType=TINYINT}, + + + drink_year = #{record.drinkYear,jdbcType=INTEGER}, + + + drink_type = #{record.drinkType,jdbcType=VARCHAR}, + + + drink_amount = #{record.drinkAmount,jdbcType=INTEGER}, + + + tea_coffee_history = #{record.teaCoffeeHistory,jdbcType=TINYINT}, + + + tea_coffee_year = #{record.teaCoffeeYear,jdbcType=INTEGER}, + + + tea_coffee_type = #{record.teaCoffeeType,jdbcType=VARCHAR}, + + + tea_coffee_frequency = #{record.teaCoffeeFrequency,jdbcType=TINYINT}, + + + tea_coffee_quit = #{record.teaCoffeeQuit,jdbcType=TINYINT}, + + + tea_coffee_quit_year = #{record.teaCoffeeQuitYear,jdbcType=INTEGER}, + + + dietary_habit = #{record.dietaryHabit,jdbcType=VARCHAR}, + + + workout_time = #{record.workoutTime,jdbcType=TINYINT}, + + + sleep_time = #{record.sleepTime,jdbcType=INTEGER}, + + + snore = #{record.snore,jdbcType=TINYINT}, + + + 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}, + + + drink_quit = #{record.drinkQuit,jdbcType=TINYINT}, + + + drink_quit_year = #{record.drinkQuitYear,jdbcType=INTEGER}, + + + + + + + + update t_ht_patient_persional + set id = #{record.id,jdbcType=BIGINT}, + patient_id = #{record.patientId,jdbcType=BIGINT}, + smoking_history = #{record.smokingHistory,jdbcType=TINYINT}, + smoking_year = #{record.smokingYear,jdbcType=INTEGER}, + smoking_amount = #{record.smokingAmount,jdbcType=INTEGER}, + smoking_quit = #{record.smokingQuit,jdbcType=TINYINT}, + smoking_quit_year = #{record.smokingQuitYear,jdbcType=INTEGER}, + drink_history = #{record.drinkHistory,jdbcType=TINYINT}, + drink_year = #{record.drinkYear,jdbcType=INTEGER}, + drink_type = #{record.drinkType,jdbcType=VARCHAR}, + drink_amount = #{record.drinkAmount,jdbcType=INTEGER}, + tea_coffee_history = #{record.teaCoffeeHistory,jdbcType=TINYINT}, + tea_coffee_year = #{record.teaCoffeeYear,jdbcType=INTEGER}, + tea_coffee_type = #{record.teaCoffeeType,jdbcType=VARCHAR}, + tea_coffee_frequency = #{record.teaCoffeeFrequency,jdbcType=TINYINT}, + tea_coffee_quit = #{record.teaCoffeeQuit,jdbcType=TINYINT}, + tea_coffee_quit_year = #{record.teaCoffeeQuitYear,jdbcType=INTEGER}, + dietary_habit = #{record.dietaryHabit,jdbcType=VARCHAR}, + workout_time = #{record.workoutTime,jdbcType=TINYINT}, + sleep_time = #{record.sleepTime,jdbcType=INTEGER}, + snore = #{record.snore,jdbcType=TINYINT}, + 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}, + drink_quit = #{record.drinkQuit,jdbcType=TINYINT}, + drink_quit_year = #{record.drinkQuitYear,jdbcType=INTEGER} + + + + + + update t_ht_patient_persional + + + patient_id = #{patientId,jdbcType=BIGINT}, + + + smoking_history = #{smokingHistory,jdbcType=TINYINT}, + + + smoking_year = #{smokingYear,jdbcType=INTEGER}, + + + smoking_amount = #{smokingAmount,jdbcType=INTEGER}, + + + smoking_quit = #{smokingQuit,jdbcType=TINYINT}, + + + smoking_quit_year = #{smokingQuitYear,jdbcType=INTEGER}, + + + drink_history = #{drinkHistory,jdbcType=TINYINT}, + + + drink_year = #{drinkYear,jdbcType=INTEGER}, + + + drink_type = #{drinkType,jdbcType=VARCHAR}, + + + drink_amount = #{drinkAmount,jdbcType=INTEGER}, + + + tea_coffee_history = #{teaCoffeeHistory,jdbcType=TINYINT}, + + + tea_coffee_year = #{teaCoffeeYear,jdbcType=INTEGER}, + + + tea_coffee_type = #{teaCoffeeType,jdbcType=VARCHAR}, + + + tea_coffee_frequency = #{teaCoffeeFrequency,jdbcType=TINYINT}, + + + tea_coffee_quit = #{teaCoffeeQuit,jdbcType=TINYINT}, + + + tea_coffee_quit_year = #{teaCoffeeQuitYear,jdbcType=INTEGER}, + + + dietary_habit = #{dietaryHabit,jdbcType=VARCHAR}, + + + workout_time = #{workoutTime,jdbcType=TINYINT}, + + + sleep_time = #{sleepTime,jdbcType=INTEGER}, + + + snore = #{snore,jdbcType=TINYINT}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + is_del = #{isDel,jdbcType=TINYINT}, + + + recorder = #{recorder,jdbcType=BIGINT}, + + + drink_quit = #{drinkQuit,jdbcType=TINYINT}, + + + drink_quit_year = #{drinkQuitYear,jdbcType=INTEGER}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_ht_patient_persional + set patient_id = #{patientId,jdbcType=BIGINT}, + smoking_history = #{smokingHistory,jdbcType=TINYINT}, + smoking_year = #{smokingYear,jdbcType=INTEGER}, + smoking_amount = #{smokingAmount,jdbcType=INTEGER}, + smoking_quit = #{smokingQuit,jdbcType=TINYINT}, + smoking_quit_year = #{smokingQuitYear,jdbcType=INTEGER}, + drink_history = #{drinkHistory,jdbcType=TINYINT}, + drink_year = #{drinkYear,jdbcType=INTEGER}, + drink_type = #{drinkType,jdbcType=VARCHAR}, + drink_amount = #{drinkAmount,jdbcType=INTEGER}, + tea_coffee_history = #{teaCoffeeHistory,jdbcType=TINYINT}, + tea_coffee_year = #{teaCoffeeYear,jdbcType=INTEGER}, + tea_coffee_type = #{teaCoffeeType,jdbcType=VARCHAR}, + tea_coffee_frequency = #{teaCoffeeFrequency,jdbcType=TINYINT}, + tea_coffee_quit = #{teaCoffeeQuit,jdbcType=TINYINT}, + tea_coffee_quit_year = #{teaCoffeeQuitYear,jdbcType=INTEGER}, + dietary_habit = #{dietaryHabit,jdbcType=VARCHAR}, + workout_time = #{workoutTime,jdbcType=TINYINT}, + sleep_time = #{sleepTime,jdbcType=INTEGER}, + snore = #{snore,jdbcType=TINYINT}, + remark = #{remark,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_time = #{updateTime,jdbcType=TIMESTAMP}, + is_del = #{isDel,jdbcType=TINYINT}, + recorder = #{recorder,jdbcType=BIGINT}, + drink_quit = #{drinkQuit,jdbcType=TINYINT}, + drink_quit_year = #{drinkQuitYear,jdbcType=INTEGER} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/question/src/main/resources/mapper_raw/HtPatientQuestionRecordMapper.xml b/question/src/main/resources/mapper_raw/HtPatientQuestionRecordMapper.xml new file mode 100644 index 00000000..a39a4d2b --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtPatientQuestionRecordMapper.xml @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + 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, question_id, record_type, record_value, record_time, remark, + create_time, update_time, is_del + + + + + delete from t_ht_patient_question_record + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_patient_question_record + + + + + + insert into t_ht_patient_question_record (id, patient_report_id, question_id, + record_type, record_value, record_time, + remark, create_time, update_time, + is_del) + values (#{id,jdbcType=BIGINT}, #{patientReportId,jdbcType=BIGINT}, #{questionId,jdbcType=BIGINT}, + #{recordType,jdbcType=VARCHAR}, #{recordValue,jdbcType=VARCHAR}, #{recordTime,jdbcType=BIGINT}, + #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, + #{isDel,jdbcType=TINYINT}) + + + insert into t_ht_patient_question_record + + + id, + + + patient_report_id, + + + question_id, + + + record_type, + + + record_value, + + + record_time, + + + remark, + + + create_time, + + + update_time, + + + is_del, + + + + + #{id,jdbcType=BIGINT}, + + + #{patientReportId,jdbcType=BIGINT}, + + + #{questionId,jdbcType=BIGINT}, + + + #{recordType,jdbcType=VARCHAR}, + + + #{recordValue,jdbcType=VARCHAR}, + + + #{recordTime,jdbcType=BIGINT}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + + + + update t_ht_patient_question_record + + + id = #{record.id,jdbcType=BIGINT}, + + + patient_report_id = #{record.patientReportId,jdbcType=BIGINT}, + + + question_id = #{record.questionId,jdbcType=BIGINT}, + + + record_type = #{record.recordType,jdbcType=VARCHAR}, + + + record_value = #{record.recordValue,jdbcType=VARCHAR}, + + + record_time = #{record.recordTime,jdbcType=BIGINT}, + + + 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_patient_question_record + set id = #{record.id,jdbcType=BIGINT}, + patient_report_id = #{record.patientReportId,jdbcType=BIGINT}, + question_id = #{record.questionId,jdbcType=BIGINT}, + record_type = #{record.recordType,jdbcType=VARCHAR}, + record_value = #{record.recordValue,jdbcType=VARCHAR}, + record_time = #{record.recordTime,jdbcType=BIGINT}, + 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_patient_question_record + + + patient_report_id = #{patientReportId,jdbcType=BIGINT}, + + + question_id = #{questionId,jdbcType=BIGINT}, + + + record_type = #{recordType,jdbcType=VARCHAR}, + + + record_value = #{recordValue,jdbcType=VARCHAR}, + + + record_time = #{recordTime,jdbcType=BIGINT}, + + + 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_patient_question_record + set patient_report_id = #{patientReportId,jdbcType=BIGINT}, + question_id = #{questionId,jdbcType=BIGINT}, + record_type = #{recordType,jdbcType=VARCHAR}, + record_value = #{recordValue,jdbcType=VARCHAR}, + record_time = #{recordTime,jdbcType=BIGINT}, + 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/question/src/main/resources/mapper_raw/HtPatientReportMapper.xml b/question/src/main/resources/mapper_raw/HtPatientReportMapper.xml new file mode 100644 index 00000000..ebbbd99a --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtPatientReportMapper.xml @@ -0,0 +1,528 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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, name, patient_id, patient_idcard, patient_age, doctor_id, serial_number, initial_impression, + clinical_diagnosis, pasi, department, bed_number, report_time, check_time, evaluation_code, + url, qr_code_url, remark, create_time, update_time, is_del, show_status, hospital, + complete_status, user_id + + + + + delete from t_ht_patient_report + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_patient_report + + + + + + insert into t_ht_patient_report (id, name, patient_id, + patient_idcard, patient_age, doctor_id, + serial_number, initial_impression, clinical_diagnosis, + pasi, department, bed_number, + report_time, check_time, evaluation_code, + url, qr_code_url, remark, + create_time, update_time, is_del, + show_status, hospital, complete_status, + user_id) + values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{patientId,jdbcType=BIGINT}, + #{patientIdcard,jdbcType=VARCHAR}, #{patientAge,jdbcType=TINYINT}, #{doctorId,jdbcType=BIGINT}, + #{serialNumber,jdbcType=VARCHAR}, #{initialImpression,jdbcType=VARCHAR}, #{clinicalDiagnosis,jdbcType=VARCHAR}, + #{pasi,jdbcType=TINYINT}, #{department,jdbcType=VARCHAR}, #{bedNumber,jdbcType=VARCHAR}, + #{reportTime,jdbcType=BIGINT}, #{checkTime,jdbcType=BIGINT}, #{evaluationCode,jdbcType=VARCHAR}, + #{url,jdbcType=VARCHAR}, #{qrCodeUrl,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT}, + #{showStatus,jdbcType=TINYINT}, #{hospital,jdbcType=VARCHAR}, #{completeStatus,jdbcType=TINYINT}, + #{userId,jdbcType=BIGINT}) + + + insert into t_ht_patient_report + + + id, + + + name, + + + patient_id, + + + patient_idcard, + + + patient_age, + + + doctor_id, + + + serial_number, + + + initial_impression, + + + clinical_diagnosis, + + + pasi, + + + department, + + + bed_number, + + + report_time, + + + check_time, + + + evaluation_code, + + + url, + + + qr_code_url, + + + remark, + + + create_time, + + + update_time, + + + is_del, + + + show_status, + + + hospital, + + + complete_status, + + + user_id, + + + + + #{id,jdbcType=BIGINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{patientId,jdbcType=BIGINT}, + + + #{patientIdcard,jdbcType=VARCHAR}, + + + #{patientAge,jdbcType=TINYINT}, + + + #{doctorId,jdbcType=BIGINT}, + + + #{serialNumber,jdbcType=VARCHAR}, + + + #{initialImpression,jdbcType=VARCHAR}, + + + #{clinicalDiagnosis,jdbcType=VARCHAR}, + + + #{pasi,jdbcType=TINYINT}, + + + #{department,jdbcType=VARCHAR}, + + + #{bedNumber,jdbcType=VARCHAR}, + + + #{reportTime,jdbcType=BIGINT}, + + + #{checkTime,jdbcType=BIGINT}, + + + #{evaluationCode,jdbcType=VARCHAR}, + + + #{url,jdbcType=VARCHAR}, + + + #{qrCodeUrl,jdbcType=VARCHAR}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + #{showStatus,jdbcType=TINYINT}, + + + #{hospital,jdbcType=VARCHAR}, + + + #{completeStatus,jdbcType=TINYINT}, + + + #{userId,jdbcType=BIGINT}, + + + + + + update t_ht_patient_report + + + id = #{record.id,jdbcType=BIGINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + patient_id = #{record.patientId,jdbcType=BIGINT}, + + + patient_idcard = #{record.patientIdcard,jdbcType=VARCHAR}, + + + patient_age = #{record.patientAge,jdbcType=TINYINT}, + + + doctor_id = #{record.doctorId,jdbcType=BIGINT}, + + + serial_number = #{record.serialNumber,jdbcType=VARCHAR}, + + + initial_impression = #{record.initialImpression,jdbcType=VARCHAR}, + + + clinical_diagnosis = #{record.clinicalDiagnosis,jdbcType=VARCHAR}, + + + pasi = #{record.pasi,jdbcType=TINYINT}, + + + department = #{record.department,jdbcType=VARCHAR}, + + + bed_number = #{record.bedNumber,jdbcType=VARCHAR}, + + + report_time = #{record.reportTime,jdbcType=BIGINT}, + + + check_time = #{record.checkTime,jdbcType=BIGINT}, + + + evaluation_code = #{record.evaluationCode,jdbcType=VARCHAR}, + + + url = #{record.url,jdbcType=VARCHAR}, + + + qr_code_url = #{record.qrCodeUrl,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}, + + + show_status = #{record.showStatus,jdbcType=TINYINT}, + + + hospital = #{record.hospital,jdbcType=VARCHAR}, + + + complete_status = #{record.completeStatus,jdbcType=TINYINT}, + + + user_id = #{record.userId,jdbcType=BIGINT}, + + + + + + + + update t_ht_patient_report + set id = #{record.id,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + patient_id = #{record.patientId,jdbcType=BIGINT}, + patient_idcard = #{record.patientIdcard,jdbcType=VARCHAR}, + patient_age = #{record.patientAge,jdbcType=TINYINT}, + doctor_id = #{record.doctorId,jdbcType=BIGINT}, + serial_number = #{record.serialNumber,jdbcType=VARCHAR}, + initial_impression = #{record.initialImpression,jdbcType=VARCHAR}, + clinical_diagnosis = #{record.clinicalDiagnosis,jdbcType=VARCHAR}, + pasi = #{record.pasi,jdbcType=TINYINT}, + department = #{record.department,jdbcType=VARCHAR}, + bed_number = #{record.bedNumber,jdbcType=VARCHAR}, + report_time = #{record.reportTime,jdbcType=BIGINT}, + check_time = #{record.checkTime,jdbcType=BIGINT}, + evaluation_code = #{record.evaluationCode,jdbcType=VARCHAR}, + url = #{record.url,jdbcType=VARCHAR}, + qr_code_url = #{record.qrCodeUrl,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}, + show_status = #{record.showStatus,jdbcType=TINYINT}, + hospital = #{record.hospital,jdbcType=VARCHAR}, + complete_status = #{record.completeStatus,jdbcType=TINYINT}, + user_id = #{record.userId,jdbcType=BIGINT} + + + + + + update t_ht_patient_report + + + name = #{name,jdbcType=VARCHAR}, + + + patient_id = #{patientId,jdbcType=BIGINT}, + + + patient_idcard = #{patientIdcard,jdbcType=VARCHAR}, + + + patient_age = #{patientAge,jdbcType=TINYINT}, + + + doctor_id = #{doctorId,jdbcType=BIGINT}, + + + serial_number = #{serialNumber,jdbcType=VARCHAR}, + + + initial_impression = #{initialImpression,jdbcType=VARCHAR}, + + + clinical_diagnosis = #{clinicalDiagnosis,jdbcType=VARCHAR}, + + + pasi = #{pasi,jdbcType=TINYINT}, + + + department = #{department,jdbcType=VARCHAR}, + + + bed_number = #{bedNumber,jdbcType=VARCHAR}, + + + report_time = #{reportTime,jdbcType=BIGINT}, + + + check_time = #{checkTime,jdbcType=BIGINT}, + + + evaluation_code = #{evaluationCode,jdbcType=VARCHAR}, + + + url = #{url,jdbcType=VARCHAR}, + + + qr_code_url = #{qrCodeUrl,jdbcType=VARCHAR}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + is_del = #{isDel,jdbcType=TINYINT}, + + + show_status = #{showStatus,jdbcType=TINYINT}, + + + hospital = #{hospital,jdbcType=VARCHAR}, + + + complete_status = #{completeStatus,jdbcType=TINYINT}, + + + user_id = #{userId,jdbcType=BIGINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_ht_patient_report + set name = #{name,jdbcType=VARCHAR}, + patient_id = #{patientId,jdbcType=BIGINT}, + patient_idcard = #{patientIdcard,jdbcType=VARCHAR}, + patient_age = #{patientAge,jdbcType=TINYINT}, + doctor_id = #{doctorId,jdbcType=BIGINT}, + serial_number = #{serialNumber,jdbcType=VARCHAR}, + initial_impression = #{initialImpression,jdbcType=VARCHAR}, + clinical_diagnosis = #{clinicalDiagnosis,jdbcType=VARCHAR}, + pasi = #{pasi,jdbcType=TINYINT}, + department = #{department,jdbcType=VARCHAR}, + bed_number = #{bedNumber,jdbcType=VARCHAR}, + report_time = #{reportTime,jdbcType=BIGINT}, + check_time = #{checkTime,jdbcType=BIGINT}, + evaluation_code = #{evaluationCode,jdbcType=VARCHAR}, + url = #{url,jdbcType=VARCHAR}, + qr_code_url = #{qrCodeUrl,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_time = #{updateTime,jdbcType=TIMESTAMP}, + is_del = #{isDel,jdbcType=TINYINT}, + show_status = #{showStatus,jdbcType=TINYINT}, + hospital = #{hospital,jdbcType=VARCHAR}, + complete_status = #{completeStatus,jdbcType=TINYINT}, + user_id = #{userId,jdbcType=BIGINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/question/src/main/resources/mapper_raw/HtPatientReportRecordMapper.xml b/question/src/main/resources/mapper_raw/HtPatientReportRecordMapper.xml new file mode 100644 index 00000000..44de53a9 --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtPatientReportRecordMapper.xml @@ -0,0 +1,258 @@ + + + + + + + + + + + + + + + + + + + + + + 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, report_id, doctor_id, content, remark, create_time, update_time, is_del + + + + + delete from t_ht_patient_report_record + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_patient_report_record + + + + + + insert into t_ht_patient_report_record (id, report_id, doctor_id, + content, remark, create_time, + update_time, is_del) + values (#{id,jdbcType=BIGINT}, #{reportId,jdbcType=BIGINT}, #{doctorId,jdbcType=BIGINT}, + #{content,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT}) + + + insert into t_ht_patient_report_record + + + id, + + + report_id, + + + doctor_id, + + + content, + + + remark, + + + create_time, + + + update_time, + + + is_del, + + + + + #{id,jdbcType=BIGINT}, + + + #{reportId,jdbcType=BIGINT}, + + + #{doctorId,jdbcType=BIGINT}, + + + #{content,jdbcType=VARCHAR}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + + + + update t_ht_patient_report_record + + + id = #{record.id,jdbcType=BIGINT}, + + + report_id = #{record.reportId,jdbcType=BIGINT}, + + + doctor_id = #{record.doctorId,jdbcType=BIGINT}, + + + content = #{record.content,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_patient_report_record + set id = #{record.id,jdbcType=BIGINT}, + report_id = #{record.reportId,jdbcType=BIGINT}, + doctor_id = #{record.doctorId,jdbcType=BIGINT}, + content = #{record.content,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_patient_report_record + + + report_id = #{reportId,jdbcType=BIGINT}, + + + doctor_id = #{doctorId,jdbcType=BIGINT}, + + + content = #{content,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_patient_report_record + set report_id = #{reportId,jdbcType=BIGINT}, + doctor_id = #{doctorId,jdbcType=BIGINT}, + content = #{content,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/question/src/main/resources/mapper_raw/HtPatientScoreMapper.xml b/question/src/main/resources/mapper_raw/HtPatientScoreMapper.xml new file mode 100644 index 00000000..0507d7d8 --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtPatientScoreMapper.xml @@ -0,0 +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=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/question/src/main/resources/mapper_raw/HtPositionMapper.xml b/question/src/main/resources/mapper_raw/HtPositionMapper.xml new file mode 100644 index 00000000..ea7204c2 --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtPositionMapper.xml @@ -0,0 +1,323 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + 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, type, name, superior_department_id, superior_id, relevancy, has_manage, has_audit, + remark, create_time, update_time, is_del + + + + + delete from t_ht_position + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_position + + + + + + insert into t_ht_position (id, type, name, + superior_department_id, superior_id, relevancy, + has_manage, has_audit, remark, + create_time, update_time, is_del + ) + values (#{id,jdbcType=BIGINT}, #{type,jdbcType=TINYINT}, #{name,jdbcType=VARCHAR}, + #{superiorDepartmentId,jdbcType=BIGINT}, #{superiorId,jdbcType=BIGINT}, #{relevancy,jdbcType=VARCHAR}, + #{hasManage,jdbcType=TINYINT}, #{hasAudit,jdbcType=TINYINT}, #{remark,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT} + ) + + + insert into t_ht_position + + + id, + + + type, + + + name, + + + superior_department_id, + + + superior_id, + + + relevancy, + + + has_manage, + + + has_audit, + + + remark, + + + create_time, + + + update_time, + + + is_del, + + + + + #{id,jdbcType=BIGINT}, + + + #{type,jdbcType=TINYINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{superiorDepartmentId,jdbcType=BIGINT}, + + + #{superiorId,jdbcType=BIGINT}, + + + #{relevancy,jdbcType=VARCHAR}, + + + #{hasManage,jdbcType=TINYINT}, + + + #{hasAudit,jdbcType=TINYINT}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + + + + update t_ht_position + + + id = #{record.id,jdbcType=BIGINT}, + + + type = #{record.type,jdbcType=TINYINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + superior_department_id = #{record.superiorDepartmentId,jdbcType=BIGINT}, + + + superior_id = #{record.superiorId,jdbcType=BIGINT}, + + + relevancy = #{record.relevancy,jdbcType=VARCHAR}, + + + has_manage = #{record.hasManage,jdbcType=TINYINT}, + + + has_audit = #{record.hasAudit,jdbcType=TINYINT}, + + + 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_position + set id = #{record.id,jdbcType=BIGINT}, + type = #{record.type,jdbcType=TINYINT}, + name = #{record.name,jdbcType=VARCHAR}, + superior_department_id = #{record.superiorDepartmentId,jdbcType=BIGINT}, + superior_id = #{record.superiorId,jdbcType=BIGINT}, + relevancy = #{record.relevancy,jdbcType=VARCHAR}, + has_manage = #{record.hasManage,jdbcType=TINYINT}, + has_audit = #{record.hasAudit,jdbcType=TINYINT}, + 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_position + + + type = #{type,jdbcType=TINYINT}, + + + name = #{name,jdbcType=VARCHAR}, + + + superior_department_id = #{superiorDepartmentId,jdbcType=BIGINT}, + + + superior_id = #{superiorId,jdbcType=BIGINT}, + + + relevancy = #{relevancy,jdbcType=VARCHAR}, + + + has_manage = #{hasManage,jdbcType=TINYINT}, + + + has_audit = #{hasAudit,jdbcType=TINYINT}, + + + 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_position + set type = #{type,jdbcType=TINYINT}, + name = #{name,jdbcType=VARCHAR}, + superior_department_id = #{superiorDepartmentId,jdbcType=BIGINT}, + superior_id = #{superiorId,jdbcType=BIGINT}, + relevancy = #{relevancy,jdbcType=VARCHAR}, + has_manage = #{hasManage,jdbcType=TINYINT}, + has_audit = #{hasAudit,jdbcType=TINYINT}, + 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/question/src/main/resources/mapper_raw/HtQuestionIntroducerMapper.xml b/question/src/main/resources/mapper_raw/HtQuestionIntroducerMapper.xml new file mode 100644 index 00000000..f5157113 --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtQuestionIntroducerMapper.xml @@ -0,0 +1,258 @@ + + + + + + + + + + + + + + + + + + + + + + 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, content, sort, remark, create_time, update_time, is_del + + + + + delete from t_ht_question_introducer + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_question_introducer + + + + + + insert into t_ht_question_introducer (id, question_id, content, + sort, remark, create_time, + update_time, is_del) + values (#{id,jdbcType=BIGINT}, #{questionId,jdbcType=BIGINT}, #{content,jdbcType=VARCHAR}, + #{sort,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT}) + + + insert into t_ht_question_introducer + + + id, + + + question_id, + + + content, + + + sort, + + + remark, + + + create_time, + + + update_time, + + + is_del, + + + + + #{id,jdbcType=BIGINT}, + + + #{questionId,jdbcType=BIGINT}, + + + #{content,jdbcType=VARCHAR}, + + + #{sort,jdbcType=INTEGER}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + + + + update t_ht_question_introducer + + + id = #{record.id,jdbcType=BIGINT}, + + + question_id = #{record.questionId,jdbcType=BIGINT}, + + + content = #{record.content,jdbcType=VARCHAR}, + + + sort = #{record.sort,jdbcType=INTEGER}, + + + 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_introducer + set id = #{record.id,jdbcType=BIGINT}, + question_id = #{record.questionId,jdbcType=BIGINT}, + content = #{record.content,jdbcType=VARCHAR}, + sort = #{record.sort,jdbcType=INTEGER}, + 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_introducer + + + question_id = #{questionId,jdbcType=BIGINT}, + + + content = #{content,jdbcType=VARCHAR}, + + + sort = #{sort,jdbcType=INTEGER}, + + + 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_introducer + set question_id = #{questionId,jdbcType=BIGINT}, + content = #{content,jdbcType=VARCHAR}, + sort = #{sort,jdbcType=INTEGER}, + 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/question/src/main/resources/mapper_raw/HtQuestionMapper.xml b/question/src/main/resources/mapper_raw/HtQuestionMapper.xml new file mode 100644 index 00000000..602bd63b --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtQuestionMapper.xml @@ -0,0 +1,433 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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, evaluation_code, parent_code, sort, question, type, record_type, record_content, + relation_code, operate_type, recode_starttime, time_wabei, allow_clear, clear_times, + timing_length, remark, create_time, update_time, is_del + + + + + delete from t_ht_question + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_question + + + + + + insert into t_ht_question (id, evaluation_code, parent_code, + sort, question, type, + record_type, record_content, relation_code, + operate_type, recode_starttime, time_wabei, + allow_clear, clear_times, timing_length, + remark, create_time, update_time, + is_del) + values (#{id,jdbcType=BIGINT}, #{evaluationCode,jdbcType=VARCHAR}, #{parentCode,jdbcType=VARCHAR}, + #{sort,jdbcType=INTEGER}, #{question,jdbcType=VARCHAR}, #{type,jdbcType=TINYINT}, + #{recordType,jdbcType=VARCHAR}, #{recordContent,jdbcType=VARCHAR}, #{relationCode,jdbcType=VARCHAR}, + #{operateType,jdbcType=TINYINT}, #{recodeStarttime,jdbcType=TINYINT}, #{timeWabei,jdbcType=TINYINT}, + #{allowClear,jdbcType=TINYINT}, #{clearTimes,jdbcType=INTEGER}, #{timingLength,jdbcType=INTEGER}, + #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, + #{isDel,jdbcType=TINYINT}) + + + insert into t_ht_question + + + id, + + + evaluation_code, + + + parent_code, + + + sort, + + + question, + + + type, + + + record_type, + + + record_content, + + + relation_code, + + + operate_type, + + + recode_starttime, + + + time_wabei, + + + allow_clear, + + + clear_times, + + + timing_length, + + + remark, + + + create_time, + + + update_time, + + + is_del, + + + + + #{id,jdbcType=BIGINT}, + + + #{evaluationCode,jdbcType=VARCHAR}, + + + #{parentCode,jdbcType=VARCHAR}, + + + #{sort,jdbcType=INTEGER}, + + + #{question,jdbcType=VARCHAR}, + + + #{type,jdbcType=TINYINT}, + + + #{recordType,jdbcType=VARCHAR}, + + + #{recordContent,jdbcType=VARCHAR}, + + + #{relationCode,jdbcType=VARCHAR}, + + + #{operateType,jdbcType=TINYINT}, + + + #{recodeStarttime,jdbcType=TINYINT}, + + + #{timeWabei,jdbcType=TINYINT}, + + + #{allowClear,jdbcType=TINYINT}, + + + #{clearTimes,jdbcType=INTEGER}, + + + #{timingLength,jdbcType=INTEGER}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + + + + update t_ht_question + + + id = #{record.id,jdbcType=BIGINT}, + + + evaluation_code = #{record.evaluationCode,jdbcType=VARCHAR}, + + + parent_code = #{record.parentCode,jdbcType=VARCHAR}, + + + sort = #{record.sort,jdbcType=INTEGER}, + + + question = #{record.question,jdbcType=VARCHAR}, + + + type = #{record.type,jdbcType=TINYINT}, + + + record_type = #{record.recordType,jdbcType=VARCHAR}, + + + record_content = #{record.recordContent,jdbcType=VARCHAR}, + + + relation_code = #{record.relationCode,jdbcType=VARCHAR}, + + + operate_type = #{record.operateType,jdbcType=TINYINT}, + + + recode_starttime = #{record.recodeStarttime,jdbcType=TINYINT}, + + + time_wabei = #{record.timeWabei,jdbcType=TINYINT}, + + + allow_clear = #{record.allowClear,jdbcType=TINYINT}, + + + clear_times = #{record.clearTimes,jdbcType=INTEGER}, + + + timing_length = #{record.timingLength,jdbcType=INTEGER}, + + + 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 + set id = #{record.id,jdbcType=BIGINT}, + evaluation_code = #{record.evaluationCode,jdbcType=VARCHAR}, + parent_code = #{record.parentCode,jdbcType=VARCHAR}, + sort = #{record.sort,jdbcType=INTEGER}, + question = #{record.question,jdbcType=VARCHAR}, + type = #{record.type,jdbcType=TINYINT}, + record_type = #{record.recordType,jdbcType=VARCHAR}, + record_content = #{record.recordContent,jdbcType=VARCHAR}, + relation_code = #{record.relationCode,jdbcType=VARCHAR}, + operate_type = #{record.operateType,jdbcType=TINYINT}, + recode_starttime = #{record.recodeStarttime,jdbcType=TINYINT}, + time_wabei = #{record.timeWabei,jdbcType=TINYINT}, + allow_clear = #{record.allowClear,jdbcType=TINYINT}, + clear_times = #{record.clearTimes,jdbcType=INTEGER}, + timing_length = #{record.timingLength,jdbcType=INTEGER}, + 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 + + + evaluation_code = #{evaluationCode,jdbcType=VARCHAR}, + + + parent_code = #{parentCode,jdbcType=VARCHAR}, + + + sort = #{sort,jdbcType=INTEGER}, + + + question = #{question,jdbcType=VARCHAR}, + + + type = #{type,jdbcType=TINYINT}, + + + record_type = #{recordType,jdbcType=VARCHAR}, + + + record_content = #{recordContent,jdbcType=VARCHAR}, + + + relation_code = #{relationCode,jdbcType=VARCHAR}, + + + operate_type = #{operateType,jdbcType=TINYINT}, + + + recode_starttime = #{recodeStarttime,jdbcType=TINYINT}, + + + time_wabei = #{timeWabei,jdbcType=TINYINT}, + + + allow_clear = #{allowClear,jdbcType=TINYINT}, + + + clear_times = #{clearTimes,jdbcType=INTEGER}, + + + timing_length = #{timingLength,jdbcType=INTEGER}, + + + 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 + set evaluation_code = #{evaluationCode,jdbcType=VARCHAR}, + parent_code = #{parentCode,jdbcType=VARCHAR}, + sort = #{sort,jdbcType=INTEGER}, + question = #{question,jdbcType=VARCHAR}, + type = #{type,jdbcType=TINYINT}, + record_type = #{recordType,jdbcType=VARCHAR}, + record_content = #{recordContent,jdbcType=VARCHAR}, + relation_code = #{relationCode,jdbcType=VARCHAR}, + operate_type = #{operateType,jdbcType=TINYINT}, + recode_starttime = #{recodeStarttime,jdbcType=TINYINT}, + time_wabei = #{timeWabei,jdbcType=TINYINT}, + allow_clear = #{allowClear,jdbcType=TINYINT}, + clear_times = #{clearTimes,jdbcType=INTEGER}, + timing_length = #{timingLength,jdbcType=INTEGER}, + 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/question/src/main/resources/mapper_raw/HtQuestionOptionMapper.xml b/question/src/main/resources/mapper_raw/HtQuestionOptionMapper.xml new file mode 100644 index 00000000..941a2bf0 --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtQuestionOptionMapper.xml @@ -0,0 +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=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/question/src/main/resources/mapper_raw/HtQuestionScoringRuleMapper.xml b/question/src/main/resources/mapper_raw/HtQuestionScoringRuleMapper.xml new file mode 100644 index 00000000..f9b13e19 --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtQuestionScoringRuleMapper.xml @@ -0,0 +1,258 @@ + + + + + + + + + + + + + + + + + + + + + + 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, type, detail, remark, create_time, update_time, is_del + + + + + delete from t_ht_question_scoring_rule + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_question_scoring_rule + + + + + + insert into t_ht_question_scoring_rule (id, question_id, type, + detail, remark, create_time, + update_time, is_del) + values (#{id,jdbcType=BIGINT}, #{questionId,jdbcType=BIGINT}, #{type,jdbcType=TINYINT}, + #{detail,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT}) + + + insert into t_ht_question_scoring_rule + + + id, + + + question_id, + + + type, + + + detail, + + + remark, + + + create_time, + + + update_time, + + + is_del, + + + + + #{id,jdbcType=BIGINT}, + + + #{questionId,jdbcType=BIGINT}, + + + #{type,jdbcType=TINYINT}, + + + #{detail,jdbcType=VARCHAR}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + + + + update t_ht_question_scoring_rule + + + id = #{record.id,jdbcType=BIGINT}, + + + question_id = #{record.questionId,jdbcType=BIGINT}, + + + type = #{record.type,jdbcType=TINYINT}, + + + detail = #{record.detail,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_scoring_rule + set id = #{record.id,jdbcType=BIGINT}, + question_id = #{record.questionId,jdbcType=BIGINT}, + type = #{record.type,jdbcType=TINYINT}, + detail = #{record.detail,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_scoring_rule + + + question_id = #{questionId,jdbcType=BIGINT}, + + + type = #{type,jdbcType=TINYINT}, + + + detail = #{detail,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_scoring_rule + set question_id = #{questionId,jdbcType=BIGINT}, + type = #{type,jdbcType=TINYINT}, + detail = #{detail,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/question/src/main/resources/mapper_raw/HtRelationMapper.xml b/question/src/main/resources/mapper_raw/HtRelationMapper.xml new file mode 100644 index 00000000..b721cbd4 --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtRelationMapper.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + 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, user_id, relation_url, remark, create_time, update_time, is_del + + + + + delete from t_ht_relation + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_relation + + + + + + insert into t_ht_relation (id, user_id, relation_url, + remark, create_time, update_time, + is_del) + values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{relationUrl,jdbcType=VARCHAR}, + #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, + #{isDel,jdbcType=TINYINT}) + + + insert into t_ht_relation + + + id, + + + user_id, + + + relation_url, + + + remark, + + + create_time, + + + update_time, + + + is_del, + + + + + #{id,jdbcType=BIGINT}, + + + #{userId,jdbcType=BIGINT}, + + + #{relationUrl,jdbcType=VARCHAR}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + + + + update t_ht_relation + + + id = #{record.id,jdbcType=BIGINT}, + + + user_id = #{record.userId,jdbcType=BIGINT}, + + + relation_url = #{record.relationUrl,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_relation + set id = #{record.id,jdbcType=BIGINT}, + user_id = #{record.userId,jdbcType=BIGINT}, + relation_url = #{record.relationUrl,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_relation + + + user_id = #{userId,jdbcType=BIGINT}, + + + relation_url = #{relationUrl,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_relation + set user_id = #{userId,jdbcType=BIGINT}, + relation_url = #{relationUrl,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/question/src/main/resources/mapper_raw/HtReportMapper.xml b/question/src/main/resources/mapper_raw/HtReportMapper.xml new file mode 100644 index 00000000..c80dadd4 --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtReportMapper.xml @@ -0,0 +1,338 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + 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, code, name, parent_code, description, total_score, type, is_show, sort, remark, + create_time, update_time, is_del + + + + + delete from t_ht_report + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_report + + + + + + insert into t_ht_report (id, code, name, + parent_code, description, total_score, + type, is_show, sort, + remark, create_time, update_time, + is_del) + values (#{id,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, + #{parentCode,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{totalScore,jdbcType=INTEGER}, + #{type,jdbcType=TINYINT}, #{isShow,jdbcType=TINYINT}, #{sort,jdbcType=INTEGER}, + #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, + #{isDel,jdbcType=TINYINT}) + + + insert into t_ht_report + + + id, + + + code, + + + name, + + + parent_code, + + + description, + + + total_score, + + + type, + + + is_show, + + + sort, + + + remark, + + + create_time, + + + update_time, + + + is_del, + + + + + #{id,jdbcType=BIGINT}, + + + #{code,jdbcType=VARCHAR}, + + + #{name,jdbcType=VARCHAR}, + + + #{parentCode,jdbcType=VARCHAR}, + + + #{description,jdbcType=VARCHAR}, + + + #{totalScore,jdbcType=INTEGER}, + + + #{type,jdbcType=TINYINT}, + + + #{isShow,jdbcType=TINYINT}, + + + #{sort,jdbcType=INTEGER}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + + + + update t_ht_report + + + id = #{record.id,jdbcType=BIGINT}, + + + code = #{record.code,jdbcType=VARCHAR}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + parent_code = #{record.parentCode,jdbcType=VARCHAR}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + total_score = #{record.totalScore,jdbcType=INTEGER}, + + + type = #{record.type,jdbcType=TINYINT}, + + + is_show = #{record.isShow,jdbcType=TINYINT}, + + + sort = #{record.sort,jdbcType=INTEGER}, + + + 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_report + set id = #{record.id,jdbcType=BIGINT}, + code = #{record.code,jdbcType=VARCHAR}, + name = #{record.name,jdbcType=VARCHAR}, + parent_code = #{record.parentCode,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=VARCHAR}, + total_score = #{record.totalScore,jdbcType=INTEGER}, + type = #{record.type,jdbcType=TINYINT}, + is_show = #{record.isShow,jdbcType=TINYINT}, + sort = #{record.sort,jdbcType=INTEGER}, + 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_report + + + code = #{code,jdbcType=VARCHAR}, + + + name = #{name,jdbcType=VARCHAR}, + + + parent_code = #{parentCode,jdbcType=VARCHAR}, + + + description = #{description,jdbcType=VARCHAR}, + + + total_score = #{totalScore,jdbcType=INTEGER}, + + + type = #{type,jdbcType=TINYINT}, + + + is_show = #{isShow,jdbcType=TINYINT}, + + + sort = #{sort,jdbcType=INTEGER}, + + + 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_report + set code = #{code,jdbcType=VARCHAR}, + name = #{name,jdbcType=VARCHAR}, + parent_code = #{parentCode,jdbcType=VARCHAR}, + description = #{description,jdbcType=VARCHAR}, + total_score = #{totalScore,jdbcType=INTEGER}, + type = #{type,jdbcType=TINYINT}, + is_show = #{isShow,jdbcType=TINYINT}, + sort = #{sort,jdbcType=INTEGER}, + 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/question/src/main/resources/mapper_raw/HtTitleMapper.xml b/question/src/main/resources/mapper_raw/HtTitleMapper.xml new file mode 100644 index 00000000..37bd2a50 --- /dev/null +++ b/question/src/main/resources/mapper_raw/HtTitleMapper.xml @@ -0,0 +1,258 @@ + + + + + + + + + + + + + + + + + + + + + + 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, type, title, superidor_id, remark, create_time, update_time, is_del + + + + + delete from t_ht_title + where id = #{id,jdbcType=BIGINT} + + + delete from t_ht_title + + + + + + insert into t_ht_title (id, type, title, + superidor_id, remark, create_time, + update_time, is_del) + values (#{id,jdbcType=BIGINT}, #{type,jdbcType=TINYINT}, #{title,jdbcType=VARCHAR}, + #{superidorId,jdbcType=BIGINT}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + #{updateTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=TINYINT}) + + + insert into t_ht_title + + + id, + + + type, + + + title, + + + superidor_id, + + + remark, + + + create_time, + + + update_time, + + + is_del, + + + + + #{id,jdbcType=BIGINT}, + + + #{type,jdbcType=TINYINT}, + + + #{title,jdbcType=VARCHAR}, + + + #{superidorId,jdbcType=BIGINT}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{isDel,jdbcType=TINYINT}, + + + + + + update t_ht_title + + + id = #{record.id,jdbcType=BIGINT}, + + + type = #{record.type,jdbcType=TINYINT}, + + + title = #{record.title,jdbcType=VARCHAR}, + + + superidor_id = #{record.superidorId,jdbcType=BIGINT}, + + + 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_title + set id = #{record.id,jdbcType=BIGINT}, + type = #{record.type,jdbcType=TINYINT}, + title = #{record.title,jdbcType=VARCHAR}, + superidor_id = #{record.superidorId,jdbcType=BIGINT}, + 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_title + + + type = #{type,jdbcType=TINYINT}, + + + title = #{title,jdbcType=VARCHAR}, + + + superidor_id = #{superidorId,jdbcType=BIGINT}, + + + 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_title + set type = #{type,jdbcType=TINYINT}, + title = #{title,jdbcType=VARCHAR}, + superidor_id = #{superidorId,jdbcType=BIGINT}, + 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/question/src/main/resources/mybatis/mybatis-config.xml b/question/src/main/resources/mybatis/mybatis-config.xml new file mode 100644 index 00000000..893b9601 --- /dev/null +++ b/question/src/main/resources/mybatis/mybatis-config.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 3aacabde0780d02dcdbbc9f5e84eeb0ed714a0ae Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Tue, 2 Mar 2021 18:25:21 +0800 Subject: [PATCH 05/12] =?UTF-8?q?question=20=E8=AF=95=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=88=90=20KT=E7=9B=B8=E5=85=B3=E7=9A=84=EF=BC=8C?= =?UTF-8?q?=E4=BB=8D=E7=84=B6=E4=B8=8D=E9=80=9A=E7=94=A8=EF=BC=8C=E5=BE=85?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ccsens/question/uitl/Constant.java | 8 ++++---- question/src/main/resources/application-green.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/question/src/main/java/com/ccsens/question/uitl/Constant.java b/question/src/main/java/com/ccsens/question/uitl/Constant.java index 12f19e4b..2c976196 100644 --- a/question/src/main/java/com/ccsens/question/uitl/Constant.java +++ b/question/src/main/java/com/ccsens/question/uitl/Constant.java @@ -111,14 +111,14 @@ public class Constant { public final static List QUESTION_TYPE = new ArrayList<>(); public final static Map TYPE = new HashMap<>(); static { + QUESTION_TYPE.add("NIHSS"); + QUESTION_TYPE.add("BI"); QUESTION_TYPE.add("ADL"); + QUESTION_TYPE.add("HIS"); + QUESTION_TYPE.add("MMSE"); QUESTION_TYPE.add("HAMA"); QUESTION_TYPE.add("HAMD"); - QUESTION_TYPE.add("NPI"); - QUESTION_TYPE.add("MMSE"); QUESTION_TYPE.add("MoCA"); - QUESTION_TYPE.add("Rey"); - QUESTION_TYPE.add("XFXPD"); } } diff --git a/question/src/main/resources/application-green.yml b/question/src/main/resources/application-green.yml index 3a2f26b8..a6164fd4 100644 --- a/question/src/main/resources/application-green.yml +++ b/question/src/main/resources/application-green.yml @@ -1,5 +1,5 @@ server: - port: 7040 + port: 7160 servlet: context-path: spring: From 30762841423c5d1b2b705a7a909db0372c27c26a Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Thu, 4 Mar 2021 11:21:30 +0800 Subject: [PATCH 06/12] question green --- question/src/main/resources/application-green.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/question/src/main/resources/application-green.yml b/question/src/main/resources/application-green.yml index a6164fd4..5a4de1f1 100644 --- a/question/src/main/resources/application-green.yml +++ b/question/src/main/resources/application-green.yml @@ -31,11 +31,11 @@ swagger: file: path: /home/cloud/question/uploads/ #domain: https://api.ccsens.com/test/ - domain: https://test.tall.wiki/gateway/question/ - imgDomain: https://test.tall.wiki/gateway/question/uploads + domain: https://www.sxwikionline.com/gateway/question/ + imgDomain: https://www.sxwikionline.com/gateway/question/uploads ht: project: - patientUrl: https://test.tall.wiki/ht-dev/htPatientRegister + patientUrl: https://www.sxwikionline.com/ht-dev/htPatientRegister name: 认知功能评测云平台系统 eureka: instance: From f0a6fcfbc2fb7948e499e3513f19b63b375c8cfd Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Wed, 10 Mar 2021 10:21:53 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/question/bean/dto/QuestionDto.java | 2 ++ .../question/bean/vo/PatientReportVo.java | 32 +++++++++---------- .../question/service/QuestionService.java | 10 +++++- .../com/ccsens/question/uitl/Constant.java | 10 ++++-- question/src/main/resources/application.yml | 4 +-- question/src/main/resources/druid-dev.yml | 6 ++-- .../mapper_dao/HtPatientReportDao.xml | 7 ++-- .../main/java/com/ccsens/util/PdfUtil.java | 2 +- 8 files changed, 45 insertions(+), 28 deletions(-) diff --git a/question/src/main/java/com/ccsens/question/bean/dto/QuestionDto.java b/question/src/main/java/com/ccsens/question/bean/dto/QuestionDto.java index 4e0a83da..16498849 100644 --- a/question/src/main/java/com/ccsens/question/bean/dto/QuestionDto.java +++ b/question/src/main/java/com/ccsens/question/bean/dto/QuestionDto.java @@ -115,6 +115,8 @@ public class QuestionDto { @NotBlank(message = "上级code不能为空") @ApiModelProperty("上级code") private String code; + @ApiModelProperty("是否显示报告单 0:否 1:是，默认为是") + private byte showReport = 1; } } diff --git a/question/src/main/java/com/ccsens/question/bean/vo/PatientReportVo.java b/question/src/main/java/com/ccsens/question/bean/vo/PatientReportVo.java index 118c4f9d..950a7a7a 100644 --- a/question/src/main/java/com/ccsens/question/bean/vo/PatientReportVo.java +++ b/question/src/main/java/com/ccsens/question/bean/vo/PatientReportVo.java @@ -142,23 +142,23 @@ public class PatientReportVo { //第一栏 rows.add( fillRow( - "姓名：" + this.patientName, - "性别：" + (this.sex == 0 ? "男" : "女"), - "年龄：" + this.patientAge + " 岁") + "姓名：" + (StrUtil.isEmpty(this.patientName) ? "" : this.patientName), + "性别：" + (this.sex == null ? "" : this.sex == 0 ? "男" : "女"), + "年龄：" + (this.patientAge != null && this.patientAge != 0 ? this.patientAge + " 岁" : "")) ); //第二栏 rows.add( fillRow( - "文化程度：" + this.educationalStatusUnit + "年", - "编号：" + this.serialNumber, - "职业：" + careerMap.get(this.career)) + "文化程度：" + (StrUtil.isEmpty(this.educationalStatusUnit) ? "" : this.educationalStatusUnit + "年"), + "编号：" + (StrUtil.isEmpty(this.serialNumber) ? "" : this.serialNumber), + "职业：" + (this.career != null ? careerMap.get(this.career) : "")) ); //第三栏 rows.add( fillRow( - "科别：" + this.department, - "床号：" + this.bedNumber, - "病案号：" + this.hospitalNumber) + "科别：" + (StrUtil.isEmpty(this.department) ? "" : this.department), + "床号：" + (StrUtil.isEmpty(this.bedNumber) ? "" : this.bedNumber), + "病案号：" + (StrUtil.isEmpty(this.hospitalNumber) ? "" : this.hospitalNumber)) ); //第四栏 // Date date = null; @@ -169,7 +169,7 @@ public class PatientReportVo { rows.add( fillRow( - "临床诊断：" + this.clinicalDiagnosis, + "临床诊断：" + (StrUtil.isEmpty(this.clinicalDiagnosis) ? "" : this.clinicalDiagnosis), "","") // "检查日期：" + (date == null ? "" : DateUtil.format(date, "yyyy-MM-dd"))) ); @@ -282,11 +282,11 @@ public class PatientReportVo { this.subReport.forEach(reportScore -> { String score = (reportScore.score == null ? "" : reportScore.score) + (reportScore.getTotalScore() > 0 ? "/" + reportScore.getTotalScore() : ""); boolean isLast = npi.equalsIgnoreCase(this.code) && this.subReport.indexOf(reportScore) == this.subReport.size() - 1; - fillRow(row1,row2, reportScore.getName(), score, mmse.equalsIgnoreCase(this.code), isLast, npi.equalsIgnoreCase(this.code) ? new int[]{3,3} : null); + fillRow(row1,row2, reportScore.getName(), score, isLast, npi.equalsIgnoreCase(this.code) ? new int[]{3,3} : null); }); // 总分 if (mmse.equalsIgnoreCase(this.code)) { - fillRow(row1,row2, "总分", (this.score == null ? "" : this.score) + (this.totalScore > 0 ? "/" + this.totalScore : ""), mmse.equalsIgnoreCase(this.code), true); + fillRow(row1,row2, "总分", (this.score == null ? "" : this.score) + (this.totalScore > 0 ? "/" + this.totalScore : ""), true); } rows.add(row1); rows.add(row2); @@ -305,10 +305,10 @@ public class PatientReportVo { ReportScore reportScore = this.subReport.get(i); String jy = "JY"; if (jy.equalsIgnoreCase(reportScore.getCode())) { - fillRow(row1, row2, reportScore.getName(), " ", false, false, i == 0 ? new int[]{2,2}: null); + fillRow(row1, row2, reportScore.getName(), " ", false, i == 0 ? new int[]{2,2}: null); } else { String score = (reportScore.score == null ? "" : reportScore.score) + (reportScore.getTotalScore() > 0 ? "/" + reportScore.getTotalScore() : ""); - fillRow(row1, row2, reportScore.getName(), score, false, false, i == 0 ? new int[]{2,2}: null); + fillRow(row1, row2, reportScore.getName(), score, false, i == 0 ? new int[]{2,2}: null); } } PdfUtil.Cell scoreNameCell = new PdfUtil.Cell(); @@ -392,11 +392,11 @@ public class PatientReportVo { // } // } - private void fillRow(PdfUtil.Row row1, PdfUtil.Row row2, String name, String score, boolean isTop, boolean isRight, int... colspan){ + private void fillRow(PdfUtil.Row row1, PdfUtil.Row row2, String name, String score, boolean isRight, int... colspan){ //名称 PdfUtil.Cell cell1 = new PdfUtil.Cell(); cell1.setContent(name); - cell1.setBorderTop(isTop? 1 : 0); +// cell1.setBorderTop(isTop? 1 : 0); cell1.setBorderRight(isRight? 1 : 0); cell1.setColSpan(colspan == null || colspan.length == 0 ? 1 : colspan[0]); row1.addCell(cell1); diff --git a/question/src/main/java/com/ccsens/question/service/QuestionService.java b/question/src/main/java/com/ccsens/question/service/QuestionService.java index 822be335..47ceb313 100644 --- a/question/src/main/java/com/ccsens/question/service/QuestionService.java +++ b/question/src/main/java/com/ccsens/question/service/QuestionService.java @@ -803,6 +803,14 @@ public class QuestionService implements IQuestionService { */ @Override public List queryReportCode(QuestionDto.QueryReportCode param, Long userId) { - return htReportDao.queryReportCode(param.getCode()); + List codes = htReportDao.queryReportCode(param.getCode()); + if (param.getShowReport() == Constant.STATUS_YES) { + log.info("添加生成报告单"); + QuestionVo.ReportCode code = new QuestionVo.ReportCode(); + code.setCode("BGDSC"); + code.setName("报告单编辑"); + codes.add(code); + } + return codes; } } diff --git a/question/src/main/java/com/ccsens/question/uitl/Constant.java b/question/src/main/java/com/ccsens/question/uitl/Constant.java index 2c976196..f6f86d96 100644 --- a/question/src/main/java/com/ccsens/question/uitl/Constant.java +++ b/question/src/main/java/com/ccsens/question/uitl/Constant.java @@ -20,6 +20,11 @@ public class Constant { public static final String VIDEO = ".flv,swf,mkv,avi,rm,rmvb,mpeg,mpg,.ogg,ogv,mov,wmv,mp4,webm,mp3,wav,mid,.wma"; /**上传图片访问路径*/ public static final String UPLOAD_URL = "uploads/"; + /**状态：是*/ + public static final byte STATUS_YES = 1; + /**状态：否*/ + public static final byte STATUS_NO = 0; + /**病友画图轨迹颜色*/ public static final class LineColour { @@ -55,10 +60,11 @@ public class Constant { public final static String DOCTOR_PARAM = "doctor"; public final static byte SEX_MAN = 0; public final static byte SEX_WOMAN = 1; - - /**删除*/ public final static byte IS_DEL = 1; + + + public final static class Rule { public static final byte SMALL = 0; public static final String SMALL_NUM = "small"; diff --git a/question/src/main/resources/application.yml b/question/src/main/resources/application.yml index 1d437161..5c2cd5c4 100644 --- a/question/src/main/resources/application.yml +++ b/question/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: green - include: common, util-green \ No newline at end of file + active: dev + include: common, util-dev \ No newline at end of file diff --git a/question/src/main/resources/druid-dev.yml b/question/src/main/resources/druid-dev.yml index 66d23a67..cfa8f91f 100644 --- a/question/src/main/resources/druid-dev.yml +++ b/question/src/main/resources/druid-dev.yml @@ -15,7 +15,7 @@ spring: maxWait: 60000 minEvictableIdleTimeMillis: 300000 minIdle: 5 - password: b3fd300ad4694070007fdcca961c4018211dc53235dd806ad62abc0cc0abb8e5 + password: 1b01d55a27843cfc487ce8dd6915fc22 poolPreparedStatements: true servletLogSlowSql: true servletLoginPassword: 111111 @@ -27,7 +27,7 @@ spring: testOnReturn: false testWhileIdle: true timeBetweenEvictionRunsMillis: 60000 - url: jdbc:mysql://49.233.89.188:3306/question?useUnicode=true&characterEncoding=UTF-8 + url: jdbc:mysql://49.232.6.143:3306/question?useUnicode=true&characterEncoding=UTF-8 username: root validationQuery: SELECT 1 FROM DUAL - env: CCSENS_HT \ No newline at end of file + env: CCSENS_ENTERPRISE \ No newline at end of file diff --git a/question/src/main/resources/mapper_dao/HtPatientReportDao.xml b/question/src/main/resources/mapper_dao/HtPatientReportDao.xml index 950e170c..a6287160 100644 --- a/question/src/main/resources/mapper_dao/HtPatientReportDao.xml +++ b/question/src/main/resources/mapper_dao/HtPatientReportDao.xml @@ -40,9 +40,10 @@ + \ No newline at end of file diff --git a/ht/src/main/resources/mapper_dao/HtReportDao.xml b/ht/src/main/resources/mapper_dao/HtReportDao.xml index 6f67f6a3..5fb147b6 100644 --- a/ht/src/main/resources/mapper_dao/HtReportDao.xml +++ b/ht/src/main/resources/mapper_dao/HtReportDao.xml @@ -35,5 +35,36 @@ + \ No newline at end of file diff --git a/question/src/main/java/com/ccsens/question/bean/vo/PatientReportVo.java b/question/src/main/java/com/ccsens/question/bean/vo/PatientReportVo.java index 950a7a7a..4d6675a3 100644 --- a/question/src/main/java/com/ccsens/question/bean/vo/PatientReportVo.java +++ b/question/src/main/java/com/ccsens/question/bean/vo/PatientReportVo.java @@ -273,7 +273,7 @@ public class PatientReportVo { cell.setContent(this.code + (StrUtil.isBlank(this.remark) ? "" : "("+this.remark+")")); cell.setRowSpan(2); cell.setColSpan(npi.equalsIgnoreCase(this.code) ? headNum : 1); - cell.setBorderTop(mmse.equalsIgnoreCase(this.code) ? 1 : 0); +// cell.setBorderTop(mmse.equalsIgnoreCase(this.code) ? 1 : 0); row1.addCell(cell); //被合并cell PdfUtil.Row row2 = new PdfUtil.Row(); @@ -328,7 +328,7 @@ public class PatientReportVo { PdfUtil.Row row5 = new PdfUtil.Row(); //延迟回忆特殊处理 String ychy = "YCHY"; - int size = this.subReport.size() - 1; + int size = this.subReport.size(); for (int i = firstIndex; i < size; i++) { ReportScore reportScore = this.subReport.get(i); //设置名字 diff --git a/question/src/main/java/com/ccsens/question/service/PatientReportService.java b/question/src/main/java/com/ccsens/question/service/PatientReportService.java index f4b96125..b73e0fca 100644 --- a/question/src/main/java/com/ccsens/question/service/PatientReportService.java +++ b/question/src/main/java/com/ccsens/question/service/PatientReportService.java @@ -402,7 +402,7 @@ public class PatientReportService implements IPatientReportService { dateCell.setBorderBottom(null); dateCell.setBorderLeft(null); content.add(row2); - + log.info("导出列表：{}", content); String path = PropUtil.imgDomain + "/" + PdfUtil.credatePdf(PropUtil.path, detail.getPatient().getHospital(), Constant.Ht.Report.PARENT_NAME, detail.getPatient().toPdfRow(), content, new PdfUtil.Margin()); report.setUrl(path); htPatientReportDao.updateByPrimaryKeySelective(report); diff --git a/question/src/main/resources/application-dev.yml b/question/src/main/resources/application-dev.yml index b8320dfc..e7aef7a1 100644 --- a/question/src/main/resources/application-dev.yml +++ b/question/src/main/resources/application-dev.yml @@ -30,8 +30,8 @@ swagger: file: path: /home/cloud/question/uploads/ #domain: https://api.ccsens.com/test/ - domain: http://localhost:7040/ - imgDomain: http://localhost:7040/uploads + domain: http://localhost:7160/ + imgDomain: http://localhost:7160/uploads ht: project: patientUrl: https://www.baidu.com/ From a1e27e8094f3dc4667ad9e03bfbcc1f93e20c6e6 Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Thu, 11 Mar 2021 15:02:53 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=88=86=E6=95=B0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E5=91=8A=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper_dao/HtPatientReportDao.xml | 6 +- .../api/PatientReportSearchController.java | 58 +++++++++++++++++++ .../bean/dto/PatientReportSearchDto.java | 38 ++++++++++++ .../bean/vo/PatientReportSearchVo.java | 33 +++++++++++ .../persist/dao/HtPatientReportDao.java | 9 +++ .../question/persist/dao/HtReportDao.java | 8 +++ .../service/IPatientReportService.java | 15 +++++ .../service/PatientReportService.java | 31 +++++++++- .../mapper_dao/HtPatientReportDao.xml | 31 ++++++++++ .../main/resources/mapper_dao/HtReportDao.xml | 31 ++++++++++ 10 files changed, 256 insertions(+), 4 deletions(-) create mode 100644 question/src/main/java/com/ccsens/question/api/PatientReportSearchController.java create mode 100644 question/src/main/java/com/ccsens/question/bean/dto/PatientReportSearchDto.java create mode 100644 question/src/main/java/com/ccsens/question/bean/vo/PatientReportSearchVo.java diff --git a/ht/src/main/resources/mapper_dao/HtPatientReportDao.xml b/ht/src/main/resources/mapper_dao/HtPatientReportDao.xml index afb9de04..acf5782d 100644 --- a/ht/src/main/resources/mapper_dao/HtPatientReportDao.xml +++ b/ht/src/main/resources/mapper_dao/HtPatientReportDao.xml @@ -244,12 +244,12 @@ GROUP BY patient_report_id HAVING - + - AND sum( score ) >= #{item.start} + sum( score ) >= #{item.start} AND - AND sum( score ) <= #{item.end} + sum( score ) <= #{item.end} AND diff --git a/question/src/main/java/com/ccsens/question/api/PatientReportSearchController.java b/question/src/main/java/com/ccsens/question/api/PatientReportSearchController.java new file mode 100644 index 00000000..d725e739 --- /dev/null +++ b/question/src/main/java/com/ccsens/question/api/PatientReportSearchController.java @@ -0,0 +1,58 @@ +package com.ccsens.question.api; + +import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.question.bean.dto.PatientReportSearchDto; +import com.ccsens.question.bean.vo.PatientReportSearchVo; +import com.ccsens.question.service.IPatientReportService; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; +import io.swagger.annotations.*; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.List; + +/** + * @description: + * @author: whj + * @time: 2021/3/10 15:03 + */ +@Slf4j +@Api(tags = "报告单搜索",value = "报告单搜索条件，搜索") +@RestController +@RequestMapping("/patientReport") +public class PatientReportSearchController { + @Resource + private IPatientReportService patientReportService; + + @MustLogin + @ApiOperation(value = "查询搜索条件",notes = "whj 查询搜索条件") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "查询搜索条件", required = true) + }) + @RequestMapping(value="/searchParam", method = RequestMethod.POST) + public JsonResponse searchParam(@RequestBody @ApiParam @Valid QueryDto dto){ + log.info("查询搜索条件：{}", dto); + List params = patientReportService.searchParam(dto.getParam()); + log.info("查询搜索条件已完成：{}", params); + return JsonResponse.newInstance().ok(params); + } + + @MustLogin + @ApiOperation(value = "根据条件搜索报告单",notes = "whj 搜索报告单") + @ApiImplicitParams({ + @ApiImplicitParam(name = "json", value = "查询搜索条件", required = true) + }) + @RequestMapping(value="/search", method = RequestMethod.POST) + public JsonResponse search(@RequestBody @ApiParam @Valid QueryDto dto){ + log.info("搜索报告单：{}", dto); + List params = patientReportService.search(dto.getParam()); + log.info("搜索报告单已完成"); + return JsonResponse.newInstance().ok(params); + } +} diff --git a/question/src/main/java/com/ccsens/question/bean/dto/PatientReportSearchDto.java b/question/src/main/java/com/ccsens/question/bean/dto/PatientReportSearchDto.java new file mode 100644 index 00000000..5c368fd2 --- /dev/null +++ b/question/src/main/java/com/ccsens/question/bean/dto/PatientReportSearchDto.java @@ -0,0 +1,38 @@ +package com.ccsens.question.bean.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import java.util.List; + +/** + * @description: + * @author: whj + * @time: 2021/3/10 16:21 + */ +public class PatientReportSearchDto { + @Data + @ApiModel("搜索条件-请求参数") + public static class SearchParam{ + @ApiModelProperty("查询类型") + @NotEmpty(message = "请输入查询报告单类型") + private String parentCode; + } + + @Data + @ApiModel("搜索报告单参数列表-请求") + public static class SearchList { + private List codes; + } + + @Data + @ApiModel("搜索报告单参数-请求") + public static class Search { + @NotEmpty(message="请选择查询类型") + private String code; + private Integer start; + private Integer end; + } +} diff --git a/question/src/main/java/com/ccsens/question/bean/vo/PatientReportSearchVo.java b/question/src/main/java/com/ccsens/question/bean/vo/PatientReportSearchVo.java new file mode 100644 index 00000000..260bca30 --- /dev/null +++ b/question/src/main/java/com/ccsens/question/bean/vo/PatientReportSearchVo.java @@ -0,0 +1,33 @@ +package com.ccsens.question.bean.vo; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: whj + * @time: 2021/3/10 16:06 + */ +public class PatientReportSearchVo { + + @Data + @ApiModel("搜索条件-响应") + public static class SearchParam { + private Long id; + private String code; + private String name; + private byte optionStatus; + private String parentCode; + private List children = new ArrayList<>(); + } + + @Data + @ApiModel("搜索-响应") + public static class Search { + private Long id; + private String name; + } +} diff --git a/question/src/main/java/com/ccsens/question/persist/dao/HtPatientReportDao.java b/question/src/main/java/com/ccsens/question/persist/dao/HtPatientReportDao.java index 61be86f8..ce8b5d72 100644 --- a/question/src/main/java/com/ccsens/question/persist/dao/HtPatientReportDao.java +++ b/question/src/main/java/com/ccsens/question/persist/dao/HtPatientReportDao.java @@ -1,6 +1,8 @@ package com.ccsens.question.persist.dao; import com.ccsens.question.bean.dto.PatientReportDto; +import com.ccsens.question.bean.dto.PatientReportSearchDto; +import com.ccsens.question.bean.vo.PatientReportSearchVo; import com.ccsens.question.bean.vo.PatientReportVo; import com.ccsens.question.persist.mapper.HtPatientReportMapper; import org.apache.ibatis.annotations.Param; @@ -95,4 +97,11 @@ public interface HtPatientReportDao extends HtPatientReportMapper { * @return */ List queryReportAnswer(@Param("id") Long id, @Param("evaluationCode") String evaluationCode); + + /** + * 根据分数搜索报告单 + * @param codes 分数 + * @return 报告单 + */ + List search(@Param("codes") List codes); } diff --git a/question/src/main/java/com/ccsens/question/persist/dao/HtReportDao.java b/question/src/main/java/com/ccsens/question/persist/dao/HtReportDao.java index 26fa7f2d..594e2014 100644 --- a/question/src/main/java/com/ccsens/question/persist/dao/HtReportDao.java +++ b/question/src/main/java/com/ccsens/question/persist/dao/HtReportDao.java @@ -1,6 +1,7 @@ package com.ccsens.question.persist.dao; import com.ccsens.question.bean.po.HtReport; +import com.ccsens.question.bean.vo.PatientReportSearchVo; import com.ccsens.question.bean.vo.QuestionVo; import com.ccsens.question.persist.mapper.HtReportMapper; import org.apache.ibatis.annotations.Param; @@ -37,4 +38,11 @@ public interface HtReportDao extends HtReportMapper { * @return 返回测评类型 */ List queryReportCode(@Param("code") String code); + + /** + * 查询所有下级菜单和是否有试题 + * @param parentCode 父code + * @return 搜索条件 + */ + List queryParam(@Param("parentCode") String parentCode); } diff --git a/question/src/main/java/com/ccsens/question/service/IPatientReportService.java b/question/src/main/java/com/ccsens/question/service/IPatientReportService.java index 3110c8d3..90b560cb 100644 --- a/question/src/main/java/com/ccsens/question/service/IPatientReportService.java +++ b/question/src/main/java/com/ccsens/question/service/IPatientReportService.java @@ -1,7 +1,9 @@ package com.ccsens.question.service; import com.ccsens.question.bean.dto.PatientReportDto; +import com.ccsens.question.bean.dto.PatientReportSearchDto; import com.ccsens.question.bean.po.HtDoctor; +import com.ccsens.question.bean.vo.PatientReportSearchVo; import com.ccsens.question.bean.vo.PatientReportVo; import com.ccsens.util.CodeEnum; import com.ccsens.util.JsonResponse; @@ -142,4 +144,17 @@ public interface IPatientReportService { List queryReportAnswer(PatientReportDto.QueryReportAnswer param, Long userId); + /** + * 查询报告单的搜索条件 + * @param param 父code + * @return 搜索条件 + */ + List searchParam(PatientReportSearchDto.SearchParam param); + + /** + * 搜索报告单 + * @param param 搜索列表 + * @return 报告单 + */ + List search(PatientReportSearchDto.SearchList param); } diff --git a/question/src/main/java/com/ccsens/question/service/PatientReportService.java b/question/src/main/java/com/ccsens/question/service/PatientReportService.java index b73e0fca..708b185e 100644 --- a/question/src/main/java/com/ccsens/question/service/PatientReportService.java +++ b/question/src/main/java/com/ccsens/question/service/PatientReportService.java @@ -7,11 +7,14 @@ import cn.hutool.core.util.IdcardUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.ccsens.question.bean.dto.PatientReportDto; +import com.ccsens.question.bean.dto.PatientReportSearchDto; import com.ccsens.question.bean.po.*; +import com.ccsens.question.bean.vo.PatientReportSearchVo; import com.ccsens.question.bean.vo.PatientReportVo; import com.ccsens.question.persist.dao.HtDoctorDao; import com.ccsens.question.persist.dao.HtPatientReportDao; import com.ccsens.question.persist.dao.HtPositionDao; +import com.ccsens.question.persist.dao.HtReportDao; import com.ccsens.question.persist.mapper.HtPatientFollowUpMapper; import com.ccsens.question.persist.mapper.HtPatientMapper; import com.ccsens.question.persist.mapper.HtPatientReportRecordMapper; @@ -46,7 +49,7 @@ import java.util.concurrent.atomic.AtomicReference; @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) public class PatientReportService implements IPatientReportService { - @Autowired + @Resource private Snowflake snowflake; @Resource private HtDoctorDao htDoctorDao; @@ -60,6 +63,8 @@ public class PatientReportService implements IPatientReportService { private HtPatientReportRecordMapper htPatientReportRecordMapper; @Resource private HtPatientFollowUpMapper htPatientFollowUpMapper; + @Resource + private HtReportDao htReportDao; @Override public JsonResponse generatePatientReport(PatientReportDto.Generate generate, Long userId) { @@ -578,5 +583,29 @@ public class PatientReportService implements IPatientReportService { return htPatientReportDao.queryReportAnswer(param.getId(),param.getEvaluationCode()); } + @Override + public List searchParam(PatientReportSearchDto.SearchParam param) { + List list = htReportDao.queryParam(param.getParentCode()); + if (CollectionUtil.isEmpty(list)) { + return list; + } + Map map = new HashMap<>(); + List nodes = new ArrayList<>(); + list.forEach(searchParam -> { + if (param.getParentCode().equals(searchParam.getParentCode())) { + nodes.add(searchParam); + } else { + PatientReportSearchVo.SearchParam parent = map.get(searchParam.getParentCode()); + parent.getChildren().add(searchParam); + } + map.put(searchParam.getCode(), searchParam); + }); + return nodes; + } + @Override + public List search(PatientReportSearchDto.SearchList param) { + List list = htPatientReportDao.search(param.getCodes()); + return list; + } } diff --git a/question/src/main/resources/mapper_dao/HtPatientReportDao.xml b/question/src/main/resources/mapper_dao/HtPatientReportDao.xml index a6287160..69ead2bd 100644 --- a/question/src/main/resources/mapper_dao/HtPatientReportDao.xml +++ b/question/src/main/resources/mapper_dao/HtPatientReportDao.xml @@ -225,6 +225,37 @@ and a.questionId = t.question_id ORDER BY a.questionId ,a.sort + \ No newline at end of file diff --git a/question/src/main/resources/mapper_dao/HtReportDao.xml b/question/src/main/resources/mapper_dao/HtReportDao.xml index fbd671bd..abe87d9d 100644 --- a/question/src/main/resources/mapper_dao/HtReportDao.xml +++ b/question/src/main/resources/mapper_dao/HtReportDao.xml @@ -47,5 +47,36 @@ parent_code = #{code} ORDER BY sort + \ No newline at end of file From 4b919fc06305f5fe62edd42076e2206abbc7965a Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Mon, 15 Mar 2021 12:09:25 +0800 Subject: [PATCH 10/12] ht --- .../service/PatientReportService.java | 66 +++++++++---------- question/src/main/resources/application.yml | 4 +- 2 files changed, 34 insertions(+), 36 deletions(-) diff --git a/question/src/main/java/com/ccsens/question/service/PatientReportService.java b/question/src/main/java/com/ccsens/question/service/PatientReportService.java index 708b185e..52db1c90 100644 --- a/question/src/main/java/com/ccsens/question/service/PatientReportService.java +++ b/question/src/main/java/com/ccsens/question/service/PatientReportService.java @@ -169,17 +169,17 @@ public class PatientReportService implements IPatientReportService { public PageInfo queryReports(PatientReportDto.QueryReports query, Long userId) { //查询医生信息 - HtDoctorExample doctorExample = new HtDoctorExample(); - doctorExample.createCriteria().andUserIdEqualTo(userId).andAuditStateEqualTo(Constant.Ht.Doctor.CHECK_SUCCESS).andIsDelEqualTo(Constant.Ht.NUMBER_DEFAULT); - List doctors = htDoctorDao.selectByExample(doctorExample); - log.info("当前用户是否为医生：{}", CollectionUtil.isNotEmpty(doctors)); +// HtDoctorExample doctorExample = new HtDoctorExample(); +// doctorExample.createCriteria().andUserIdEqualTo(userId).andAuditStateEqualTo(Constant.Ht.Doctor.CHECK_SUCCESS).andIsDelEqualTo(Constant.Ht.NUMBER_DEFAULT); +// List doctors = htDoctorDao.selectByExample(doctorExample); +// log.info("当前用户是否为医生：{}", CollectionUtil.isNotEmpty(doctors)); // 获取医生ID和病人ID Long patientId = null; Long doctorId = null; if (query.getPatientId() != null) { patientId = query.getPatientId(); - } else if (CollectionUtil.isNotEmpty(doctors)) { - doctorId = doctors.get(0).getId(); +// } else if (CollectionUtil.isNotEmpty(doctors)) { +// doctorId = doctors.get(0).getId(); } else { log.info("既无病人信息，有无医生信息，不允许查询"); throw new BaseException(CodeEnum.PARAM_ERROR); @@ -187,34 +187,32 @@ public class PatientReportService implements IPatientReportService { //分页查询报告单列表 PageHelper.startPage(query.getPageNum(), query.getPageSize()); List reportVos = htPatientReportDao.queryReportName(doctorId, patientId); - if (CollectionUtils.isEmpty(reportVos)) { - return new PageInfo<>(reportVos); - } - - - if (CollectionUtil.isEmpty(doctors)) { - return new PageInfo<>(reportVos); - } - HtDoctor doctor = doctors.get(0); - //查询下属职务 - List lowerPositionIds = htPositionDao.queryAllLowerPosition(doctor.getPositionId()); - reportVos.forEach(reportVo -> { - - //自己的可见详情 - if (doctor.getId().equals(reportVo.getDoctorId())) { - reportVo.setAuthority((byte)1); - } else if (CollectionUtils.isEmpty(lowerPositionIds)) { - reportVo.setAuthority((byte)0); - } else { - HtDoctor reportDoctor = htDoctorDao.selectByPrimaryKey(reportVo.getDoctorId()); - //自己下属的可见详情 - if (lowerPositionIds.contains(reportDoctor.getPositionId())) { - reportVo.setAuthority((byte)1); - } else { - reportVo.setAuthority((byte)0); - } - } - }); +// if (CollectionUtils.isEmpty(reportVos)) { +// return new PageInfo<>(reportVos); +// } +// if (CollectionUtil.isEmpty(doctors)) { +// return new PageInfo<>(reportVos); +// } +// HtDoctor doctor = doctors.get(0); +// //查询下属职务 +// List lowerPositionIds = htPositionDao.queryAllLowerPosition(doctor.getPositionId()); +// reportVos.forEach(reportVo -> { +// +// //自己的可见详情 +// if (doctor.getId().equals(reportVo.getDoctorId())) { +// reportVo.setAuthority((byte)1); +// } else if (CollectionUtils.isEmpty(lowerPositionIds)) { +// reportVo.setAuthority((byte)0); +// } else { +// HtDoctor reportDoctor = htDoctorDao.selectByPrimaryKey(reportVo.getDoctorId()); +// //自己下属的可见详情 +// if (lowerPositionIds.contains(reportDoctor.getPositionId())) { +// reportVo.setAuthority((byte)1); +// } else { +// reportVo.setAuthority((byte)0); +// } +// } +// }); return new PageInfo<>(reportVos); } diff --git a/question/src/main/resources/application.yml b/question/src/main/resources/application.yml index 5c2cd5c4..1d437161 100644 --- a/question/src/main/resources/application.yml +++ b/question/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: dev - include: common, util-dev \ No newline at end of file + active: green + include: common, util-green \ No newline at end of file From 1bbf02f9181ffbedeaf0bdb4168a3c0d21fef2a2 Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Mon, 15 Mar 2021 18:25:47 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E5=8D=95=E6=97=B6=EF=BC=8C=E5=B0=86=E6=98=BE=E7=A4=BA=E5=9C=A8?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=8A=A5=E5=91=8A=E5=8D=95=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ht/service/PatientReportService.java | 1 + .../service/PatientReportService.java | 111 +++++++++--------- 2 files changed, 58 insertions(+), 54 deletions(-) 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 59c7f6c0..1c93eea0 100644 --- a/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java +++ b/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java @@ -150,6 +150,7 @@ public class PatientReportService implements IPatientReportService { copy.setUrl(Constant.Ht.STRING_DEFAULT); copy.setQrCodeUrl(Constant.Ht.STRING_DEFAULT); copy.setCompleteStatus(Constant.Ht.Report.COMPLETE_OK); + copy.setShowStatus(Constant.Ht.Report.SHOW_HISTORY); htPatientReportDao.updateByPrimaryKeySelective(copy); log.info("成功编辑报告单信息"); HtPatientReportRecord record = new HtPatientReportRecord(); diff --git a/question/src/main/java/com/ccsens/question/service/PatientReportService.java b/question/src/main/java/com/ccsens/question/service/PatientReportService.java index 52db1c90..cd7c61cb 100644 --- a/question/src/main/java/com/ccsens/question/service/PatientReportService.java +++ b/question/src/main/java/com/ccsens/question/service/PatientReportService.java @@ -25,7 +25,6 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.github.pagehelper.StringUtil; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -69,35 +68,34 @@ public class PatientReportService implements IPatientReportService { @Override public JsonResponse generatePatientReport(PatientReportDto.Generate generate, Long userId) { log.info("生成报告单请求参数：userId:{}, patientReport:{}", userId, generate); -// //查询医生信息 -// HtDoctorExample doctorExample = new HtDoctorExample(); -// doctorExample.createCriteria().andUserIdEqualTo(userId).andAuditStateEqualTo(Constant.Ht.Doctor.CHECK_SUCCESS).andIsDelEqualTo(Constant.Ht.NUMBER_DEFAULT); -// List doctors = htDoctorDao.selectByExample(doctorExample); -// if (CollectionUtils.isEmpty(doctors)) { -// log.info("根据userId未找到审核通过的医生信息：{}", userId); -// return JsonResponse.newInstance().ok(CodeEnum.PARAM_ERROR); -// } -// //查询病人信息 -// HtPatient htPatient = htPatientMapper.selectByPrimaryKey(generate.getPatientId()); -// if (htPatient == null) { -// log.info("根据patientId未找到病友信息：{}", generate.getPatientId()); -// return JsonResponse.newInstance().ok(CodeEnum.PARAM_ERROR); -// } + //查询医生信息 + HtDoctorExample doctorExample = new HtDoctorExample(); + doctorExample.createCriteria().andUserIdEqualTo(userId).andAuditStateEqualTo(Constant.Ht.Doctor.CHECK_SUCCESS).andIsDelEqualTo(Constant.Ht.NUMBER_DEFAULT); + List doctors = htDoctorDao.selectByExample(doctorExample); + if (CollectionUtils.isEmpty(doctors)) { + log.info("根据userId未找到审核通过的医生信息：{}", userId); + return JsonResponse.newInstance().ok(CodeEnum.PARAM_ERROR); + } + //查询病人信息 + HtPatient htPatient = htPatientMapper.selectByPrimaryKey(generate.getPatientId()); + if (htPatient == null) { + log.info("根据patientId未找到病友信息：{}", generate.getPatientId()); + return JsonResponse.newInstance().ok(CodeEnum.PARAM_ERROR); + } HtPatientReport htPatientReport = new HtPatientReport(); htPatientReport.setId(snowflake.nextId()); -// htPatientReport.setDoctorId(doctors.get(0).getId()); - htPatientReport.setUserId(userId); + htPatientReport.setDoctorId(doctors.get(0).getId()); htPatientReport.setPatientId(generate.getPatientId()); -// htPatientReport.setPatientIdcard(htPatient.getIdcard()); -// htPatientReport.setPatientAge(StrUtil.isEmpty(htPatient.getIdcard()) ? null : (byte)IdcardUtil.getAgeByIdCard(htPatient.getIdcard())); + htPatientReport.setPatientIdcard(htPatient.getIdcard()); + htPatientReport.setPatientAge(StrUtil.isEmpty(htPatient.getIdcard()) ? null : (byte)IdcardUtil.getAgeByIdCard(htPatient.getIdcard())); htPatientReport.setEvaluationCode(Constant.Ht.Report.PARENT_CODE); htPatientReport.setName(Constant.Ht.Report.PARENT_NAME + DateUtil.today()); htPatientReport.setReportTime(System.currentTimeMillis()); // 查询医院信息 -// String hospital = htPositionDao.queryHospital(doctors.get(0).getPositionId()); -// htPatientReport.setHospital(hospital); + String hospital = htPositionDao.queryHospital(doctors.get(0).getPositionId()); + htPatientReport.setHospital(hospital); htPatientReportDao.insertSelective(htPatientReport); log.info("生成病友报告单：{}", generate); PatientReportVo.Generate generateVo = new PatientReportVo.Generate(); @@ -152,6 +150,7 @@ public class PatientReportService implements IPatientReportService { copy.setUrl(Constant.Ht.STRING_DEFAULT); copy.setQrCodeUrl(Constant.Ht.STRING_DEFAULT); copy.setCompleteStatus(Constant.Ht.Report.COMPLETE_OK); + copy.setShowStatus(Constant.Ht.Report.SHOW_HISTORY); htPatientReportDao.updateByPrimaryKeySelective(copy); log.info("成功编辑报告单信息"); HtPatientReportRecord record = new HtPatientReportRecord(); @@ -169,17 +168,17 @@ public class PatientReportService implements IPatientReportService { public PageInfo queryReports(PatientReportDto.QueryReports query, Long userId) { //查询医生信息 -// HtDoctorExample doctorExample = new HtDoctorExample(); -// doctorExample.createCriteria().andUserIdEqualTo(userId).andAuditStateEqualTo(Constant.Ht.Doctor.CHECK_SUCCESS).andIsDelEqualTo(Constant.Ht.NUMBER_DEFAULT); -// List doctors = htDoctorDao.selectByExample(doctorExample); -// log.info("当前用户是否为医生：{}", CollectionUtil.isNotEmpty(doctors)); + HtDoctorExample doctorExample = new HtDoctorExample(); + doctorExample.createCriteria().andUserIdEqualTo(userId).andAuditStateEqualTo(Constant.Ht.Doctor.CHECK_SUCCESS).andIsDelEqualTo(Constant.Ht.NUMBER_DEFAULT); + List doctors = htDoctorDao.selectByExample(doctorExample); + log.info("当前用户是否为医生：{}", CollectionUtil.isNotEmpty(doctors)); // 获取医生ID和病人ID Long patientId = null; Long doctorId = null; if (query.getPatientId() != null) { patientId = query.getPatientId(); -// } else if (CollectionUtil.isNotEmpty(doctors)) { -// doctorId = doctors.get(0).getId(); + } else if (CollectionUtil.isNotEmpty(doctors)) { + doctorId = doctors.get(0).getId(); } else { log.info("既无病人信息，有无医生信息，不允许查询"); throw new BaseException(CodeEnum.PARAM_ERROR); @@ -187,32 +186,34 @@ public class PatientReportService implements IPatientReportService { //分页查询报告单列表 PageHelper.startPage(query.getPageNum(), query.getPageSize()); List reportVos = htPatientReportDao.queryReportName(doctorId, patientId); -// if (CollectionUtils.isEmpty(reportVos)) { -// return new PageInfo<>(reportVos); -// } -// if (CollectionUtil.isEmpty(doctors)) { -// return new PageInfo<>(reportVos); -// } -// HtDoctor doctor = doctors.get(0); -// //查询下属职务 -// List lowerPositionIds = htPositionDao.queryAllLowerPosition(doctor.getPositionId()); -// reportVos.forEach(reportVo -> { -// -// //自己的可见详情 -// if (doctor.getId().equals(reportVo.getDoctorId())) { -// reportVo.setAuthority((byte)1); -// } else if (CollectionUtils.isEmpty(lowerPositionIds)) { -// reportVo.setAuthority((byte)0); -// } else { -// HtDoctor reportDoctor = htDoctorDao.selectByPrimaryKey(reportVo.getDoctorId()); -// //自己下属的可见详情 -// if (lowerPositionIds.contains(reportDoctor.getPositionId())) { -// reportVo.setAuthority((byte)1); -// } else { -// reportVo.setAuthority((byte)0); -// } -// } -// }); + if (CollectionUtils.isEmpty(reportVos)) { + return new PageInfo<>(reportVos); + } + + + if (CollectionUtil.isEmpty(doctors)) { + return new PageInfo<>(reportVos); + } + HtDoctor doctor = doctors.get(0); + //查询下属职务 + List lowerPositionIds = htPositionDao.queryAllLowerPosition(doctor.getPositionId()); + reportVos.forEach(reportVo -> { + + //自己的可见详情 + if (doctor.getId().equals(reportVo.getDoctorId())) { + reportVo.setAuthority((byte)1); + } else if (CollectionUtils.isEmpty(lowerPositionIds)) { + reportVo.setAuthority((byte)0); + } else { + HtDoctor reportDoctor = htDoctorDao.selectByPrimaryKey(reportVo.getDoctorId()); + //自己下属的可见详情 + if (lowerPositionIds.contains(reportDoctor.getPositionId())) { + reportVo.setAuthority((byte)1); + } else { + reportVo.setAuthority((byte)0); + } + } + }); return new PageInfo<>(reportVos); } @@ -405,7 +406,7 @@ public class PatientReportService implements IPatientReportService { dateCell.setBorderBottom(null); dateCell.setBorderLeft(null); content.add(row2); - log.info("导出列表：{}", content); + String path = PropUtil.imgDomain + "/" + PdfUtil.credatePdf(PropUtil.path, detail.getPatient().getHospital(), Constant.Ht.Report.PARENT_NAME, detail.getPatient().toPdfRow(), content, new PdfUtil.Margin()); report.setUrl(path); htPatientReportDao.updateByPrimaryKeySelective(report); @@ -606,4 +607,6 @@ public class PatientReportService implements IPatientReportService { List list = htPatientReportDao.search(param.getCodes()); return list; } + + } From cf00986f18c20b541fd06bf54df835c721ed0b58 Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Tue, 16 Mar 2021 16:30:51 +0800 Subject: [PATCH 12/12] =?UTF-8?q?HT=E6=A0=B9=E6=8D=AE=E5=88=86=E6=95=B0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E5=91=8A=E5=8D=95=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/ht/api/PatientReportSearchController.java | 3 ++- .../com/ccsens/ht/bean/dto/PatientReportSearchDto.java | 9 +++++++++ .../com/ccsens/ht/service/IPatientReportService.java | 2 +- .../java/com/ccsens/ht/service/PatientReportService.java | 6 ++++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ht/src/main/java/com/ccsens/ht/api/PatientReportSearchController.java b/ht/src/main/java/com/ccsens/ht/api/PatientReportSearchController.java index d0652c32..457be7e7 100644 --- a/ht/src/main/java/com/ccsens/ht/api/PatientReportSearchController.java +++ b/ht/src/main/java/com/ccsens/ht/api/PatientReportSearchController.java @@ -9,6 +9,7 @@ import com.ccsens.ht.bean.vo.PatientReportVo; import com.ccsens.ht.service.IPatientReportService; import com.ccsens.util.JsonResponse; import com.ccsens.util.bean.dto.QueryDto; +import com.github.pagehelper.PageInfo; import io.swagger.annotations.*; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RequestBody; @@ -56,7 +57,7 @@ public class PatientReportSearchController { @RequestMapping(value="/search", method = RequestMethod.POST) public JsonResponse search(@RequestBody @ApiParam @Valid QueryDto dto){ log.info("搜索报告单：{}", dto); - List params = patientReportService.search(dto.getParam()); + PageInfo params = patientReportService.search(dto.getParam()); log.info("搜索报告单已完成"); return JsonResponse.newInstance().ok(params); } diff --git a/ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportSearchDto.java b/ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportSearchDto.java index 74f8a004..a4afeac6 100644 --- a/ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportSearchDto.java +++ b/ht/src/main/java/com/ccsens/ht/bean/dto/PatientReportSearchDto.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; import javax.validation.constraints.NotEmpty; import java.util.List; @@ -25,6 +27,13 @@ public class PatientReportSearchDto { @ApiModel("搜索报告单参数列表-请求") public static class SearchList { private List codes; + @ApiModelProperty("第几页") + @Min(value = 1) + private int pageNum = 1; + @ApiModelProperty("每页多少条") + @Min(value = 1) + @Max(value=100) + private int pageSize = 10; } @Data diff --git a/ht/src/main/java/com/ccsens/ht/service/IPatientReportService.java b/ht/src/main/java/com/ccsens/ht/service/IPatientReportService.java index c2cd78d1..56c022c1 100644 --- a/ht/src/main/java/com/ccsens/ht/service/IPatientReportService.java +++ b/ht/src/main/java/com/ccsens/ht/service/IPatientReportService.java @@ -156,5 +156,5 @@ public interface IPatientReportService { * @param param 搜索列表 * @return 报告单 */ - List search(PatientReportSearchDto.SearchList param); + PageInfo search(PatientReportSearchDto.SearchList param); } 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 1c93eea0..ba91682b 100644 --- a/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java +++ b/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java @@ -603,9 +603,11 @@ public class PatientReportService implements IPatientReportService { } @Override - public List search(PatientReportSearchDto.SearchList param) { + public PageInfo search(PatientReportSearchDto.SearchList param) { + + PageHelper.startPage(param.getPageNum(), param.getPageSize()); List list = htPatientReportDao.search(param.getCodes()); - return list; + return new PageInfo<>(list); }