Browse Source

将分数修改为bigDecimal

sd
zy_Java 5 years ago
parent
commit
590282b10e
  1. 2
      cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java
  2. 61
      ht/src/main/java/com/ccsens/ht/api/ImportController.java
  3. 386
      ht/src/main/java/com/ccsens/ht/bean/po/HtPatientAcp.java
  4. 2520
      ht/src/main/java/com/ccsens/ht/bean/po/HtPatientAcpExample.java
  5. 365
      ht/src/main/java/com/ccsens/ht/bean/po/HtPatientScore.java
  6. 2281
      ht/src/main/java/com/ccsens/ht/bean/po/HtPatientScoreExample.java
  7. 277
      ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionOption.java
  8. 1801
      ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionOptionExample.java
  9. 3
      ht/src/main/java/com/ccsens/ht/bean/vo/PatientReportVo.java
  10. 19
      ht/src/main/java/com/ccsens/ht/bean/vo/QuestionVo.java
  11. 58
      ht/src/main/java/com/ccsens/ht/persist/mapper/HtPatientAcpMapper.java
  12. 58
      ht/src/main/java/com/ccsens/ht/persist/mapper/HtPatientScoreMapper.java
  13. 58
      ht/src/main/java/com/ccsens/ht/persist/mapper/HtQuestionOptionMapper.java
  14. 2
      ht/src/main/java/com/ccsens/ht/service/ImportService.java
  15. 16
      ht/src/main/java/com/ccsens/ht/service/PatientReportService.java
  16. 83
      ht/src/main/java/com/ccsens/ht/service/QuestionService.java
  17. 5
      ht/src/main/java/com/ccsens/ht/uitl/Constant.java
  18. 2
      ht/src/main/resources/application-dev.yml
  19. 1
      ht/src/main/resources/mapper_dao/HtPatientCanvasDao.xml
  20. 764
      ht/src/main/resources/mapper_raw/HtPatientAcpMapper.xml
  21. 738
      ht/src/main/resources/mapper_raw/HtPatientScoreMapper.xml
  22. 610
      ht/src/main/resources/mapper_raw/HtQuestionOptionMapper.xml
  23. 50
      tall/src/main/java/com/ccsens/tall/rabbitMQ/MessageTest.java
  24. 6
      tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
  25. 25
      tall/src/main/java/com/ccsens/tall/service/UserService.java
  26. 8
      tall/src/main/resources/application-dev.yml
  27. 5
      tall/src/main/resources/application-prod.yml
  28. 7
      tall/src/main/resources/application-test.yml
  29. 4
      tall/src/main/resources/application.yml
  30. 6
      util/src/main/java/com/ccsens/util/PropUtil.java
  31. 51
      util/src/main/java/com/ccsens/util/SmsUtil.java

2
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 {
/**

61
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();
}
}

386
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();
}
}

2520
ht/src/main/java/com/ccsens/ht/bean/po/HtPatientAcpExample.java

File diff suppressed because it is too large

365
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();
}
}

2281
ht/src/main/java/com/ccsens/ht/bean/po/HtPatientScoreExample.java

File diff suppressed because it is too large

277
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();
}
}

1801
ht/src/main/java/com/ccsens/ht/bean/po/HtQuestionOptionExample.java

File diff suppressed because it is too large

3
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:二级子类)")

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

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

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

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

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

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

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

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

2
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;

16
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<Integer> sum = new AtomicReference<>(score.getScore() == null ? 0 : score.getScore());
private BigDecimal sumScore(PatientReportVo.ReportScore score){
AtomicReference<BigDecimal> sum = new AtomicReference<>(score.getScore() == null ? BigDecimal.valueOf(0) : score.getScore());
AtomicBoolean hasAdd = new AtomicBoolean(false);
if (!CollectionUtils.isEmpty(score.getSubReport())) {
score.getSubReport().forEach(sub -> {
sum.updateAndGet(v -> {
Integer sumScore = sumScore(sub);
BigDecimal sumScore = sumScore(sub);
if (sumScore== null) {
return v;
}
hasAdd.set(true);
return v += sumScore;
// return v += sumScore;
v = v.add(sumScore);
return v;
});
});
} else {
if (StringUtil.isNotEmpty(score.getRemark()) && score.getRemark().matches(Constant.Ht.Report.IGNORE_SCORE)) {
return score.getScore() == null ? null : 0;
return score.getScore() == null ? null : BigDecimal.valueOf(0);
}
if (Constant.Ht.Report.MOCA_SJZ.equals(score.getCode())) {
return null;

83
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<QuestionVo.LineParameter> 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<QuestionVo.LineParameter> lineParameterList) {
int shortNums = 0;
double a = aveLength * coefficient;
if(CollectionUtil.isNotEmpty(lineParameterList)){
for(QuestionVo.LineParameter lineParameter : lineParameterList){
if(lineParameter.getLength() <= a){
shortNums++;
}
}
}
return shortNums;
}
private double getLengthByCanvas(String[] canvas) {
double l = 0;
for (int i = 1; i < canvas.length; i++){
@ -710,6 +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();
}
}

5
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;
/**报告单已完成*/

2
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

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

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

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

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

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

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

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

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

50
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);
// }
//}

6
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);

25
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();

8
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

5
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/
gatewayUrl: https://sd.tall.wiki/gateway/
smsCode: 1

7
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/
gatewayUrl: http://192.168.0.99/gateway/
smsCode: 0

4
tall/src/main/resources/application.yml

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

6
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;
}
}

51
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响应码错误

Loading…
Cancel
Save