diff --git a/ruisi_java/ruisi-cc-generator/src/main/resources/mbg.xml b/ruisi_java/ruisi-cc-generator/src/main/resources/mbg.xml index 2d48983..62462c1 100644 --- a/ruisi_java/ruisi-cc-generator/src/main/resources/mbg.xml +++ b/ruisi_java/ruisi-cc-generator/src/main/resources/mbg.xml @@ -20,7 +20,7 @@ @@ -70,7 +70,7 @@ - + @@ -85,7 +85,7 @@ -
+ @@ -115,7 +115,7 @@ - +
diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/RmsReport.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/RmsReport.java index 94d9818..0949fdc 100644 --- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/RmsReport.java +++ b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/RmsReport.java @@ -28,6 +28,10 @@ public class RmsReport implements Serializable { private String url; + private String persionUrl; + + private String positiveUrl; + private String qrCodeUrl; private String signUrl; @@ -150,6 +154,22 @@ public class RmsReport implements Serializable { this.url = url == null ? null : url.trim(); } + public String getPersionUrl() { + return persionUrl; + } + + public void setPersionUrl(String persionUrl) { + this.persionUrl = persionUrl == null ? null : persionUrl.trim(); + } + + public String getPositiveUrl() { + return positiveUrl; + } + + public void setPositiveUrl(String positiveUrl) { + this.positiveUrl = positiveUrl == null ? null : positiveUrl.trim(); + } + public String getQrCodeUrl() { return qrCodeUrl; } @@ -264,6 +284,8 @@ public class RmsReport implements Serializable { sb.append(", reportTime=").append(reportTime); sb.append(", evaluationCode=").append(evaluationCode); sb.append(", url=").append(url); + sb.append(", persionUrl=").append(persionUrl); + sb.append(", positiveUrl=").append(positiveUrl); sb.append(", qrCodeUrl=").append(qrCodeUrl); sb.append(", signUrl=").append(signUrl); sb.append(", remark=").append(remark); diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/RmsReportExample.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/RmsReportExample.java index ba89234..04d9fda 100644 --- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/RmsReportExample.java +++ b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/RmsReportExample.java @@ -895,6 +895,146 @@ public class RmsReportExample { return (Criteria) this; } + public Criteria andPersionUrlIsNull() { + addCriterion("persion_url is null"); + return (Criteria) this; + } + + public Criteria andPersionUrlIsNotNull() { + addCriterion("persion_url is not null"); + return (Criteria) this; + } + + public Criteria andPersionUrlEqualTo(String value) { + addCriterion("persion_url =", value, "persionUrl"); + return (Criteria) this; + } + + public Criteria andPersionUrlNotEqualTo(String value) { + addCriterion("persion_url <>", value, "persionUrl"); + return (Criteria) this; + } + + public Criteria andPersionUrlGreaterThan(String value) { + addCriterion("persion_url >", value, "persionUrl"); + return (Criteria) this; + } + + public Criteria andPersionUrlGreaterThanOrEqualTo(String value) { + addCriterion("persion_url >=", value, "persionUrl"); + return (Criteria) this; + } + + public Criteria andPersionUrlLessThan(String value) { + addCriterion("persion_url <", value, "persionUrl"); + return (Criteria) this; + } + + public Criteria andPersionUrlLessThanOrEqualTo(String value) { + addCriterion("persion_url <=", value, "persionUrl"); + return (Criteria) this; + } + + public Criteria andPersionUrlLike(String value) { + addCriterion("persion_url like", value, "persionUrl"); + return (Criteria) this; + } + + public Criteria andPersionUrlNotLike(String value) { + addCriterion("persion_url not like", value, "persionUrl"); + return (Criteria) this; + } + + public Criteria andPersionUrlIn(List values) { + addCriterion("persion_url in", values, "persionUrl"); + return (Criteria) this; + } + + public Criteria andPersionUrlNotIn(List values) { + addCriterion("persion_url not in", values, "persionUrl"); + return (Criteria) this; + } + + public Criteria andPersionUrlBetween(String value1, String value2) { + addCriterion("persion_url between", value1, value2, "persionUrl"); + return (Criteria) this; + } + + public Criteria andPersionUrlNotBetween(String value1, String value2) { + addCriterion("persion_url not between", value1, value2, "persionUrl"); + return (Criteria) this; + } + + public Criteria andPositiveUrlIsNull() { + addCriterion("positive_url is null"); + return (Criteria) this; + } + + public Criteria andPositiveUrlIsNotNull() { + addCriterion("positive_url is not null"); + return (Criteria) this; + } + + public Criteria andPositiveUrlEqualTo(String value) { + addCriterion("positive_url =", value, "positiveUrl"); + return (Criteria) this; + } + + public Criteria andPositiveUrlNotEqualTo(String value) { + addCriterion("positive_url <>", value, "positiveUrl"); + return (Criteria) this; + } + + public Criteria andPositiveUrlGreaterThan(String value) { + addCriterion("positive_url >", value, "positiveUrl"); + return (Criteria) this; + } + + public Criteria andPositiveUrlGreaterThanOrEqualTo(String value) { + addCriterion("positive_url >=", value, "positiveUrl"); + return (Criteria) this; + } + + public Criteria andPositiveUrlLessThan(String value) { + addCriterion("positive_url <", value, "positiveUrl"); + return (Criteria) this; + } + + public Criteria andPositiveUrlLessThanOrEqualTo(String value) { + addCriterion("positive_url <=", value, "positiveUrl"); + return (Criteria) this; + } + + public Criteria andPositiveUrlLike(String value) { + addCriterion("positive_url like", value, "positiveUrl"); + return (Criteria) this; + } + + public Criteria andPositiveUrlNotLike(String value) { + addCriterion("positive_url not like", value, "positiveUrl"); + return (Criteria) this; + } + + public Criteria andPositiveUrlIn(List values) { + addCriterion("positive_url in", values, "positiveUrl"); + return (Criteria) this; + } + + public Criteria andPositiveUrlNotIn(List values) { + addCriterion("positive_url not in", values, "positiveUrl"); + return (Criteria) this; + } + + public Criteria andPositiveUrlBetween(String value1, String value2) { + addCriterion("positive_url between", value1, value2, "positiveUrl"); + return (Criteria) this; + } + + public Criteria andPositiveUrlNotBetween(String value1, String value2) { + addCriterion("positive_url not between", value1, value2, "positiveUrl"); + return (Criteria) this; + } + public Criteria andQrCodeUrlIsNull() { addCriterion("qr_code_url is null"); return (Criteria) this; diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/RmsReportScaleScore.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/RmsReportScaleScore.java index 62e0129..0c1f595 100644 --- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/RmsReportScaleScore.java +++ b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/RmsReportScaleScore.java @@ -15,15 +15,7 @@ public class RmsReportScaleScore implements Serializable { private String impression; - private Integer sort; - - private Long scaleAssConf; - - private String result; - - private String needPlan; - - private String plan; + private Long comboId; private String createBy; @@ -35,6 +27,18 @@ public class RmsReportScaleScore implements Serializable { private Byte delFlag; + private Long scaleAssConf; + + private String result; + + private String needPlan; + + private String plan; + + private Integer sort; + + private Byte isShow; + private static final long serialVersionUID = 1L; public Long getId() { @@ -77,44 +81,12 @@ public class RmsReportScaleScore implements Serializable { this.impression = impression == null ? null : impression.trim(); } - public Integer getSort() { - return sort; - } - - public void setSort(Integer sort) { - this.sort = sort; + public Long getComboId() { + return comboId; } - public Long getScaleAssConf() { - return scaleAssConf; - } - - public void setScaleAssConf(Long scaleAssConf) { - this.scaleAssConf = scaleAssConf; - } - - public String getResult() { - return result; - } - - public void setResult(String result) { - this.result = result == null ? null : result.trim(); - } - - public String getNeedPlan() { - return needPlan; - } - - public void setNeedPlan(String needPlan) { - this.needPlan = needPlan == null ? null : needPlan.trim(); - } - - public String getPlan() { - return plan; - } - - public void setPlan(String plan) { - this.plan = plan == null ? null : plan.trim(); + public void setComboId(Long comboId) { + this.comboId = comboId; } public String getCreateBy() { @@ -157,6 +129,54 @@ public class RmsReportScaleScore implements Serializable { this.delFlag = delFlag; } + public Long getScaleAssConf() { + return scaleAssConf; + } + + public void setScaleAssConf(Long scaleAssConf) { + this.scaleAssConf = scaleAssConf; + } + + public String getResult() { + return result; + } + + public void setResult(String result) { + this.result = result == null ? null : result.trim(); + } + + public String getNeedPlan() { + return needPlan; + } + + public void setNeedPlan(String needPlan) { + this.needPlan = needPlan == null ? null : needPlan.trim(); + } + + public String getPlan() { + return plan; + } + + public void setPlan(String plan) { + this.plan = plan == null ? null : plan.trim(); + } + + public Integer getSort() { + return sort; + } + + public void setSort(Integer sort) { + this.sort = sort; + } + + public Byte getIsShow() { + return isShow; + } + + public void setIsShow(Byte isShow) { + this.isShow = isShow; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -168,16 +188,18 @@ public class RmsReportScaleScore implements Serializable { sb.append(", scaleCode=").append(scaleCode); sb.append(", score=").append(score); sb.append(", impression=").append(impression); - sb.append(", sort=").append(sort); - sb.append(", scaleAssConf=").append(scaleAssConf); - sb.append(", result=").append(result); - sb.append(", needPlan=").append(needPlan); - sb.append(", plan=").append(plan); + sb.append(", comboId=").append(comboId); sb.append(", createBy=").append(createBy); sb.append(", createTime=").append(createTime); sb.append(", updateBy=").append(updateBy); sb.append(", updateTime=").append(updateTime); sb.append(", delFlag=").append(delFlag); + sb.append(", scaleAssConf=").append(scaleAssConf); + sb.append(", result=").append(result); + sb.append(", needPlan=").append(needPlan); + sb.append(", plan=").append(plan); + sb.append(", sort=").append(sort); + sb.append(", isShow=").append(isShow); sb.append("]"); return sb.toString(); } diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/RmsReportScaleScoreExample.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/RmsReportScaleScoreExample.java index 0520304..2df6c27 100644 --- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/RmsReportScaleScoreExample.java +++ b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/RmsReportScaleScoreExample.java @@ -426,653 +426,773 @@ public class RmsReportScaleScoreExample { return (Criteria) this; } - public Criteria andSortIsNull() { - addCriterion("sort is null"); + public Criteria andComboIdIsNull() { + addCriterion("combo_id is null"); return (Criteria) this; } - public Criteria andSortIsNotNull() { - addCriterion("sort is not null"); + public Criteria andComboIdIsNotNull() { + addCriterion("combo_id is not null"); return (Criteria) this; } - public Criteria andSortEqualTo(Integer value) { - addCriterion("sort =", value, "sort"); + public Criteria andComboIdEqualTo(Long value) { + addCriterion("combo_id =", value, "comboId"); return (Criteria) this; } - public Criteria andSortNotEqualTo(Integer value) { - addCriterion("sort <>", value, "sort"); + public Criteria andComboIdNotEqualTo(Long value) { + addCriterion("combo_id <>", value, "comboId"); return (Criteria) this; } - public Criteria andSortGreaterThan(Integer value) { - addCriterion("sort >", value, "sort"); + public Criteria andComboIdGreaterThan(Long value) { + addCriterion("combo_id >", value, "comboId"); return (Criteria) this; } - public Criteria andSortGreaterThanOrEqualTo(Integer value) { - addCriterion("sort >=", value, "sort"); + public Criteria andComboIdGreaterThanOrEqualTo(Long value) { + addCriterion("combo_id >=", value, "comboId"); return (Criteria) this; } - public Criteria andSortLessThan(Integer value) { - addCriterion("sort <", value, "sort"); + public Criteria andComboIdLessThan(Long value) { + addCriterion("combo_id <", value, "comboId"); return (Criteria) this; } - public Criteria andSortLessThanOrEqualTo(Integer value) { - addCriterion("sort <=", value, "sort"); + public Criteria andComboIdLessThanOrEqualTo(Long value) { + addCriterion("combo_id <=", value, "comboId"); return (Criteria) this; } - public Criteria andSortIn(List values) { - addCriterion("sort in", values, "sort"); + public Criteria andComboIdIn(List values) { + addCriterion("combo_id in", values, "comboId"); return (Criteria) this; } - public Criteria andSortNotIn(List values) { - addCriterion("sort not in", values, "sort"); + public Criteria andComboIdNotIn(List values) { + addCriterion("combo_id not in", values, "comboId"); return (Criteria) this; } - public Criteria andSortBetween(Integer value1, Integer value2) { - addCriterion("sort between", value1, value2, "sort"); + public Criteria andComboIdBetween(Long value1, Long value2) { + addCriterion("combo_id between", value1, value2, "comboId"); return (Criteria) this; } - public Criteria andSortNotBetween(Integer value1, Integer value2) { - addCriterion("sort not between", value1, value2, "sort"); + public Criteria andComboIdNotBetween(Long value1, Long value2) { + addCriterion("combo_id not between", value1, value2, "comboId"); return (Criteria) this; } - public Criteria andScaleAssConfIsNull() { - addCriterion("scale_ass_conf is null"); + public Criteria andCreateByIsNull() { + addCriterion("create_by is null"); return (Criteria) this; } - public Criteria andScaleAssConfIsNotNull() { - addCriterion("scale_ass_conf is not null"); + public Criteria andCreateByIsNotNull() { + addCriterion("create_by is not null"); return (Criteria) this; } - public Criteria andScaleAssConfEqualTo(Long value) { - addCriterion("scale_ass_conf =", value, "scaleAssConf"); + public Criteria andCreateByEqualTo(String value) { + addCriterion("create_by =", value, "createBy"); return (Criteria) this; } - public Criteria andScaleAssConfNotEqualTo(Long value) { - addCriterion("scale_ass_conf <>", value, "scaleAssConf"); + public Criteria andCreateByNotEqualTo(String value) { + addCriterion("create_by <>", value, "createBy"); return (Criteria) this; } - public Criteria andScaleAssConfGreaterThan(Long value) { - addCriterion("scale_ass_conf >", value, "scaleAssConf"); + public Criteria andCreateByGreaterThan(String value) { + addCriterion("create_by >", value, "createBy"); return (Criteria) this; } - public Criteria andScaleAssConfGreaterThanOrEqualTo(Long value) { - addCriterion("scale_ass_conf >=", value, "scaleAssConf"); + public Criteria andCreateByGreaterThanOrEqualTo(String value) { + addCriterion("create_by >=", value, "createBy"); return (Criteria) this; } - public Criteria andScaleAssConfLessThan(Long value) { - addCriterion("scale_ass_conf <", value, "scaleAssConf"); + public Criteria andCreateByLessThan(String value) { + addCriterion("create_by <", value, "createBy"); return (Criteria) this; } - public Criteria andScaleAssConfLessThanOrEqualTo(Long value) { - addCriterion("scale_ass_conf <=", value, "scaleAssConf"); + public Criteria andCreateByLessThanOrEqualTo(String value) { + addCriterion("create_by <=", value, "createBy"); return (Criteria) this; } - public Criteria andScaleAssConfIn(List values) { - addCriterion("scale_ass_conf in", values, "scaleAssConf"); + public Criteria andCreateByLike(String value) { + addCriterion("create_by like", value, "createBy"); return (Criteria) this; } - public Criteria andScaleAssConfNotIn(List values) { - addCriterion("scale_ass_conf not in", values, "scaleAssConf"); + public Criteria andCreateByNotLike(String value) { + addCriterion("create_by not like", value, "createBy"); return (Criteria) this; } - public Criteria andScaleAssConfBetween(Long value1, Long value2) { - addCriterion("scale_ass_conf between", value1, value2, "scaleAssConf"); + public Criteria andCreateByIn(List values) { + addCriterion("create_by in", values, "createBy"); return (Criteria) this; } - public Criteria andScaleAssConfNotBetween(Long value1, Long value2) { - addCriterion("scale_ass_conf not between", value1, value2, "scaleAssConf"); + public Criteria andCreateByNotIn(List values) { + addCriterion("create_by not in", values, "createBy"); return (Criteria) this; } - public Criteria andResultIsNull() { - addCriterion("result is null"); + public Criteria andCreateByBetween(String value1, String value2) { + addCriterion("create_by between", value1, value2, "createBy"); return (Criteria) this; } - public Criteria andResultIsNotNull() { - addCriterion("result is not null"); + public Criteria andCreateByNotBetween(String value1, String value2) { + addCriterion("create_by not between", value1, value2, "createBy"); return (Criteria) this; } - public Criteria andResultEqualTo(String value) { - addCriterion("result =", value, "result"); + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); return (Criteria) this; } - public Criteria andResultNotEqualTo(String value) { - addCriterion("result <>", value, "result"); + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); return (Criteria) this; } - public Criteria andResultGreaterThan(String value) { - addCriterion("result >", value, "result"); + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); return (Criteria) this; } - public Criteria andResultGreaterThanOrEqualTo(String value) { - addCriterion("result >=", value, "result"); + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); return (Criteria) this; } - public Criteria andResultLessThan(String value) { - addCriterion("result <", value, "result"); + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); return (Criteria) this; } - public Criteria andResultLessThanOrEqualTo(String value) { - addCriterion("result <=", value, "result"); + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); return (Criteria) this; } - public Criteria andResultLike(String value) { - addCriterion("result like", value, "result"); + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); return (Criteria) this; } - public Criteria andResultNotLike(String value) { - addCriterion("result not like", value, "result"); + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); return (Criteria) this; } - public Criteria andResultIn(List values) { - addCriterion("result in", values, "result"); + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); return (Criteria) this; } - public Criteria andResultNotIn(List values) { - addCriterion("result not in", values, "result"); + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); return (Criteria) this; } - public Criteria andResultBetween(String value1, String value2) { - addCriterion("result between", value1, value2, "result"); + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); return (Criteria) this; } - public Criteria andResultNotBetween(String value1, String value2) { - addCriterion("result not between", value1, value2, "result"); + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); return (Criteria) this; } - public Criteria andNeedPlanIsNull() { - addCriterion("need_plan is null"); + public Criteria andUpdateByIsNull() { + addCriterion("update_by is null"); return (Criteria) this; } - public Criteria andNeedPlanIsNotNull() { - addCriterion("need_plan is not null"); + public Criteria andUpdateByIsNotNull() { + addCriterion("update_by is not null"); return (Criteria) this; } - public Criteria andNeedPlanEqualTo(String value) { - addCriterion("need_plan =", value, "needPlan"); + public Criteria andUpdateByEqualTo(String value) { + addCriterion("update_by =", value, "updateBy"); return (Criteria) this; } - public Criteria andNeedPlanNotEqualTo(String value) { - addCriterion("need_plan <>", value, "needPlan"); + public Criteria andUpdateByNotEqualTo(String value) { + addCriterion("update_by <>", value, "updateBy"); return (Criteria) this; } - public Criteria andNeedPlanGreaterThan(String value) { - addCriterion("need_plan >", value, "needPlan"); + public Criteria andUpdateByGreaterThan(String value) { + addCriterion("update_by >", value, "updateBy"); return (Criteria) this; } - public Criteria andNeedPlanGreaterThanOrEqualTo(String value) { - addCriterion("need_plan >=", value, "needPlan"); + public Criteria andUpdateByGreaterThanOrEqualTo(String value) { + addCriterion("update_by >=", value, "updateBy"); return (Criteria) this; } - public Criteria andNeedPlanLessThan(String value) { - addCriterion("need_plan <", value, "needPlan"); + public Criteria andUpdateByLessThan(String value) { + addCriterion("update_by <", value, "updateBy"); return (Criteria) this; } - public Criteria andNeedPlanLessThanOrEqualTo(String value) { - addCriterion("need_plan <=", value, "needPlan"); + public Criteria andUpdateByLessThanOrEqualTo(String value) { + addCriterion("update_by <=", value, "updateBy"); return (Criteria) this; } - public Criteria andNeedPlanLike(String value) { - addCriterion("need_plan like", value, "needPlan"); + public Criteria andUpdateByLike(String value) { + addCriterion("update_by like", value, "updateBy"); return (Criteria) this; } - public Criteria andNeedPlanNotLike(String value) { - addCriterion("need_plan not like", value, "needPlan"); + public Criteria andUpdateByNotLike(String value) { + addCriterion("update_by not like", value, "updateBy"); return (Criteria) this; } - public Criteria andNeedPlanIn(List values) { - addCriterion("need_plan in", values, "needPlan"); + public Criteria andUpdateByIn(List values) { + addCriterion("update_by in", values, "updateBy"); return (Criteria) this; } - public Criteria andNeedPlanNotIn(List values) { - addCriterion("need_plan not in", values, "needPlan"); + public Criteria andUpdateByNotIn(List values) { + addCriterion("update_by not in", values, "updateBy"); return (Criteria) this; } - public Criteria andNeedPlanBetween(String value1, String value2) { - addCriterion("need_plan between", value1, value2, "needPlan"); + public Criteria andUpdateByBetween(String value1, String value2) { + addCriterion("update_by between", value1, value2, "updateBy"); return (Criteria) this; } - public Criteria andNeedPlanNotBetween(String value1, String value2) { - addCriterion("need_plan not between", value1, value2, "needPlan"); + public Criteria andUpdateByNotBetween(String value1, String value2) { + addCriterion("update_by not between", value1, value2, "updateBy"); return (Criteria) this; } - public Criteria andPlanIsNull() { - addCriterion("plan is null"); + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); return (Criteria) this; } - public Criteria andPlanIsNotNull() { - addCriterion("plan is not null"); + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); return (Criteria) this; } - public Criteria andPlanEqualTo(String value) { - addCriterion("plan =", value, "plan"); + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); return (Criteria) this; } - public Criteria andPlanNotEqualTo(String value) { - addCriterion("plan <>", value, "plan"); + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); return (Criteria) this; } - public Criteria andPlanGreaterThan(String value) { - addCriterion("plan >", value, "plan"); + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); return (Criteria) this; } - public Criteria andPlanGreaterThanOrEqualTo(String value) { - addCriterion("plan >=", value, "plan"); + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); return (Criteria) this; } - public Criteria andPlanLessThan(String value) { - addCriterion("plan <", value, "plan"); + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); return (Criteria) this; } - public Criteria andPlanLessThanOrEqualTo(String value) { - addCriterion("plan <=", value, "plan"); + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNull() { + addCriterion("del_flag is null"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNotNull() { + addCriterion("del_flag is not null"); + return (Criteria) this; + } + + public Criteria andDelFlagEqualTo(Byte value) { + addCriterion("del_flag =", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotEqualTo(Byte value) { + addCriterion("del_flag <>", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThan(Byte value) { + addCriterion("del_flag >", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThanOrEqualTo(Byte value) { + addCriterion("del_flag >=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThan(Byte value) { + addCriterion("del_flag <", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThanOrEqualTo(Byte value) { + addCriterion("del_flag <=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagIn(List values) { + addCriterion("del_flag in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotIn(List values) { + addCriterion("del_flag not in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagBetween(Byte value1, Byte value2) { + addCriterion("del_flag between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotBetween(Byte value1, Byte value2) { + addCriterion("del_flag not between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andScaleAssConfIsNull() { + addCriterion("scale_ass_conf is null"); + return (Criteria) this; + } + + public Criteria andScaleAssConfIsNotNull() { + addCriterion("scale_ass_conf is not null"); + return (Criteria) this; + } + + public Criteria andScaleAssConfEqualTo(Long value) { + addCriterion("scale_ass_conf =", value, "scaleAssConf"); + return (Criteria) this; + } + + public Criteria andScaleAssConfNotEqualTo(Long value) { + addCriterion("scale_ass_conf <>", value, "scaleAssConf"); + return (Criteria) this; + } + + public Criteria andScaleAssConfGreaterThan(Long value) { + addCriterion("scale_ass_conf >", value, "scaleAssConf"); + return (Criteria) this; + } + + public Criteria andScaleAssConfGreaterThanOrEqualTo(Long value) { + addCriterion("scale_ass_conf >=", value, "scaleAssConf"); + return (Criteria) this; + } + + public Criteria andScaleAssConfLessThan(Long value) { + addCriterion("scale_ass_conf <", value, "scaleAssConf"); + return (Criteria) this; + } + + public Criteria andScaleAssConfLessThanOrEqualTo(Long value) { + addCriterion("scale_ass_conf <=", value, "scaleAssConf"); return (Criteria) this; } - public Criteria andPlanLike(String value) { - addCriterion("plan like", value, "plan"); + public Criteria andScaleAssConfIn(List values) { + addCriterion("scale_ass_conf in", values, "scaleAssConf"); return (Criteria) this; } - public Criteria andPlanNotLike(String value) { - addCriterion("plan not like", value, "plan"); + public Criteria andScaleAssConfNotIn(List values) { + addCriterion("scale_ass_conf not in", values, "scaleAssConf"); return (Criteria) this; } - public Criteria andPlanIn(List values) { - addCriterion("plan in", values, "plan"); + public Criteria andScaleAssConfBetween(Long value1, Long value2) { + addCriterion("scale_ass_conf between", value1, value2, "scaleAssConf"); return (Criteria) this; } - public Criteria andPlanNotIn(List values) { - addCriterion("plan not in", values, "plan"); + public Criteria andScaleAssConfNotBetween(Long value1, Long value2) { + addCriterion("scale_ass_conf not between", value1, value2, "scaleAssConf"); return (Criteria) this; } - public Criteria andPlanBetween(String value1, String value2) { - addCriterion("plan between", value1, value2, "plan"); + public Criteria andResultIsNull() { + addCriterion("result is null"); return (Criteria) this; } - public Criteria andPlanNotBetween(String value1, String value2) { - addCriterion("plan not between", value1, value2, "plan"); + public Criteria andResultIsNotNull() { + addCriterion("result is not null"); return (Criteria) this; } - public Criteria andCreateByIsNull() { - addCriterion("create_by is null"); + public Criteria andResultEqualTo(String value) { + addCriterion("result =", value, "result"); return (Criteria) this; } - public Criteria andCreateByIsNotNull() { - addCriterion("create_by is not null"); + public Criteria andResultNotEqualTo(String value) { + addCriterion("result <>", value, "result"); return (Criteria) this; } - public Criteria andCreateByEqualTo(String value) { - addCriterion("create_by =", value, "createBy"); + public Criteria andResultGreaterThan(String value) { + addCriterion("result >", value, "result"); return (Criteria) this; } - public Criteria andCreateByNotEqualTo(String value) { - addCriterion("create_by <>", value, "createBy"); + public Criteria andResultGreaterThanOrEqualTo(String value) { + addCriterion("result >=", value, "result"); return (Criteria) this; } - public Criteria andCreateByGreaterThan(String value) { - addCriterion("create_by >", value, "createBy"); + public Criteria andResultLessThan(String value) { + addCriterion("result <", value, "result"); return (Criteria) this; } - public Criteria andCreateByGreaterThanOrEqualTo(String value) { - addCriterion("create_by >=", value, "createBy"); + public Criteria andResultLessThanOrEqualTo(String value) { + addCriterion("result <=", value, "result"); return (Criteria) this; } - public Criteria andCreateByLessThan(String value) { - addCriterion("create_by <", value, "createBy"); + public Criteria andResultLike(String value) { + addCriterion("result like", value, "result"); return (Criteria) this; } - public Criteria andCreateByLessThanOrEqualTo(String value) { - addCriterion("create_by <=", value, "createBy"); + public Criteria andResultNotLike(String value) { + addCriterion("result not like", value, "result"); return (Criteria) this; } - public Criteria andCreateByLike(String value) { - addCriterion("create_by like", value, "createBy"); + public Criteria andResultIn(List values) { + addCriterion("result in", values, "result"); return (Criteria) this; } - public Criteria andCreateByNotLike(String value) { - addCriterion("create_by not like", value, "createBy"); + public Criteria andResultNotIn(List values) { + addCriterion("result not in", values, "result"); return (Criteria) this; } - public Criteria andCreateByIn(List values) { - addCriterion("create_by in", values, "createBy"); + public Criteria andResultBetween(String value1, String value2) { + addCriterion("result between", value1, value2, "result"); return (Criteria) this; } - public Criteria andCreateByNotIn(List values) { - addCriterion("create_by not in", values, "createBy"); + public Criteria andResultNotBetween(String value1, String value2) { + addCriterion("result not between", value1, value2, "result"); return (Criteria) this; } - public Criteria andCreateByBetween(String value1, String value2) { - addCriterion("create_by between", value1, value2, "createBy"); + public Criteria andNeedPlanIsNull() { + addCriterion("need_plan is null"); return (Criteria) this; } - public Criteria andCreateByNotBetween(String value1, String value2) { - addCriterion("create_by not between", value1, value2, "createBy"); + public Criteria andNeedPlanIsNotNull() { + addCriterion("need_plan is not null"); return (Criteria) this; } - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); + public Criteria andNeedPlanEqualTo(String value) { + addCriterion("need_plan =", value, "needPlan"); return (Criteria) this; } - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); + public Criteria andNeedPlanNotEqualTo(String value) { + addCriterion("need_plan <>", value, "needPlan"); return (Criteria) this; } - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); + public Criteria andNeedPlanGreaterThan(String value) { + addCriterion("need_plan >", value, "needPlan"); return (Criteria) this; } - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); + public Criteria andNeedPlanGreaterThanOrEqualTo(String value) { + addCriterion("need_plan >=", value, "needPlan"); return (Criteria) this; } - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); + public Criteria andNeedPlanLessThan(String value) { + addCriterion("need_plan <", value, "needPlan"); return (Criteria) this; } - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); + public Criteria andNeedPlanLessThanOrEqualTo(String value) { + addCriterion("need_plan <=", value, "needPlan"); return (Criteria) this; } - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); + public Criteria andNeedPlanLike(String value) { + addCriterion("need_plan like", value, "needPlan"); return (Criteria) this; } - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); + public Criteria andNeedPlanNotLike(String value) { + addCriterion("need_plan not like", value, "needPlan"); return (Criteria) this; } - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); + public Criteria andNeedPlanIn(List values) { + addCriterion("need_plan in", values, "needPlan"); return (Criteria) this; } - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); + public Criteria andNeedPlanNotIn(List values) { + addCriterion("need_plan not in", values, "needPlan"); return (Criteria) this; } - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); + public Criteria andNeedPlanBetween(String value1, String value2) { + addCriterion("need_plan between", value1, value2, "needPlan"); return (Criteria) this; } - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); + public Criteria andNeedPlanNotBetween(String value1, String value2) { + addCriterion("need_plan not between", value1, value2, "needPlan"); return (Criteria) this; } - public Criteria andUpdateByIsNull() { - addCriterion("update_by is null"); + public Criteria andPlanIsNull() { + addCriterion("plan is null"); return (Criteria) this; } - public Criteria andUpdateByIsNotNull() { - addCriterion("update_by is not null"); + public Criteria andPlanIsNotNull() { + addCriterion("plan is not null"); return (Criteria) this; } - public Criteria andUpdateByEqualTo(String value) { - addCriterion("update_by =", value, "updateBy"); + public Criteria andPlanEqualTo(String value) { + addCriterion("plan =", value, "plan"); return (Criteria) this; } - public Criteria andUpdateByNotEqualTo(String value) { - addCriterion("update_by <>", value, "updateBy"); + public Criteria andPlanNotEqualTo(String value) { + addCriterion("plan <>", value, "plan"); return (Criteria) this; } - public Criteria andUpdateByGreaterThan(String value) { - addCriterion("update_by >", value, "updateBy"); + public Criteria andPlanGreaterThan(String value) { + addCriterion("plan >", value, "plan"); return (Criteria) this; } - public Criteria andUpdateByGreaterThanOrEqualTo(String value) { - addCriterion("update_by >=", value, "updateBy"); + public Criteria andPlanGreaterThanOrEqualTo(String value) { + addCriterion("plan >=", value, "plan"); return (Criteria) this; } - public Criteria andUpdateByLessThan(String value) { - addCriterion("update_by <", value, "updateBy"); + public Criteria andPlanLessThan(String value) { + addCriterion("plan <", value, "plan"); return (Criteria) this; } - public Criteria andUpdateByLessThanOrEqualTo(String value) { - addCriterion("update_by <=", value, "updateBy"); + public Criteria andPlanLessThanOrEqualTo(String value) { + addCriterion("plan <=", value, "plan"); return (Criteria) this; } - public Criteria andUpdateByLike(String value) { - addCriterion("update_by like", value, "updateBy"); + public Criteria andPlanLike(String value) { + addCriterion("plan like", value, "plan"); return (Criteria) this; } - public Criteria andUpdateByNotLike(String value) { - addCriterion("update_by not like", value, "updateBy"); + public Criteria andPlanNotLike(String value) { + addCriterion("plan not like", value, "plan"); return (Criteria) this; } - public Criteria andUpdateByIn(List values) { - addCriterion("update_by in", values, "updateBy"); + public Criteria andPlanIn(List values) { + addCriterion("plan in", values, "plan"); return (Criteria) this; } - public Criteria andUpdateByNotIn(List values) { - addCriterion("update_by not in", values, "updateBy"); + public Criteria andPlanNotIn(List values) { + addCriterion("plan not in", values, "plan"); return (Criteria) this; } - public Criteria andUpdateByBetween(String value1, String value2) { - addCriterion("update_by between", value1, value2, "updateBy"); + public Criteria andPlanBetween(String value1, String value2) { + addCriterion("plan between", value1, value2, "plan"); return (Criteria) this; } - public Criteria andUpdateByNotBetween(String value1, String value2) { - addCriterion("update_by not between", value1, value2, "updateBy"); + public Criteria andPlanNotBetween(String value1, String value2) { + addCriterion("plan not between", value1, value2, "plan"); return (Criteria) this; } - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); + public Criteria andSortIsNull() { + addCriterion("sort is null"); return (Criteria) this; } - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); + public Criteria andSortIsNotNull() { + addCriterion("sort is not null"); return (Criteria) this; } - public Criteria andUpdateTimeEqualTo(Date value) { - addCriterion("update_time =", value, "updateTime"); + public Criteria andSortEqualTo(Integer value) { + addCriterion("sort =", value, "sort"); return (Criteria) this; } - public Criteria andUpdateTimeNotEqualTo(Date value) { - addCriterion("update_time <>", value, "updateTime"); + public Criteria andSortNotEqualTo(Integer value) { + addCriterion("sort <>", value, "sort"); return (Criteria) this; } - public Criteria andUpdateTimeGreaterThan(Date value) { - addCriterion("update_time >", value, "updateTime"); + public Criteria andSortGreaterThan(Integer value) { + addCriterion("sort >", value, "sort"); return (Criteria) this; } - public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("update_time >=", value, "updateTime"); + public Criteria andSortGreaterThanOrEqualTo(Integer value) { + addCriterion("sort >=", value, "sort"); return (Criteria) this; } - public Criteria andUpdateTimeLessThan(Date value) { - addCriterion("update_time <", value, "updateTime"); + public Criteria andSortLessThan(Integer value) { + addCriterion("sort <", value, "sort"); return (Criteria) this; } - public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { - addCriterion("update_time <=", value, "updateTime"); + public Criteria andSortLessThanOrEqualTo(Integer value) { + addCriterion("sort <=", value, "sort"); return (Criteria) this; } - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); + public Criteria andSortIn(List values) { + addCriterion("sort in", values, "sort"); return (Criteria) this; } - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); + public Criteria andSortNotIn(List values) { + addCriterion("sort not in", values, "sort"); return (Criteria) this; } - public Criteria andUpdateTimeBetween(Date value1, Date value2) { - addCriterion("update_time between", value1, value2, "updateTime"); + public Criteria andSortBetween(Integer value1, Integer value2) { + addCriterion("sort between", value1, value2, "sort"); return (Criteria) this; } - public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); + public Criteria andSortNotBetween(Integer value1, Integer value2) { + addCriterion("sort not between", value1, value2, "sort"); return (Criteria) this; } - public Criteria andDelFlagIsNull() { - addCriterion("del_flag is null"); + public Criteria andIsShowIsNull() { + addCriterion("is_show is null"); return (Criteria) this; } - public Criteria andDelFlagIsNotNull() { - addCriterion("del_flag is not null"); + public Criteria andIsShowIsNotNull() { + addCriterion("is_show is not null"); return (Criteria) this; } - public Criteria andDelFlagEqualTo(Byte value) { - addCriterion("del_flag =", value, "delFlag"); + public Criteria andIsShowEqualTo(Byte value) { + addCriterion("is_show =", value, "isShow"); return (Criteria) this; } - public Criteria andDelFlagNotEqualTo(Byte value) { - addCriterion("del_flag <>", value, "delFlag"); + public Criteria andIsShowNotEqualTo(Byte value) { + addCriterion("is_show <>", value, "isShow"); return (Criteria) this; } - public Criteria andDelFlagGreaterThan(Byte value) { - addCriterion("del_flag >", value, "delFlag"); + public Criteria andIsShowGreaterThan(Byte value) { + addCriterion("is_show >", value, "isShow"); return (Criteria) this; } - public Criteria andDelFlagGreaterThanOrEqualTo(Byte value) { - addCriterion("del_flag >=", value, "delFlag"); + public Criteria andIsShowGreaterThanOrEqualTo(Byte value) { + addCriterion("is_show >=", value, "isShow"); return (Criteria) this; } - public Criteria andDelFlagLessThan(Byte value) { - addCriterion("del_flag <", value, "delFlag"); + public Criteria andIsShowLessThan(Byte value) { + addCriterion("is_show <", value, "isShow"); return (Criteria) this; } - public Criteria andDelFlagLessThanOrEqualTo(Byte value) { - addCriterion("del_flag <=", value, "delFlag"); + public Criteria andIsShowLessThanOrEqualTo(Byte value) { + addCriterion("is_show <=", value, "isShow"); return (Criteria) this; } - public Criteria andDelFlagIn(List values) { - addCriterion("del_flag in", values, "delFlag"); + public Criteria andIsShowIn(List values) { + addCriterion("is_show in", values, "isShow"); return (Criteria) this; } - public Criteria andDelFlagNotIn(List values) { - addCriterion("del_flag not in", values, "delFlag"); + public Criteria andIsShowNotIn(List values) { + addCriterion("is_show not in", values, "isShow"); return (Criteria) this; } - public Criteria andDelFlagBetween(Byte value1, Byte value2) { - addCriterion("del_flag between", value1, value2, "delFlag"); + public Criteria andIsShowBetween(Byte value1, Byte value2) { + addCriterion("is_show between", value1, value2, "isShow"); return (Criteria) this; } - public Criteria andDelFlagNotBetween(Byte value1, Byte value2) { - addCriterion("del_flag not between", value1, value2, "delFlag"); + public Criteria andIsShowNotBetween(Byte value1, Byte value2) { + addCriterion("is_show not between", value1, value2, "isShow"); return (Criteria) this; } } diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/AmsVo.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/AmsVo.java index 337af06..31d2a11 100644 --- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/AmsVo.java +++ b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/AmsVo.java @@ -685,6 +685,8 @@ public class AmsVo { private Integer totalNum; @ApiModelProperty("已完成题数") private Integer completedNum; + + private Integer sort; @ApiModelProperty("各项分数") private List scaleScoreList; @ApiModelProperty("试题详情") diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/RmsVo.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/RmsVo.java index 3aa7dec..28e110d 100644 --- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/RmsVo.java +++ b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/RmsVo.java @@ -117,7 +117,7 @@ public class RmsVo { } public String getIdCard() { - if(StrUtil.isNotEmpty(idCard)){ + if (StrUtil.isNotEmpty(idCard)) { return idCard.substring(0, 2) + "******" + idCard.substring(idCard.length() - 4, idCard.length()); } return idCard; @@ -139,7 +139,7 @@ public class RmsVo { } @Data - public static class Report{ + public static class Report { private Long id; @ApiModelProperty("测评ID") private Long evaluationId; @@ -188,6 +188,7 @@ public class RmsVo { private String deptName; } + @Data @ApiModel("PatientReportVoGenerate") public static class Generate { @@ -274,6 +275,10 @@ public class RmsVo { @ApiModelProperty("初步印象") private String initialImpression; private String testerName; + + @ApiModelProperty("出生日期") + private String birthday; + public List toPdfRow() { List rows = getInitRows(); //第四栏 @@ -479,6 +484,8 @@ public class RmsVo { private String result; private String needPlan; + @ApiModelProperty("套餐Id") + private Long comboId; @ApiModelProperty("测评量表排序") private Integer ecrSort; @@ -487,6 +494,7 @@ public class RmsVo { @ApiModelProperty("中医体质辨识养生建议") private List reportYsjyList; + public void addSub(ReportScore score) { this.subReport.add(score); } @@ -1038,10 +1046,10 @@ public class RmsVo { @ApiModel("病友的答案") @Data public static class Answer { -// @JsonIgnore + // @JsonIgnore @ApiModelProperty("选项id") private Long optionId; -// @JsonIgnore + // @JsonIgnore @ApiModelProperty("选项名") private String optionName; @ApiModelProperty("答案") @@ -1203,6 +1211,42 @@ public class RmsVo { private Integer optionNum; } + @Data + public static class ExportInfo { + @ApiModelProperty("报告单ID") + private Long reporrtId; + @ApiModelProperty("量表CODE") + private String scaleCode; + @ApiModelProperty("量表名称") + private String scaleName; + @ApiModelProperty("得分") + private BigDecimal score; + @ApiModelProperty("初步印象") + private String impression; + @ApiModelProperty("套餐ID") + private Long comboId; + @ApiModelProperty("套餐名称") + private String comboName; + @ApiModelProperty("父级套餐名称") + private String comboParentName; + @ApiModelProperty("量表分值结论配置Id") + private String scaleAssConf; + @ApiModelProperty("当前分值段结论") + private String result; + @ApiModelProperty("需要防治(1需要，0不需要)") + private Integer needPlan; + @ApiModelProperty("防治计划") + private String plan; + @ApiModelProperty("排序") + private Integer sort; + + @ApiModelProperty("中医体质辨识结论") + private List reportResultList; + + @ApiModelProperty("中医体质辨识养生建议") + private List reportYsjyList; + } + @ApiModel("统计四列表之报告单-DTO") @Data diff --git a/ruisi_java/ruisi-system/src/main/resources/mapper/system/RmsReportMapper.xml b/ruisi_java/ruisi-system/src/main/resources/mapper/system/RmsReportMapper.xml index 5fee6bd..3b4f4d6 100644 --- a/ruisi_java/ruisi-system/src/main/resources/mapper/system/RmsReportMapper.xml +++ b/ruisi_java/ruisi-system/src/main/resources/mapper/system/RmsReportMapper.xml @@ -14,6 +14,8 @@ + + @@ -87,9 +89,9 @@ id, name, evaluation_id, initial_impression, clinical_diagnosis, pasi, patient_age, - department, bed_number, report_time, evaluation_code, url, qr_code_url, sign_url, - remark, show_status, hospital, working_score, create_by, create_time, update_by, - update_time, del_flag, visit_no + department, bed_number, report_time, evaluation_code, url, persion_url, positive_url, + qr_code_url, sign_url, remark, show_status, hospital, working_score, create_by, create_time, + update_by, update_time, del_flag, visit_no select @@ -112,17 +114,17 @@ insert into rms_report_scale_score (id, report_id, scale_code, - score, impression, sort, - scale_ass_conf, result, need_plan, - plan, create_by, create_time, - update_by, update_time, del_flag - ) + score, impression, combo_id, + create_by, create_time, update_by, + update_time, del_flag, scale_ass_conf, + result, need_plan, plan, + sort, is_show) values (#{id,jdbcType=BIGINT}, #{reportId,jdbcType=BIGINT}, #{scaleCode,jdbcType=VARCHAR}, - #{score,jdbcType=DECIMAL}, #{impression,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, - #{scaleAssConf,jdbcType=BIGINT}, #{result,jdbcType=VARCHAR}, #{needPlan,jdbcType=VARCHAR}, - #{plan,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, - #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=TINYINT} - ) + #{score,jdbcType=DECIMAL}, #{impression,jdbcType=VARCHAR}, #{comboId,jdbcType=BIGINT}, + #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, + #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=TINYINT}, #{scaleAssConf,jdbcType=BIGINT}, + #{result,jdbcType=VARCHAR}, #{needPlan,jdbcType=VARCHAR}, #{plan,jdbcType=VARCHAR}, + #{sort,jdbcType=INTEGER}, #{isShow,jdbcType=TINYINT}) insert into rms_report_scale_score @@ -142,20 +144,8 @@ impression, - - sort, - - - scale_ass_conf, - - - result, - - - need_plan, - - - plan, + + combo_id, create_by, @@ -172,6 +162,24 @@ del_flag, + + scale_ass_conf, + + + result, + + + need_plan, + + + plan, + + + sort, + + + is_show, + @@ -189,20 +197,8 @@ #{impression,jdbcType=VARCHAR}, - - #{sort,jdbcType=INTEGER}, - - - #{scaleAssConf,jdbcType=BIGINT}, - - - #{result,jdbcType=VARCHAR}, - - - #{needPlan,jdbcType=VARCHAR}, - - - #{plan,jdbcType=VARCHAR}, + + #{comboId,jdbcType=BIGINT}, #{createBy,jdbcType=VARCHAR}, @@ -219,6 +215,24 @@ #{delFlag,jdbcType=TINYINT}, + + #{scaleAssConf,jdbcType=BIGINT}, + + + #{result,jdbcType=VARCHAR}, + + + #{needPlan,jdbcType=VARCHAR}, + + + #{plan,jdbcType=VARCHAR}, + + + #{sort,jdbcType=INTEGER}, + + + #{isShow,jdbcType=TINYINT}, + + + \ No newline at end of file diff --git a/web_admin/adminapi/index.html b/web_admin/adminapi/index.html index f0a9994..41cb6e0 100644 --- a/web_admin/adminapi/index.html +++ b/web_admin/adminapi/index.html @@ -182,4 +182,4 @@ font-size: 13px; color: #fff; opacity: 0.5; - }
正在加载系统资源，请耐心等待
\ No newline at end of file + }
正在加载系统资源，请耐心等待
\ No newline at end of file diff --git a/web_admin/adminapi/index.html.gz b/web_admin/adminapi/index.html.gz index dd32cd3..d5b8344 100644 Binary files a/web_admin/adminapi/index.html.gz and b/web_admin/adminapi/index.html.gz differ diff --git a/web_admin/cga113v2admin03.03-2.zip b/web_admin/cga113v2admin03.02-2.zip similarity index 86% rename from web_admin/cga113v2admin03.03-2.zip rename to web_admin/cga113v2admin03.02-2.zip index 0116f16..39e0f2d 100644 Binary files a/web_admin/cga113v2admin03.03-2.zip and b/web_admin/cga113v2admin03.02-2.zip differ diff --git a/web_admin/src/App.vue b/web_admin/src/App.vue index 360c9bb..a4ca1b5 100644 --- a/web_admin/src/App.vue +++ b/web_admin/src/App.vue @@ -11,7 +11,7 @@ export default { name: "App", components: { ThemePicker }, created() { - console.log("部署111`"); + console.log("部署2"); }, metaInfo() { diff --git a/web_admin/src/api/report.js b/web_admin/src/api/report.js index 451f167..55a61ce 100644 --- a/web_admin/src/api/report.js +++ b/web_admin/src/api/report.js @@ -6,10 +6,3 @@ export function exportPdf(data) { data: data, }); } -export function queryPdfUrl(data) { - return request({ - url: "/queryPdfUrl", - method: "post", - data: data, - }); -} diff --git a/web_admin/src/views/largeScreen.vue b/web_admin/src/views/largeScreen.vue index e88694a..747fea5 100644 --- a/web_admin/src/views/largeScreen.vue +++ b/web_admin/src/views/largeScreen.vue @@ -256,7 +256,6 @@ export default { mounted() { // 180 河南省电力医院 // 106 测试医院 - // 178 湖南 let deptId = this.$route.query.deptId || 106; localStorage.setItem("hospitalId", deptId); this.getNnicd(); // 疾病排行 diff --git a/web_admin/src/views/report/view copy.vue b/web_admin/src/views/report/view copy.vue deleted file mode 100644 index 7343e91..0000000 --- a/web_admin/src/views/report/view copy.vue +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - diff --git a/web_admin/src/views/report/view.vue b/web_admin/src/views/report/view.vue index 210bdfd..53d4d5e 100644 --- a/web_admin/src/views/report/view.vue +++ b/web_admin/src/views/report/view.vue @@ -1,174 +1,77 @@ + - + diff --git a/web_admin/vue.config.js b/web_admin/vue.config.js index 33eb298..155b6c9 100644 --- a/web_admin/vue.config.js +++ b/web_admin/vue.config.js @@ -36,11 +36,9 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - // target: `http://localhost:8080`, - // target: `http://192.168.1.116:19330`, + target: `http://localhost:19330`, // target: "https://nnzjpt.ylinno.com/ruisiCgaAdmin/", // target: "https://www.ylinno.com/cga/v2/api/admin/", - target: "http://113.45.159.249:59001/cga/v2/api/admin/", changeOrigin: true, pathRewrite: { ["^" + process.env.VUE_APP_BASE_API]: "", diff --git a/web_client/src/api/ams.js b/web_client/src/api/ams.js index 9ef650a..86179cc 100644 --- a/web_client/src/api/ams.js +++ b/web_client/src/api/ams.js @@ -219,4 +219,5 @@ export const furtherEvaluation = (params) => export const deletePatient = (params) => axios.post(`${proxyUrl}/ems/delete`, params); // 撤回评估 -export const revok = (params) => axios.post(`${proxyUrl}/ems/revok`, params); +export const revok = (params) => + axios.post(`${proxyUrl}/ems/revoke`, params); diff --git a/web_client/vue.config.js b/web_client/vue.config.js index 6b64cfc..cee8be0 100644 --- a/web_client/vue.config.js +++ b/web_client/vue.config.js @@ -37,7 +37,7 @@ module.exports = { [settings.proxyUrl]: { // target: "https://www.ylinno.com/cga/v2/api/client/", // target: "http://113.45.159.249:59001/cga/v2/api/client/", - target: "http://192.168.1.136:19331", + target: "http://127.0.0.1:19331", changeOrigin: true, pathRewrite: { ["^" + settings.proxyUrl]: "",