合并

ruisi_java/ruisi-cc-common/src/main/java/com/ccsens/common/constant/ErrorConstant.java

@@ -1,7 +1,6 @@
 package com.ccsens.common.constant;
 
 import com.ccsens.common.enums.BaseEnum;
-import javafx.scene.transform.Scale;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

ruisi_java/ruisi-cc-common/src/main/java/com/ccsens/common/utils/SmsUtil.java

@@ -2,11 +2,11 @@ package com.ccsens.common.utils;
 
 import com.github.qcloudsms.SmsSingleSender;
 import com.github.qcloudsms.SmsSingleSenderResult;
+import com.github.qcloudsms.httpclient.HTTPException;
 import lombok.extern.slf4j.Slf4j;
 import org.json.JSONException;
 import org.springframework.stereotype.Component;
 
-import javax.xml.ws.http.HTTPException;
 import java.io.IOException;
 
 /**
@@ -58,7 +58,7 @@ public class SmsUtil {
             // 签名参数未提供或者为空时，会使用默认签名发送短信
             result = smsSender.sendWithParam("86", phone,
                     TEMPLATE_ID_2, params, SMS_SIGN, "", "");
-        } catch (HTTPException | JSONException | IOException | com.github.qcloudsms.httpclient.HTTPException e) {
+        } catch (JSONException | IOException | com.github.qcloudsms.httpclient.HTTPException e) {
             e.printStackTrace();
             log.info("Exception: ",e);
         }

ruisi_java/ruisi-cc-generator/src/main/resources/mbg.xml

@@ -102,8 +102,12 @@
 <!--        <table tableName="qms_question_relevance" domainObjectName="QmsQuestionRelevance"/>-->
 <!--        <table tableName="qms_question_show" domainObjectName="QmsQuestionShow"/>-->
 <!--        <table tableName="qms_scale_pass_score" domainObjectName="QmsScalePassScore"/>-->
-<!--        <table tableName="qms_question_scoring_rule" domainObjectName="QmsQuestionScoringRule"/>-->
+<!--&lt;!&ndash;        <table tableName="qms_question_scoring_rule" domainObjectName="QmsQuestionScoringRule"/>&ndash;&gt;-->
-
+<!--        <table tableName="tzbs_qms_scale_cognitive" domainObjectName="TzbsQmsScaleCognitive"/>-->
+<!--        <table tableName="tzbs_qms_scale_consti_ref_score" domainObjectName="TzbsQmsScaleConstiRefScore"/>-->
+<!--        <table tableName="tzbs_qms_scale_consti_ysfa" domainObjectName="TzbsQmsScaleConstiYsfa"/>-->
+        <table tableName="tzbs_rms_report_result" domainObjectName="TzbsRmsReportResult"/>
+        <table tableName="tzbs_rms_report_ysjy" domainObjectName="TzbsRmsReportYsjy"/>
 <!--        <table tableName="ams_patient_answer_score" domainObjectName="AmsPatientAnswerScore"/>-->
 <!--        <table tableName="ams_patient_canvas" domainObjectName="AmsPatientCanvas"/>-->
 <!--        <table tableName="ams_patient_canvas_line" domainObjectName="AmsPatientCanvasLine"/>-->

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/TbScaleAssConf.java

@@ -30,7 +30,7 @@ public class TbScaleAssConf implements Serializable {
 
     private String remark;
 
-    private String delFlag;
+    private Byte delFlag;
 
     private Date createTime;
 
@@ -148,12 +148,12 @@ public class TbScaleAssConf implements Serializable {
         this.remark = remark == null ? null : remark.trim();
     }
 
-    public String getDelFlag() {
+    public Byte getDelFlag() {
         return delFlag;
     }
 
-    public void setDelFlag(String delFlag) {
+    public void setDelFlag(Byte delFlag) {
-        this.delFlag = delFlag == null ? null : delFlag.trim();
+        this.delFlag = delFlag;
     }
 
     public Date getCreateTime() {

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/TbScaleAssConfExample.java

@@ -1022,62 +1022,52 @@ public class TbScaleAssConfExample {
             return (Criteria) this;
         }
 
-        public Criteria andDelFlagEqualTo(String value) {
+        public Criteria andDelFlagEqualTo(Byte value) {
             addCriterion("del_flag =", value, "delFlag");
             return (Criteria) this;
         }
 
-        public Criteria andDelFlagNotEqualTo(String value) {
+        public Criteria andDelFlagNotEqualTo(Byte value) {
             addCriterion("del_flag <>", value, "delFlag");
             return (Criteria) this;
         }
 
-        public Criteria andDelFlagGreaterThan(String value) {
+        public Criteria andDelFlagGreaterThan(Byte value) {
             addCriterion("del_flag >", value, "delFlag");
             return (Criteria) this;
         }
 
-        public Criteria andDelFlagGreaterThanOrEqualTo(String value) {
+        public Criteria andDelFlagGreaterThanOrEqualTo(Byte value) {
             addCriterion("del_flag >=", value, "delFlag");
             return (Criteria) this;
         }
 
-        public Criteria andDelFlagLessThan(String value) {
+        public Criteria andDelFlagLessThan(Byte value) {
             addCriterion("del_flag <", value, "delFlag");
             return (Criteria) this;
         }
 
-        public Criteria andDelFlagLessThanOrEqualTo(String value) {
+        public Criteria andDelFlagLessThanOrEqualTo(Byte value) {
             addCriterion("del_flag <=", value, "delFlag");
             return (Criteria) this;
         }
 
-        public Criteria andDelFlagLike(String value) {
+        public Criteria andDelFlagIn(List<Byte> values) {
-            addCriterion("del_flag like", value, "delFlag");
-            return (Criteria) this;
-        }
-
-        public Criteria andDelFlagNotLike(String value) {
-            addCriterion("del_flag not like", value, "delFlag");
-            return (Criteria) this;
-        }
-
-        public Criteria andDelFlagIn(List<String> values) {
             addCriterion("del_flag in", values, "delFlag");
             return (Criteria) this;
         }
 
-        public Criteria andDelFlagNotIn(List<String> values) {
+        public Criteria andDelFlagNotIn(List<Byte> values) {
             addCriterion("del_flag not in", values, "delFlag");
             return (Criteria) this;
         }
 
-        public Criteria andDelFlagBetween(String value1, String value2) {
+        public Criteria andDelFlagBetween(Byte value1, Byte value2) {
             addCriterion("del_flag between", value1, value2, "delFlag");
             return (Criteria) this;
         }
 
-        public Criteria andDelFlagNotBetween(String value1, String value2) {
+        public Criteria andDelFlagNotBetween(Byte value1, Byte value2) {
             addCriterion("del_flag not between", value1, value2, "delFlag");
             return (Criteria) this;
         }

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/TzbsQmsScaleCognitive.java

@@ -0,0 +1,117 @@
+package com.ccsens.system.domain.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class TzbsQmsScaleCognitive implements Serializable {
+    private Long id;
+
+    private String constiCode;
+
+    private String quesCode;
+
+    private Byte reverse;
+
+    private String delFlag;
+
+    private String createBy;
+
+    private Date createTime;
+
+    private String updateBy;
+
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getConstiCode() {
+        return constiCode;
+    }
+
+    public void setConstiCode(String constiCode) {
+        this.constiCode = constiCode == null ? null : constiCode.trim();
+    }
+
+    public String getQuesCode() {
+        return quesCode;
+    }
+
+    public void setQuesCode(String quesCode) {
+        this.quesCode = quesCode == null ? null : quesCode.trim();
+    }
+
+    public Byte getReverse() {
+        return reverse;
+    }
+
+    public void setReverse(Byte reverse) {
+        this.reverse = reverse;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag == null ? null : delFlag.trim();
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy == null ? null : createBy.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy == null ? null : updateBy.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @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(", constiCode=").append(constiCode);
+        sb.append(", quesCode=").append(quesCode);
+        sb.append(", reverse=").append(reverse);
+        sb.append(", delFlag=").append(delFlag);
+        sb.append(", createBy=").append(createBy);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateBy=").append(updateBy);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append("]");
+        return sb.toString();
+    }
+}

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/TzbsQmsScaleCognitiveExample.java

@@ -0,0 +1,791 @@
+package com.ccsens.system.domain.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class TzbsQmsScaleCognitiveExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public TzbsQmsScaleCognitiveExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeIsNull() {
+            addCriterion("consti_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeIsNotNull() {
+            addCriterion("consti_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeEqualTo(String value) {
+            addCriterion("consti_code =", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeNotEqualTo(String value) {
+            addCriterion("consti_code <>", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeGreaterThan(String value) {
+            addCriterion("consti_code >", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("consti_code >=", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeLessThan(String value) {
+            addCriterion("consti_code <", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeLessThanOrEqualTo(String value) {
+            addCriterion("consti_code <=", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeLike(String value) {
+            addCriterion("consti_code like", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeNotLike(String value) {
+            addCriterion("consti_code not like", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeIn(List<String> values) {
+            addCriterion("consti_code in", values, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeNotIn(List<String> values) {
+            addCriterion("consti_code not in", values, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeBetween(String value1, String value2) {
+            addCriterion("consti_code between", value1, value2, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeNotBetween(String value1, String value2) {
+            addCriterion("consti_code not between", value1, value2, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuesCodeIsNull() {
+            addCriterion("ques_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuesCodeIsNotNull() {
+            addCriterion("ques_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuesCodeEqualTo(String value) {
+            addCriterion("ques_code =", value, "quesCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuesCodeNotEqualTo(String value) {
+            addCriterion("ques_code <>", value, "quesCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuesCodeGreaterThan(String value) {
+            addCriterion("ques_code >", value, "quesCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuesCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("ques_code >=", value, "quesCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuesCodeLessThan(String value) {
+            addCriterion("ques_code <", value, "quesCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuesCodeLessThanOrEqualTo(String value) {
+            addCriterion("ques_code <=", value, "quesCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuesCodeLike(String value) {
+            addCriterion("ques_code like", value, "quesCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuesCodeNotLike(String value) {
+            addCriterion("ques_code not like", value, "quesCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuesCodeIn(List<String> values) {
+            addCriterion("ques_code in", values, "quesCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuesCodeNotIn(List<String> values) {
+            addCriterion("ques_code not in", values, "quesCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuesCodeBetween(String value1, String value2) {
+            addCriterion("ques_code between", value1, value2, "quesCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuesCodeNotBetween(String value1, String value2) {
+            addCriterion("ques_code not between", value1, value2, "quesCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andReverseIsNull() {
+            addCriterion("reverse is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReverseIsNotNull() {
+            addCriterion("reverse is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReverseEqualTo(Byte value) {
+            addCriterion("reverse =", value, "reverse");
+            return (Criteria) this;
+        }
+
+        public Criteria andReverseNotEqualTo(Byte value) {
+            addCriterion("reverse <>", value, "reverse");
+            return (Criteria) this;
+        }
+
+        public Criteria andReverseGreaterThan(Byte value) {
+            addCriterion("reverse >", value, "reverse");
+            return (Criteria) this;
+        }
+
+        public Criteria andReverseGreaterThanOrEqualTo(Byte value) {
+            addCriterion("reverse >=", value, "reverse");
+            return (Criteria) this;
+        }
+
+        public Criteria andReverseLessThan(Byte value) {
+            addCriterion("reverse <", value, "reverse");
+            return (Criteria) this;
+        }
+
+        public Criteria andReverseLessThanOrEqualTo(Byte value) {
+            addCriterion("reverse <=", value, "reverse");
+            return (Criteria) this;
+        }
+
+        public Criteria andReverseIn(List<Byte> values) {
+            addCriterion("reverse in", values, "reverse");
+            return (Criteria) this;
+        }
+
+        public Criteria andReverseNotIn(List<Byte> values) {
+            addCriterion("reverse not in", values, "reverse");
+            return (Criteria) this;
+        }
+
+        public Criteria andReverseBetween(Byte value1, Byte value2) {
+            addCriterion("reverse between", value1, value2, "reverse");
+            return (Criteria) this;
+        }
+
+        public Criteria andReverseNotBetween(Byte value1, Byte value2) {
+            addCriterion("reverse not between", value1, value2, "reverse");
+            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(String value) {
+            addCriterion("del_flag =", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagNotEqualTo(String value) {
+            addCriterion("del_flag <>", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagGreaterThan(String value) {
+            addCriterion("del_flag >", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagGreaterThanOrEqualTo(String value) {
+            addCriterion("del_flag >=", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagLessThan(String value) {
+            addCriterion("del_flag <", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagLessThanOrEqualTo(String value) {
+            addCriterion("del_flag <=", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagLike(String value) {
+            addCriterion("del_flag like", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagNotLike(String value) {
+            addCriterion("del_flag not like", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagIn(List<String> values) {
+            addCriterion("del_flag in", values, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagNotIn(List<String> values) {
+            addCriterion("del_flag not in", values, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagBetween(String value1, String value2) {
+            addCriterion("del_flag between", value1, value2, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagNotBetween(String value1, String value2) {
+            addCriterion("del_flag not between", value1, value2, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIsNull() {
+            addCriterion("create_by is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIsNotNull() {
+            addCriterion("create_by is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByEqualTo(String value) {
+            addCriterion("create_by =", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotEqualTo(String value) {
+            addCriterion("create_by <>", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByGreaterThan(String value) {
+            addCriterion("create_by >", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByGreaterThanOrEqualTo(String value) {
+            addCriterion("create_by >=", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLessThan(String value) {
+            addCriterion("create_by <", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLessThanOrEqualTo(String value) {
+            addCriterion("create_by <=", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLike(String value) {
+            addCriterion("create_by like", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotLike(String value) {
+            addCriterion("create_by not like", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIn(List<String> values) {
+            addCriterion("create_by in", values, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotIn(List<String> values) {
+            addCriterion("create_by not in", values, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByBetween(String value1, String value2) {
+            addCriterion("create_by between", value1, value2, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotBetween(String value1, String value2) {
+            addCriterion("create_by not between", value1, value2, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIsNull() {
+            addCriterion("update_by is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIsNotNull() {
+            addCriterion("update_by is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByEqualTo(String value) {
+            addCriterion("update_by =", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotEqualTo(String value) {
+            addCriterion("update_by <>", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByGreaterThan(String value) {
+            addCriterion("update_by >", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByGreaterThanOrEqualTo(String value) {
+            addCriterion("update_by >=", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLessThan(String value) {
+            addCriterion("update_by <", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLessThanOrEqualTo(String value) {
+            addCriterion("update_by <=", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLike(String value) {
+            addCriterion("update_by like", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotLike(String value) {
+            addCriterion("update_by not like", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIn(List<String> values) {
+            addCriterion("update_by in", values, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotIn(List<String> values) {
+            addCriterion("update_by not in", values, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByBetween(String value1, String value2) {
+            addCriterion("update_by between", value1, value2, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotBetween(String value1, String value2) {
+            addCriterion("update_by not between", value1, value2, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> 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 static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/TzbsQmsScaleConstiRefScore.java

@@ -0,0 +1,129 @@
+package com.ccsens.system.domain.po;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class TzbsQmsScaleConstiRefScore implements Serializable {
+    private Long id;
+
+    private String constiCode;
+
+    private BigDecimal refScoreYes;
+
+    private BigDecimal refScoreMaybe;
+
+    private BigDecimal fullScore;
+
+    private String delFlag;
+
+    private String createBy;
+
+    private Date createTime;
+
+    private String updateBy;
+
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getConstiCode() {
+        return constiCode;
+    }
+
+    public void setConstiCode(String constiCode) {
+        this.constiCode = constiCode == null ? null : constiCode.trim();
+    }
+
+    public BigDecimal getRefScoreYes() {
+        return refScoreYes;
+    }
+
+    public void setRefScoreYes(BigDecimal refScoreYes) {
+        this.refScoreYes = refScoreYes;
+    }
+
+    public BigDecimal getRefScoreMaybe() {
+        return refScoreMaybe;
+    }
+
+    public void setRefScoreMaybe(BigDecimal refScoreMaybe) {
+        this.refScoreMaybe = refScoreMaybe;
+    }
+
+    public BigDecimal getFullScore() {
+        return fullScore;
+    }
+
+    public void setFullScore(BigDecimal fullScore) {
+        this.fullScore = fullScore;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag == null ? null : delFlag.trim();
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy == null ? null : createBy.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy == null ? null : updateBy.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @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(", constiCode=").append(constiCode);
+        sb.append(", refScoreYes=").append(refScoreYes);
+        sb.append(", refScoreMaybe=").append(refScoreMaybe);
+        sb.append(", fullScore=").append(fullScore);
+        sb.append(", delFlag=").append(delFlag);
+        sb.append(", createBy=").append(createBy);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateBy=").append(updateBy);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append("]");
+        return sb.toString();
+    }
+}

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/TzbsQmsScaleConstiRefScoreExample.java

@@ -0,0 +1,842 @@
+package com.ccsens.system.domain.po;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class TzbsQmsScaleConstiRefScoreExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public TzbsQmsScaleConstiRefScoreExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeIsNull() {
+            addCriterion("consti_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeIsNotNull() {
+            addCriterion("consti_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeEqualTo(String value) {
+            addCriterion("consti_code =", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeNotEqualTo(String value) {
+            addCriterion("consti_code <>", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeGreaterThan(String value) {
+            addCriterion("consti_code >", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("consti_code >=", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeLessThan(String value) {
+            addCriterion("consti_code <", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeLessThanOrEqualTo(String value) {
+            addCriterion("consti_code <=", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeLike(String value) {
+            addCriterion("consti_code like", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeNotLike(String value) {
+            addCriterion("consti_code not like", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeIn(List<String> values) {
+            addCriterion("consti_code in", values, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeNotIn(List<String> values) {
+            addCriterion("consti_code not in", values, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeBetween(String value1, String value2) {
+            addCriterion("consti_code between", value1, value2, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeNotBetween(String value1, String value2) {
+            addCriterion("consti_code not between", value1, value2, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefScoreYesIsNull() {
+            addCriterion("ref_score_yes is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefScoreYesIsNotNull() {
+            addCriterion("ref_score_yes is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefScoreYesEqualTo(BigDecimal value) {
+            addCriterion("ref_score_yes =", value, "refScoreYes");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefScoreYesNotEqualTo(BigDecimal value) {
+            addCriterion("ref_score_yes <>", value, "refScoreYes");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefScoreYesGreaterThan(BigDecimal value) {
+            addCriterion("ref_score_yes >", value, "refScoreYes");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefScoreYesGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("ref_score_yes >=", value, "refScoreYes");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefScoreYesLessThan(BigDecimal value) {
+            addCriterion("ref_score_yes <", value, "refScoreYes");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefScoreYesLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("ref_score_yes <=", value, "refScoreYes");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefScoreYesIn(List<BigDecimal> values) {
+            addCriterion("ref_score_yes in", values, "refScoreYes");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefScoreYesNotIn(List<BigDecimal> values) {
+            addCriterion("ref_score_yes not in", values, "refScoreYes");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefScoreYesBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ref_score_yes between", value1, value2, "refScoreYes");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefScoreYesNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ref_score_yes not between", value1, value2, "refScoreYes");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefScoreMaybeIsNull() {
+            addCriterion("ref_score_Maybe is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefScoreMaybeIsNotNull() {
+            addCriterion("ref_score_Maybe is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefScoreMaybeEqualTo(BigDecimal value) {
+            addCriterion("ref_score_Maybe =", value, "refScoreMaybe");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefScoreMaybeNotEqualTo(BigDecimal value) {
+            addCriterion("ref_score_Maybe <>", value, "refScoreMaybe");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefScoreMaybeGreaterThan(BigDecimal value) {
+            addCriterion("ref_score_Maybe >", value, "refScoreMaybe");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefScoreMaybeGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("ref_score_Maybe >=", value, "refScoreMaybe");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefScoreMaybeLessThan(BigDecimal value) {
+            addCriterion("ref_score_Maybe <", value, "refScoreMaybe");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefScoreMaybeLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("ref_score_Maybe <=", value, "refScoreMaybe");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefScoreMaybeIn(List<BigDecimal> values) {
+            addCriterion("ref_score_Maybe in", values, "refScoreMaybe");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefScoreMaybeNotIn(List<BigDecimal> values) {
+            addCriterion("ref_score_Maybe not in", values, "refScoreMaybe");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefScoreMaybeBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ref_score_Maybe between", value1, value2, "refScoreMaybe");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefScoreMaybeNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ref_score_Maybe not between", value1, value2, "refScoreMaybe");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullScoreIsNull() {
+            addCriterion("full_score is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullScoreIsNotNull() {
+            addCriterion("full_score is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullScoreEqualTo(BigDecimal value) {
+            addCriterion("full_score =", value, "fullScore");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullScoreNotEqualTo(BigDecimal value) {
+            addCriterion("full_score <>", value, "fullScore");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullScoreGreaterThan(BigDecimal value) {
+            addCriterion("full_score >", value, "fullScore");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullScoreGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("full_score >=", value, "fullScore");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullScoreLessThan(BigDecimal value) {
+            addCriterion("full_score <", value, "fullScore");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullScoreLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("full_score <=", value, "fullScore");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullScoreIn(List<BigDecimal> values) {
+            addCriterion("full_score in", values, "fullScore");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullScoreNotIn(List<BigDecimal> values) {
+            addCriterion("full_score not in", values, "fullScore");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullScoreBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("full_score between", value1, value2, "fullScore");
+            return (Criteria) this;
+        }
+
+        public Criteria andFullScoreNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("full_score not between", value1, value2, "fullScore");
+            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(String value) {
+            addCriterion("del_flag =", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagNotEqualTo(String value) {
+            addCriterion("del_flag <>", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagGreaterThan(String value) {
+            addCriterion("del_flag >", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagGreaterThanOrEqualTo(String value) {
+            addCriterion("del_flag >=", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagLessThan(String value) {
+            addCriterion("del_flag <", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagLessThanOrEqualTo(String value) {
+            addCriterion("del_flag <=", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagLike(String value) {
+            addCriterion("del_flag like", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagNotLike(String value) {
+            addCriterion("del_flag not like", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagIn(List<String> values) {
+            addCriterion("del_flag in", values, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagNotIn(List<String> values) {
+            addCriterion("del_flag not in", values, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagBetween(String value1, String value2) {
+            addCriterion("del_flag between", value1, value2, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagNotBetween(String value1, String value2) {
+            addCriterion("del_flag not between", value1, value2, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIsNull() {
+            addCriterion("create_by is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIsNotNull() {
+            addCriterion("create_by is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByEqualTo(String value) {
+            addCriterion("create_by =", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotEqualTo(String value) {
+            addCriterion("create_by <>", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByGreaterThan(String value) {
+            addCriterion("create_by >", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByGreaterThanOrEqualTo(String value) {
+            addCriterion("create_by >=", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLessThan(String value) {
+            addCriterion("create_by <", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLessThanOrEqualTo(String value) {
+            addCriterion("create_by <=", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLike(String value) {
+            addCriterion("create_by like", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotLike(String value) {
+            addCriterion("create_by not like", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIn(List<String> values) {
+            addCriterion("create_by in", values, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotIn(List<String> values) {
+            addCriterion("create_by not in", values, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByBetween(String value1, String value2) {
+            addCriterion("create_by between", value1, value2, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotBetween(String value1, String value2) {
+            addCriterion("create_by not between", value1, value2, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIsNull() {
+            addCriterion("update_by is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIsNotNull() {
+            addCriterion("update_by is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByEqualTo(String value) {
+            addCriterion("update_by =", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotEqualTo(String value) {
+            addCriterion("update_by <>", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByGreaterThan(String value) {
+            addCriterion("update_by >", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByGreaterThanOrEqualTo(String value) {
+            addCriterion("update_by >=", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLessThan(String value) {
+            addCriterion("update_by <", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLessThanOrEqualTo(String value) {
+            addCriterion("update_by <=", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLike(String value) {
+            addCriterion("update_by like", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotLike(String value) {
+            addCriterion("update_by not like", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIn(List<String> values) {
+            addCriterion("update_by in", values, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotIn(List<String> values) {
+            addCriterion("update_by not in", values, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByBetween(String value1, String value2) {
+            addCriterion("update_by between", value1, value2, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotBetween(String value1, String value2) {
+            addCriterion("update_by not between", value1, value2, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> 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 static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/TzbsQmsScaleConstiYsfa.java

@@ -0,0 +1,106 @@
+package com.ccsens.system.domain.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class TzbsQmsScaleConstiYsfa implements Serializable {
+    private Long id;
+
+    private String constiCode;
+
+    private String delFlag;
+
+    private String createBy;
+
+    private Date createTime;
+
+    private String updateBy;
+
+    private Date updateTime;
+
+    private String constiYsfaTemplate;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getConstiCode() {
+        return constiCode;
+    }
+
+    public void setConstiCode(String constiCode) {
+        this.constiCode = constiCode == null ? null : constiCode.trim();
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag == null ? null : delFlag.trim();
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy == null ? null : createBy.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy == null ? null : updateBy.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getConstiYsfaTemplate() {
+        return constiYsfaTemplate;
+    }
+
+    public void setConstiYsfaTemplate(String constiYsfaTemplate) {
+        this.constiYsfaTemplate = constiYsfaTemplate == null ? null : constiYsfaTemplate.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(", constiCode=").append(constiCode);
+        sb.append(", delFlag=").append(delFlag);
+        sb.append(", createBy=").append(createBy);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateBy=").append(updateBy);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", constiYsfaTemplate=").append(constiYsfaTemplate);
+        sb.append("]");
+        return sb.toString();
+    }
+}

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/TzbsQmsScaleConstiYsfaExample.java

@@ -0,0 +1,661 @@
+package com.ccsens.system.domain.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class TzbsQmsScaleConstiYsfaExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public TzbsQmsScaleConstiYsfaExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeIsNull() {
+            addCriterion("consti_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeIsNotNull() {
+            addCriterion("consti_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeEqualTo(String value) {
+            addCriterion("consti_code =", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeNotEqualTo(String value) {
+            addCriterion("consti_code <>", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeGreaterThan(String value) {
+            addCriterion("consti_code >", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("consti_code >=", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeLessThan(String value) {
+            addCriterion("consti_code <", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeLessThanOrEqualTo(String value) {
+            addCriterion("consti_code <=", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeLike(String value) {
+            addCriterion("consti_code like", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeNotLike(String value) {
+            addCriterion("consti_code not like", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeIn(List<String> values) {
+            addCriterion("consti_code in", values, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeNotIn(List<String> values) {
+            addCriterion("consti_code not in", values, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeBetween(String value1, String value2) {
+            addCriterion("consti_code between", value1, value2, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeNotBetween(String value1, String value2) {
+            addCriterion("consti_code not between", value1, value2, "constiCode");
+            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(String value) {
+            addCriterion("del_flag =", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagNotEqualTo(String value) {
+            addCriterion("del_flag <>", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagGreaterThan(String value) {
+            addCriterion("del_flag >", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagGreaterThanOrEqualTo(String value) {
+            addCriterion("del_flag >=", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagLessThan(String value) {
+            addCriterion("del_flag <", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagLessThanOrEqualTo(String value) {
+            addCriterion("del_flag <=", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagLike(String value) {
+            addCriterion("del_flag like", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagNotLike(String value) {
+            addCriterion("del_flag not like", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagIn(List<String> values) {
+            addCriterion("del_flag in", values, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagNotIn(List<String> values) {
+            addCriterion("del_flag not in", values, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagBetween(String value1, String value2) {
+            addCriterion("del_flag between", value1, value2, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagNotBetween(String value1, String value2) {
+            addCriterion("del_flag not between", value1, value2, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIsNull() {
+            addCriterion("create_by is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIsNotNull() {
+            addCriterion("create_by is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByEqualTo(String value) {
+            addCriterion("create_by =", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotEqualTo(String value) {
+            addCriterion("create_by <>", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByGreaterThan(String value) {
+            addCriterion("create_by >", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByGreaterThanOrEqualTo(String value) {
+            addCriterion("create_by >=", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLessThan(String value) {
+            addCriterion("create_by <", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLessThanOrEqualTo(String value) {
+            addCriterion("create_by <=", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLike(String value) {
+            addCriterion("create_by like", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotLike(String value) {
+            addCriterion("create_by not like", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIn(List<String> values) {
+            addCriterion("create_by in", values, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotIn(List<String> values) {
+            addCriterion("create_by not in", values, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByBetween(String value1, String value2) {
+            addCriterion("create_by between", value1, value2, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotBetween(String value1, String value2) {
+            addCriterion("create_by not between", value1, value2, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIsNull() {
+            addCriterion("update_by is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIsNotNull() {
+            addCriterion("update_by is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByEqualTo(String value) {
+            addCriterion("update_by =", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotEqualTo(String value) {
+            addCriterion("update_by <>", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByGreaterThan(String value) {
+            addCriterion("update_by >", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByGreaterThanOrEqualTo(String value) {
+            addCriterion("update_by >=", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLessThan(String value) {
+            addCriterion("update_by <", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLessThanOrEqualTo(String value) {
+            addCriterion("update_by <=", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLike(String value) {
+            addCriterion("update_by like", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotLike(String value) {
+            addCriterion("update_by not like", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIn(List<String> values) {
+            addCriterion("update_by in", values, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotIn(List<String> values) {
+            addCriterion("update_by not in", values, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByBetween(String value1, String value2) {
+            addCriterion("update_by between", value1, value2, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotBetween(String value1, String value2) {
+            addCriterion("update_by not between", value1, value2, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> 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 static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/TzbsRmsReportResult.java

@@ -0,0 +1,151 @@
+package com.ccsens.system.domain.po;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class TzbsRmsReportResult implements Serializable {
+    private Long resultId;
+
+    private Long reportId;
+
+    private String scaleCode;
+
+    private String constiCode;
+
+    private String constiName;
+
+    private String constiLevel;
+
+    private BigDecimal constiScore;
+
+    private Integer mainFlag;
+
+    private String createBy;
+
+    private Date createTime;
+
+    private String updateBy;
+
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getResultId() {
+        return resultId;
+    }
+
+    public void setResultId(Long resultId) {
+        this.resultId = resultId;
+    }
+
+    public Long getReportId() {
+        return reportId;
+    }
+
+    public void setReportId(Long reportId) {
+        this.reportId = reportId;
+    }
+
+    public String getScaleCode() {
+        return scaleCode;
+    }
+
+    public void setScaleCode(String scaleCode) {
+        this.scaleCode = scaleCode == null ? null : scaleCode.trim();
+    }
+
+    public String getConstiCode() {
+        return constiCode;
+    }
+
+    public void setConstiCode(String constiCode) {
+        this.constiCode = constiCode == null ? null : constiCode.trim();
+    }
+
+    public String getConstiName() {
+        return constiName;
+    }
+
+    public void setConstiName(String constiName) {
+        this.constiName = constiName == null ? null : constiName.trim();
+    }
+
+    public String getConstiLevel() {
+        return constiLevel;
+    }
+
+    public void setConstiLevel(String constiLevel) {
+        this.constiLevel = constiLevel == null ? null : constiLevel.trim();
+    }
+
+    public BigDecimal getConstiScore() {
+        return constiScore;
+    }
+
+    public void setConstiScore(BigDecimal constiScore) {
+        this.constiScore = constiScore;
+    }
+
+    public Integer getMainFlag() {
+        return mainFlag;
+    }
+
+    public void setMainFlag(Integer mainFlag) {
+        this.mainFlag = mainFlag;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy == null ? null : createBy.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy == null ? null : updateBy.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", resultId=").append(resultId);
+        sb.append(", reportId=").append(reportId);
+        sb.append(", scaleCode=").append(scaleCode);
+        sb.append(", constiCode=").append(constiCode);
+        sb.append(", constiName=").append(constiName);
+        sb.append(", constiLevel=").append(constiLevel);
+        sb.append(", constiScore=").append(constiScore);
+        sb.append(", mainFlag=").append(mainFlag);
+        sb.append(", createBy=").append(createBy);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateBy=").append(updateBy);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append("]");
+        return sb.toString();
+    }
+}

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/TzbsRmsReportResultExample.java

@@ -0,0 +1,982 @@
+package com.ccsens.system.domain.po;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class TzbsRmsReportResultExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public TzbsRmsReportResultExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andResultIdIsNull() {
+            addCriterion("result_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultIdIsNotNull() {
+            addCriterion("result_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultIdEqualTo(Long value) {
+            addCriterion("result_id =", value, "resultId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultIdNotEqualTo(Long value) {
+            addCriterion("result_id <>", value, "resultId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultIdGreaterThan(Long value) {
+            addCriterion("result_id >", value, "resultId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("result_id >=", value, "resultId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultIdLessThan(Long value) {
+            addCriterion("result_id <", value, "resultId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultIdLessThanOrEqualTo(Long value) {
+            addCriterion("result_id <=", value, "resultId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultIdIn(List<Long> values) {
+            addCriterion("result_id in", values, "resultId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultIdNotIn(List<Long> values) {
+            addCriterion("result_id not in", values, "resultId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultIdBetween(Long value1, Long value2) {
+            addCriterion("result_id between", value1, value2, "resultId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultIdNotBetween(Long value1, Long value2) {
+            addCriterion("result_id not between", value1, value2, "resultId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdIsNull() {
+            addCriterion("report_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdIsNotNull() {
+            addCriterion("report_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdEqualTo(Long value) {
+            addCriterion("report_id =", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotEqualTo(Long value) {
+            addCriterion("report_id <>", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdGreaterThan(Long value) {
+            addCriterion("report_id >", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("report_id >=", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdLessThan(Long value) {
+            addCriterion("report_id <", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdLessThanOrEqualTo(Long value) {
+            addCriterion("report_id <=", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdIn(List<Long> values) {
+            addCriterion("report_id in", values, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotIn(List<Long> values) {
+            addCriterion("report_id not in", values, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdBetween(Long value1, Long value2) {
+            addCriterion("report_id between", value1, value2, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotBetween(Long value1, Long value2) {
+            addCriterion("report_id not between", value1, value2, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeIsNull() {
+            addCriterion("scale_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeIsNotNull() {
+            addCriterion("scale_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeEqualTo(String value) {
+            addCriterion("scale_code =", value, "scaleCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeNotEqualTo(String value) {
+            addCriterion("scale_code <>", value, "scaleCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeGreaterThan(String value) {
+            addCriterion("scale_code >", value, "scaleCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("scale_code >=", value, "scaleCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeLessThan(String value) {
+            addCriterion("scale_code <", value, "scaleCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeLessThanOrEqualTo(String value) {
+            addCriterion("scale_code <=", value, "scaleCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeLike(String value) {
+            addCriterion("scale_code like", value, "scaleCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeNotLike(String value) {
+            addCriterion("scale_code not like", value, "scaleCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeIn(List<String> values) {
+            addCriterion("scale_code in", values, "scaleCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeNotIn(List<String> values) {
+            addCriterion("scale_code not in", values, "scaleCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeBetween(String value1, String value2) {
+            addCriterion("scale_code between", value1, value2, "scaleCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeNotBetween(String value1, String value2) {
+            addCriterion("scale_code not between", value1, value2, "scaleCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeIsNull() {
+            addCriterion("consti_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeIsNotNull() {
+            addCriterion("consti_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeEqualTo(String value) {
+            addCriterion("consti_code =", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeNotEqualTo(String value) {
+            addCriterion("consti_code <>", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeGreaterThan(String value) {
+            addCriterion("consti_code >", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("consti_code >=", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeLessThan(String value) {
+            addCriterion("consti_code <", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeLessThanOrEqualTo(String value) {
+            addCriterion("consti_code <=", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeLike(String value) {
+            addCriterion("consti_code like", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeNotLike(String value) {
+            addCriterion("consti_code not like", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeIn(List<String> values) {
+            addCriterion("consti_code in", values, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeNotIn(List<String> values) {
+            addCriterion("consti_code not in", values, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeBetween(String value1, String value2) {
+            addCriterion("consti_code between", value1, value2, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeNotBetween(String value1, String value2) {
+            addCriterion("consti_code not between", value1, value2, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameIsNull() {
+            addCriterion("consti_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameIsNotNull() {
+            addCriterion("consti_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameEqualTo(String value) {
+            addCriterion("consti_name =", value, "constiName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameNotEqualTo(String value) {
+            addCriterion("consti_name <>", value, "constiName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameGreaterThan(String value) {
+            addCriterion("consti_name >", value, "constiName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameGreaterThanOrEqualTo(String value) {
+            addCriterion("consti_name >=", value, "constiName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameLessThan(String value) {
+            addCriterion("consti_name <", value, "constiName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameLessThanOrEqualTo(String value) {
+            addCriterion("consti_name <=", value, "constiName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameLike(String value) {
+            addCriterion("consti_name like", value, "constiName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameNotLike(String value) {
+            addCriterion("consti_name not like", value, "constiName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameIn(List<String> values) {
+            addCriterion("consti_name in", values, "constiName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameNotIn(List<String> values) {
+            addCriterion("consti_name not in", values, "constiName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameBetween(String value1, String value2) {
+            addCriterion("consti_name between", value1, value2, "constiName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameNotBetween(String value1, String value2) {
+            addCriterion("consti_name not between", value1, value2, "constiName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiLevelIsNull() {
+            addCriterion("consti_level is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiLevelIsNotNull() {
+            addCriterion("consti_level is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiLevelEqualTo(String value) {
+            addCriterion("consti_level =", value, "constiLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiLevelNotEqualTo(String value) {
+            addCriterion("consti_level <>", value, "constiLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiLevelGreaterThan(String value) {
+            addCriterion("consti_level >", value, "constiLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiLevelGreaterThanOrEqualTo(String value) {
+            addCriterion("consti_level >=", value, "constiLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiLevelLessThan(String value) {
+            addCriterion("consti_level <", value, "constiLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiLevelLessThanOrEqualTo(String value) {
+            addCriterion("consti_level <=", value, "constiLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiLevelLike(String value) {
+            addCriterion("consti_level like", value, "constiLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiLevelNotLike(String value) {
+            addCriterion("consti_level not like", value, "constiLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiLevelIn(List<String> values) {
+            addCriterion("consti_level in", values, "constiLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiLevelNotIn(List<String> values) {
+            addCriterion("consti_level not in", values, "constiLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiLevelBetween(String value1, String value2) {
+            addCriterion("consti_level between", value1, value2, "constiLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiLevelNotBetween(String value1, String value2) {
+            addCriterion("consti_level not between", value1, value2, "constiLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiScoreIsNull() {
+            addCriterion("consti_score is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiScoreIsNotNull() {
+            addCriterion("consti_score is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiScoreEqualTo(BigDecimal value) {
+            addCriterion("consti_score =", value, "constiScore");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiScoreNotEqualTo(BigDecimal value) {
+            addCriterion("consti_score <>", value, "constiScore");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiScoreGreaterThan(BigDecimal value) {
+            addCriterion("consti_score >", value, "constiScore");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiScoreGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("consti_score >=", value, "constiScore");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiScoreLessThan(BigDecimal value) {
+            addCriterion("consti_score <", value, "constiScore");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiScoreLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("consti_score <=", value, "constiScore");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiScoreIn(List<BigDecimal> values) {
+            addCriterion("consti_score in", values, "constiScore");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiScoreNotIn(List<BigDecimal> values) {
+            addCriterion("consti_score not in", values, "constiScore");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiScoreBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("consti_score between", value1, value2, "constiScore");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiScoreNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("consti_score not between", value1, value2, "constiScore");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainFlagIsNull() {
+            addCriterion("main_flag is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainFlagIsNotNull() {
+            addCriterion("main_flag is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainFlagEqualTo(Integer value) {
+            addCriterion("main_flag =", value, "mainFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainFlagNotEqualTo(Integer value) {
+            addCriterion("main_flag <>", value, "mainFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainFlagGreaterThan(Integer value) {
+            addCriterion("main_flag >", value, "mainFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainFlagGreaterThanOrEqualTo(Integer value) {
+            addCriterion("main_flag >=", value, "mainFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainFlagLessThan(Integer value) {
+            addCriterion("main_flag <", value, "mainFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainFlagLessThanOrEqualTo(Integer value) {
+            addCriterion("main_flag <=", value, "mainFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainFlagIn(List<Integer> values) {
+            addCriterion("main_flag in", values, "mainFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainFlagNotIn(List<Integer> values) {
+            addCriterion("main_flag not in", values, "mainFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainFlagBetween(Integer value1, Integer value2) {
+            addCriterion("main_flag between", value1, value2, "mainFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainFlagNotBetween(Integer value1, Integer value2) {
+            addCriterion("main_flag not between", value1, value2, "mainFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIsNull() {
+            addCriterion("create_by is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIsNotNull() {
+            addCriterion("create_by is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByEqualTo(String value) {
+            addCriterion("create_by =", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotEqualTo(String value) {
+            addCriterion("create_by <>", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByGreaterThan(String value) {
+            addCriterion("create_by >", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByGreaterThanOrEqualTo(String value) {
+            addCriterion("create_by >=", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLessThan(String value) {
+            addCriterion("create_by <", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLessThanOrEqualTo(String value) {
+            addCriterion("create_by <=", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLike(String value) {
+            addCriterion("create_by like", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotLike(String value) {
+            addCriterion("create_by not like", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIn(List<String> values) {
+            addCriterion("create_by in", values, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotIn(List<String> values) {
+            addCriterion("create_by not in", values, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByBetween(String value1, String value2) {
+            addCriterion("create_by between", value1, value2, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotBetween(String value1, String value2) {
+            addCriterion("create_by not between", value1, value2, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIsNull() {
+            addCriterion("update_by is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIsNotNull() {
+            addCriterion("update_by is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByEqualTo(String value) {
+            addCriterion("update_by =", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotEqualTo(String value) {
+            addCriterion("update_by <>", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByGreaterThan(String value) {
+            addCriterion("update_by >", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByGreaterThanOrEqualTo(String value) {
+            addCriterion("update_by >=", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLessThan(String value) {
+            addCriterion("update_by <", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLessThanOrEqualTo(String value) {
+            addCriterion("update_by <=", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLike(String value) {
+            addCriterion("update_by like", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotLike(String value) {
+            addCriterion("update_by not like", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIn(List<String> values) {
+            addCriterion("update_by in", values, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotIn(List<String> values) {
+            addCriterion("update_by not in", values, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByBetween(String value1, String value2) {
+            addCriterion("update_by between", value1, value2, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotBetween(String value1, String value2) {
+            addCriterion("update_by not between", value1, value2, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> 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 static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/TzbsRmsReportYsjy.java

@@ -0,0 +1,128 @@
+package com.ccsens.system.domain.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class TzbsRmsReportYsjy implements Serializable {
+    private Long ysjyId;
+
+    private Long reportId;
+
+    private String scaleCode;
+
+    private String constiCode;
+
+    private String constiName;
+
+    private String createBy;
+
+    private Date createTime;
+
+    private String updateBy;
+
+    private Date updateTime;
+
+    private String constiYsjy;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getYsjyId() {
+        return ysjyId;
+    }
+
+    public void setYsjyId(Long ysjyId) {
+        this.ysjyId = ysjyId;
+    }
+
+    public Long getReportId() {
+        return reportId;
+    }
+
+    public void setReportId(Long reportId) {
+        this.reportId = reportId;
+    }
+
+    public String getScaleCode() {
+        return scaleCode;
+    }
+
+    public void setScaleCode(String scaleCode) {
+        this.scaleCode = scaleCode == null ? null : scaleCode.trim();
+    }
+
+    public String getConstiCode() {
+        return constiCode;
+    }
+
+    public void setConstiCode(String constiCode) {
+        this.constiCode = constiCode == null ? null : constiCode.trim();
+    }
+
+    public String getConstiName() {
+        return constiName;
+    }
+
+    public void setConstiName(String constiName) {
+        this.constiName = constiName == null ? null : constiName.trim();
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy == null ? null : createBy.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy == null ? null : updateBy.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getConstiYsjy() {
+        return constiYsjy;
+    }
+
+    public void setConstiYsjy(String constiYsjy) {
+        this.constiYsjy = constiYsjy == null ? null : constiYsjy.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", ysjyId=").append(ysjyId);
+        sb.append(", reportId=").append(reportId);
+        sb.append(", scaleCode=").append(scaleCode);
+        sb.append(", constiCode=").append(constiCode);
+        sb.append(", constiName=").append(constiName);
+        sb.append(", createBy=").append(createBy);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateBy=").append(updateBy);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", constiYsjy=").append(constiYsjy);
+        sb.append("]");
+        return sb.toString();
+    }
+}

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/TzbsRmsReportYsjyExample.java

@@ -0,0 +1,791 @@
+package com.ccsens.system.domain.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class TzbsRmsReportYsjyExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public TzbsRmsReportYsjyExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andYsjyIdIsNull() {
+            addCriterion("ysjy_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYsjyIdIsNotNull() {
+            addCriterion("ysjy_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYsjyIdEqualTo(Long value) {
+            addCriterion("ysjy_id =", value, "ysjyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andYsjyIdNotEqualTo(Long value) {
+            addCriterion("ysjy_id <>", value, "ysjyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andYsjyIdGreaterThan(Long value) {
+            addCriterion("ysjy_id >", value, "ysjyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andYsjyIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("ysjy_id >=", value, "ysjyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andYsjyIdLessThan(Long value) {
+            addCriterion("ysjy_id <", value, "ysjyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andYsjyIdLessThanOrEqualTo(Long value) {
+            addCriterion("ysjy_id <=", value, "ysjyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andYsjyIdIn(List<Long> values) {
+            addCriterion("ysjy_id in", values, "ysjyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andYsjyIdNotIn(List<Long> values) {
+            addCriterion("ysjy_id not in", values, "ysjyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andYsjyIdBetween(Long value1, Long value2) {
+            addCriterion("ysjy_id between", value1, value2, "ysjyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andYsjyIdNotBetween(Long value1, Long value2) {
+            addCriterion("ysjy_id not between", value1, value2, "ysjyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdIsNull() {
+            addCriterion("report_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdIsNotNull() {
+            addCriterion("report_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdEqualTo(Long value) {
+            addCriterion("report_id =", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotEqualTo(Long value) {
+            addCriterion("report_id <>", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdGreaterThan(Long value) {
+            addCriterion("report_id >", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("report_id >=", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdLessThan(Long value) {
+            addCriterion("report_id <", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdLessThanOrEqualTo(Long value) {
+            addCriterion("report_id <=", value, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdIn(List<Long> values) {
+            addCriterion("report_id in", values, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotIn(List<Long> values) {
+            addCriterion("report_id not in", values, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdBetween(Long value1, Long value2) {
+            addCriterion("report_id between", value1, value2, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportIdNotBetween(Long value1, Long value2) {
+            addCriterion("report_id not between", value1, value2, "reportId");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeIsNull() {
+            addCriterion("scale_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeIsNotNull() {
+            addCriterion("scale_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeEqualTo(String value) {
+            addCriterion("scale_code =", value, "scaleCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeNotEqualTo(String value) {
+            addCriterion("scale_code <>", value, "scaleCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeGreaterThan(String value) {
+            addCriterion("scale_code >", value, "scaleCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("scale_code >=", value, "scaleCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeLessThan(String value) {
+            addCriterion("scale_code <", value, "scaleCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeLessThanOrEqualTo(String value) {
+            addCriterion("scale_code <=", value, "scaleCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeLike(String value) {
+            addCriterion("scale_code like", value, "scaleCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeNotLike(String value) {
+            addCriterion("scale_code not like", value, "scaleCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeIn(List<String> values) {
+            addCriterion("scale_code in", values, "scaleCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeNotIn(List<String> values) {
+            addCriterion("scale_code not in", values, "scaleCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeBetween(String value1, String value2) {
+            addCriterion("scale_code between", value1, value2, "scaleCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andScaleCodeNotBetween(String value1, String value2) {
+            addCriterion("scale_code not between", value1, value2, "scaleCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeIsNull() {
+            addCriterion("consti_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeIsNotNull() {
+            addCriterion("consti_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeEqualTo(String value) {
+            addCriterion("consti_code =", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeNotEqualTo(String value) {
+            addCriterion("consti_code <>", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeGreaterThan(String value) {
+            addCriterion("consti_code >", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("consti_code >=", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeLessThan(String value) {
+            addCriterion("consti_code <", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeLessThanOrEqualTo(String value) {
+            addCriterion("consti_code <=", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeLike(String value) {
+            addCriterion("consti_code like", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeNotLike(String value) {
+            addCriterion("consti_code not like", value, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeIn(List<String> values) {
+            addCriterion("consti_code in", values, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeNotIn(List<String> values) {
+            addCriterion("consti_code not in", values, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeBetween(String value1, String value2) {
+            addCriterion("consti_code between", value1, value2, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiCodeNotBetween(String value1, String value2) {
+            addCriterion("consti_code not between", value1, value2, "constiCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameIsNull() {
+            addCriterion("consti_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameIsNotNull() {
+            addCriterion("consti_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameEqualTo(String value) {
+            addCriterion("consti_name =", value, "constiName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameNotEqualTo(String value) {
+            addCriterion("consti_name <>", value, "constiName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameGreaterThan(String value) {
+            addCriterion("consti_name >", value, "constiName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameGreaterThanOrEqualTo(String value) {
+            addCriterion("consti_name >=", value, "constiName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameLessThan(String value) {
+            addCriterion("consti_name <", value, "constiName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameLessThanOrEqualTo(String value) {
+            addCriterion("consti_name <=", value, "constiName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameLike(String value) {
+            addCriterion("consti_name like", value, "constiName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameNotLike(String value) {
+            addCriterion("consti_name not like", value, "constiName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameIn(List<String> values) {
+            addCriterion("consti_name in", values, "constiName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameNotIn(List<String> values) {
+            addCriterion("consti_name not in", values, "constiName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameBetween(String value1, String value2) {
+            addCriterion("consti_name between", value1, value2, "constiName");
+            return (Criteria) this;
+        }
+
+        public Criteria andConstiNameNotBetween(String value1, String value2) {
+            addCriterion("consti_name not between", value1, value2, "constiName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIsNull() {
+            addCriterion("create_by is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIsNotNull() {
+            addCriterion("create_by is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByEqualTo(String value) {
+            addCriterion("create_by =", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotEqualTo(String value) {
+            addCriterion("create_by <>", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByGreaterThan(String value) {
+            addCriterion("create_by >", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByGreaterThanOrEqualTo(String value) {
+            addCriterion("create_by >=", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLessThan(String value) {
+            addCriterion("create_by <", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLessThanOrEqualTo(String value) {
+            addCriterion("create_by <=", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLike(String value) {
+            addCriterion("create_by like", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotLike(String value) {
+            addCriterion("create_by not like", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIn(List<String> values) {
+            addCriterion("create_by in", values, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotIn(List<String> values) {
+            addCriterion("create_by not in", values, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByBetween(String value1, String value2) {
+            addCriterion("create_by between", value1, value2, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotBetween(String value1, String value2) {
+            addCriterion("create_by not between", value1, value2, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIsNull() {
+            addCriterion("update_by is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIsNotNull() {
+            addCriterion("update_by is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByEqualTo(String value) {
+            addCriterion("update_by =", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotEqualTo(String value) {
+            addCriterion("update_by <>", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByGreaterThan(String value) {
+            addCriterion("update_by >", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByGreaterThanOrEqualTo(String value) {
+            addCriterion("update_by >=", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLessThan(String value) {
+            addCriterion("update_by <", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLessThanOrEqualTo(String value) {
+            addCriterion("update_by <=", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLike(String value) {
+            addCriterion("update_by like", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotLike(String value) {
+            addCriterion("update_by not like", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIn(List<String> values) {
+            addCriterion("update_by in", values, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotIn(List<String> values) {
+            addCriterion("update_by not in", values, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByBetween(String value1, String value2) {
+            addCriterion("update_by between", value1, value2, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotBetween(String value1, String value2) {
+            addCriterion("update_by not between", value1, value2, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> 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 static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/ClientEvaVo.java

@@ -0,0 +1,408 @@
+package com.ccsens.system.domain.vo;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdcardUtil;
+import cn.hutool.core.util.StrUtil;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * @author zezha
+ */
+public class ClientEvaVo {
+    @Data
+    public static class PatientQuery {
+        private Long patientId;
+        private String name;
+        private Integer gender;
+        private String birthday;
+        private String idcard;
+        private String phone;
+        private String height;
+        private String weight;
+        private String waistline;
+        private List<String> sickness;
+
+        public Integer getAge() {
+            Integer age = null;
+            try {
+                if (StrUtil.isNotBlank(idcard) && IdcardUtil.isValidCard(idcard)) {
+                    age = IdcardUtil.getAgeByIdCard(idcard);
+                } else if (StrUtil.isNotBlank(birthday)) {
+                    age = DateUtil.ageOfNow(DateUtil.parse(birthday));
+                }
+            } catch (Exception ignored) {
+            }
+            return age;
+        }
+    }
+
+    @Data
+    public static class PatientSaveOrUpdate {
+        private Long patientId;
+        private String name;
+        private Integer gender;
+        private String birthday;
+        private String idcard;
+        private String phone;
+        private String height;
+        private String weight;
+        private String waistline;
+        private List<String> sickness;
+
+        public Integer getAge() {
+            Integer age = null;
+            try {
+                if (StrUtil.isNotBlank(idcard) && IdcardUtil.isValidCard(idcard)) {
+                    age = IdcardUtil.getAgeByIdCard(idcard);
+                } else if (StrUtil.isNotBlank(birthday)) {
+                    age = DateUtil.ageOfNow(DateUtil.parse(birthday));
+                }
+            } catch (Exception ignored) {
+            }
+            return age;
+        }
+    }
+
+    @Data
+    public static class EvaSave {
+        private Long evaId;
+        private Long patientId;
+        private String scaleCode;
+        private String scaleName;
+        private Integer evaStatus;
+    }
+
+    @Data
+    public static class EvaQuestionList {
+        private Long evaId;
+        private Long patientId;
+        private String scaleCode;
+        private String scaleName;
+        private Integer evaStatus;
+        private List<Question> questions;
+
+        @Data
+        public static class Question {
+            private String quesCode;
+            private String quesName;
+            private String quesSort;
+            private List<Option> options;
+
+            @Data
+            public static class Option {
+                private String optionCode;
+                private String optionName;
+                private String optionScore;
+                private String optionSort;
+                private String optionChecked;
+            }
+        }
+    }
+
+    @Data
+    public static class ReportView {
+        //报告单信息
+        private Long reportId;
+
+        //患者信息
+        private Long patientId;
+        private String name;
+        private Integer gender;
+        private String birthday;
+        private String age;
+        private String height;
+        private String weight;
+        private String waistline;
+        private String idcard;
+        private String phone;
+
+        //测评信息
+        private Long evaId;
+        private Date evaTime;
+        private String evaUsername;
+        private String evaNickname;
+        private String evaScaleCode;
+        private String evaScaleName;
+        private String blh;
+
+        //分数明细
+        private List<Score> scores;
+        //养生方案
+        private List<Ysfa> ysfa;
+        //测评结论
+        private String result;
+        //主体质
+        private String result1;
+        //兼夹体质
+        private String result2;
+
+        @Data
+        public static class Score {
+            private String constiCode;
+            private String constiName;
+            private String constiLevel;
+            private String constiScore;
+            private Integer mainFlag;
+            //参考分数（是）
+            private String refScoreYes;
+            //参考分数（倾向是）
+            private String refScoreMaybe;
+            //满分
+            private String fullScore;
+
+            public String getConstiScore() {
+                if (constiScore != null && new BigDecimal(constiScore).compareTo(BigDecimal.ZERO) < 0) {
+                    return "0.00";
+                }
+                return constiScore;
+            }
+        }
+
+        @Data
+        public static class Ysfa {
+            private String constiCode;
+            private String constiName;
+            private String ysjy;
+        }
+
+        public BigDecimal getTotalScore() {
+            if (CollectionUtil.isEmpty(scores)) {
+                return BigDecimal.ZERO;
+            }
+            return scores.stream().map(Score::getConstiScore).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, RoundingMode.HALF_UP);
+        }
+
+        public String getResult() {
+            if (CollectionUtil.isEmpty(scores)) {
+                return "";
+            }
+
+            StringBuilder result = new StringBuilder();
+            String yesStr = "", jbsStr = "", qxsStr = "";
+
+            //拼接三部分字符串（是，基本是，倾向是）
+            for (Score score : scores) {
+                if (score.getConstiLevel().equals("00")) {
+                    yesStr = yesStr + score.getConstiName() + "、";
+                }
+                if (score.getConstiLevel().equals("10")) {
+                    jbsStr = jbsStr + score.getConstiName() + "、";
+                }
+                if (score.getConstiLevel().equals("11")) {
+                    qxsStr = qxsStr + score.getConstiName() + "、";
+                }
+            }
+            //去掉尾部,
+            if (StrUtil.isNotBlank(yesStr)) {
+                yesStr = yesStr.substring(0, yesStr.length() - 1);
+            }
+            if (StrUtil.isNotBlank(jbsStr)) {
+                jbsStr = jbsStr.substring(0, jbsStr.length() - 1);
+            }
+            if (StrUtil.isNotBlank(qxsStr)) {
+                qxsStr = qxsStr.substring(0, qxsStr.length() - 1);
+            }
+
+            //拼接
+            result.append(StrUtil.isNotBlank(yesStr) ? "【" + yesStr + "】 " : "")
+                    .append(StrUtil.isNotBlank(jbsStr) ? "基本是【" + yesStr + "】 " : "")
+                    .append(StrUtil.isNotBlank(qxsStr) ? "有 【" + qxsStr + "】 倾向 " : "");
+
+            return result.toString();
+        }
+
+//        public String getResult() {
+//            if (CollectionUtil.isEmpty(scores)) {
+//                return "";
+//            }
+//
+//            //找到主体质
+//            Score mainSCore = null;
+//            for (Score score : scores) {
+//                if (score.getMainFlag() == 1) {
+//                    mainSCore = score;
+//                }
+//            }
+//            if (mainSCore == null) {
+//                return "";
+//            }
+//            if (Objects.equals(mainSCore.getConstiLevel(), "00")) {
+//                return "【" + mainSCore.getConstiName() + "】";
+//            } else if (Objects.equals(mainSCore.getConstiLevel(), "10")) {
+//                return "基本是【" + mainSCore.getConstiName() + "】";
+//            } else if (Objects.equals(mainSCore.getConstiLevel(), "11")) {
+//                return "倾向是【" + mainSCore.getConstiName() + "】";
+//            } else {
+//                return "";
+//            }
+//        }
+
+        public String getResult1() {
+            if (CollectionUtil.isEmpty(scores)) {
+                return "";
+            }
+            scores = scores.stream().filter(e -> e.getMainFlag() != null).collect(Collectors.toList());
+            //找到主体质
+            Score mainSCore = null;
+            for (Score score : scores) {
+                if (score.getMainFlag() == 1) {
+                    mainSCore = score;
+                }
+            }
+            if (mainSCore == null) {
+                return "";
+            }
+            if (Objects.equals(mainSCore.getConstiLevel(), "00")) {
+                return "【" + mainSCore.getConstiName() + "】";
+            } else if (Objects.equals(mainSCore.getConstiLevel(), "10")) {
+                return "基本是【" + mainSCore.getConstiName() + "】";
+            } else if (Objects.equals(mainSCore.getConstiLevel(), "11")) {
+                return "倾向是【" + mainSCore.getConstiName() + "】";
+            } else {
+                return "";
+            }
+        }
+
+        public String getResult2() {
+            if (CollectionUtil.isEmpty(scores)) {
+                return "";
+            }
+
+            scores = scores.stream().filter(e -> e.getMainFlag() != null).collect(Collectors.toList());
+
+            //找到兼夹体质并按照分数从大到小排序
+            List<Score> jianjiaScores = scores.stream().filter(score -> score.getMainFlag() == 2).sorted(Comparator.comparing(Score::getConstiScore).reversed())
+                    .collect(Collectors.toList());
+            StringBuilder res = new StringBuilder();
+            for (Score score : jianjiaScores) {
+                if (Objects.equals(score.getConstiLevel(), "00")) {
+                    res.append("【" + score.getConstiName() + "】");
+                } else if (Objects.equals(score.getConstiLevel(), "10")) {
+                    res.append("基本是【" + score.getConstiName() + "】");
+                } else if (Objects.equals(score.getConstiLevel(), "11")) {
+                    res.append("倾向是【" + score.getConstiName() + "】");
+                } else {
+                    res.append("");
+                }
+                res.append("、");
+            }
+            //去掉尾部
+            if (StrUtil.isNotBlank(res.toString())) {
+                res = new StringBuilder(res.substring(0, res.length() - 1));
+            }
+            return res.toString();
+        }
+    }
+
+    @Data
+    public static class EvaList {
+        //报告单信息
+        private Long reportId;
+
+        //患者信息
+        private Long patientId;
+        private String name;
+        private Integer gender;
+        private String birthday;
+        private String age;
+        private String height;
+        private String weight;
+        private String waistline;
+        private String idcard;
+        private String phone;
+
+        //测评信息
+        private Long evaId;
+        private Date evaTime;
+        private String evaUsername;
+        private String evaNickname;
+        private String evaScaleCode;
+        private String evaScaleName;
+        private Integer evaStatus;
+        private String blh;
+
+        //分数明细
+        private List<Score> scores;
+        //测评结论
+        private String result;
+
+        @Data
+        public static class Score {
+            private String constiCode;
+            private String constiName;
+            private String constiLevel;
+            private String constiScore;
+            private Integer mainFlag;
+            //参考分数（是）
+            private String refScoreYes;
+            //参考分数（倾向是）
+            private String refScoreMaybe;
+            //满分
+            private String fullScore;
+
+            public String getConstiScore() {
+                if (constiScore != null && new BigDecimal(constiScore).compareTo(BigDecimal.ZERO) < 0) {
+                    return "0.00";
+                }
+                return constiScore;
+            }
+        }
+
+        public String getResult() {
+            if (CollectionUtil.isEmpty(scores)) {
+                return "";
+            }
+
+            StringBuilder result = new StringBuilder();
+            String yesStr = "", jbsStr = "", qxsStr = "";
+
+            //拼接三部分字符串（是，基本是，倾向是）
+            for (Score score : scores) {
+                if (score.getConstiLevel().equals("00")) {
+                    yesStr = yesStr + score.getConstiName() + "、";
+                }
+                if (score.getConstiLevel().equals("10")) {
+                    jbsStr = jbsStr + score.getConstiName() + "、";
+                }
+                if (score.getConstiLevel().equals("11")) {
+                    qxsStr = qxsStr + score.getConstiName() + "、";
+                }
+            }
+            //去掉尾部,
+            if (StrUtil.isNotBlank(yesStr)) {
+                yesStr = yesStr.substring(0, yesStr.length() - 1);
+            }
+            if (StrUtil.isNotBlank(jbsStr)) {
+                jbsStr = jbsStr.substring(0, jbsStr.length() - 1);
+            }
+            if (StrUtil.isNotBlank(qxsStr)) {
+                qxsStr = qxsStr.substring(0, qxsStr.length() - 1);
+            }
+
+            //拼接
+            result.append(StrUtil.isNotBlank(yesStr) ? "【" + yesStr + "】 " : "")
+                    .append(StrUtil.isNotBlank(jbsStr) ? "基本是【" + yesStr + "】 " : "")
+                    .append(StrUtil.isNotBlank(qxsStr) ? "有 【" + qxsStr + "】 倾向 " : "");
+
+            return result.toString();
+        }
+    }
+
+    @Data
+    public static class CongnitiveQuestion{
+        @ApiModelProperty("认知域CODE")
+        private String constiCode;
+        @ApiModelProperty("题目CODE")
+        private List<String> questionList;
+    }
+}

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/ReportVo.java

@@ -0,0 +1,43 @@
+package com.ccsens.system.domain.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author zezha
+ */
+public class ReportVo {
+
+    @Data
+    public static class EvaResult {
+        //测评id
+        private Long evaId;
+        //量表代码
+        private String scaleCode;
+        //量表名称
+        private String scaleName;
+        //体质代码
+        private String constiCode;
+        //体质名称
+        private String constiName;
+        //原始分
+        private BigDecimal score;
+        //转化分
+        private BigDecimal zhScore;
+        //题目数量
+        private Integer quesNum;
+        //体质level
+        private String constiLevel;
+        //是否主体质
+        private Integer mainFlag;
+
+        public BigDecimal getScore() {
+            return score == null ? BigDecimal.ZERO : score.setScale(2, BigDecimal.ROUND_HALF_UP);
+        }
+
+        public BigDecimal getZhScore() {
+            return zhScore == null ? BigDecimal.ZERO : zhScore.setScale(2, BigDecimal.ROUND_HALF_UP);
+        }
+    }
+}

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/RmsVo.java

@@ -8,6 +8,8 @@ import com.ccsens.common.constant.CultureEnum;
 import com.ccsens.common.constant.GenConstants;
 import com.ccsens.common.enums.BaseEnum;
 import com.ccsens.common.utils.PdfUtil;
+import com.ccsens.system.domain.po.TzbsRmsReportResult;
+import com.ccsens.system.domain.po.TzbsRmsReportYsjy;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -424,6 +426,12 @@ public class RmsVo {
         private String needPlan;
 
         private Integer ecrSort;
+
+        @ApiModelProperty("中医体质辨识结论")
+        private List<TzbsRmsReportResult> reportResultList;
+
+        @ApiModelProperty("中医体质辨识养生建议")
+        private List<TzbsRmsReportYsjy> reportYsjyList;
         public void addSub(ReportScore score) {
             this.subReport.add(score);
         }

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/persist/mapper/TzbsQmsScaleCognitiveMapper.java

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

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/persist/mapper/TzbsQmsScaleConstiRefScoreMapper.java

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

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/persist/mapper/TzbsQmsScaleConstiYsfaMapper.java

@@ -0,0 +1,36 @@
+package com.ccsens.system.persist.mapper;
+
+import com.ccsens.system.domain.po.TzbsQmsScaleConstiYsfa;
+import com.ccsens.system.domain.po.TzbsQmsScaleConstiYsfaExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TzbsQmsScaleConstiYsfaMapper {
+    long countByExample(TzbsQmsScaleConstiYsfaExample example);
+
+    int deleteByExample(TzbsQmsScaleConstiYsfaExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(TzbsQmsScaleConstiYsfa record);
+
+    int insertSelective(TzbsQmsScaleConstiYsfa record);
+
+    List<TzbsQmsScaleConstiYsfa> selectByExampleWithBLOBs(TzbsQmsScaleConstiYsfaExample example);
+
+    List<TzbsQmsScaleConstiYsfa> selectByExample(TzbsQmsScaleConstiYsfaExample example);
+
+    TzbsQmsScaleConstiYsfa selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") TzbsQmsScaleConstiYsfa record, @Param("example") TzbsQmsScaleConstiYsfaExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") TzbsQmsScaleConstiYsfa record, @Param("example") TzbsQmsScaleConstiYsfaExample example);
+
+    int updateByExample(@Param("record") TzbsQmsScaleConstiYsfa record, @Param("example") TzbsQmsScaleConstiYsfaExample example);
+
+    int updateByPrimaryKeySelective(TzbsQmsScaleConstiYsfa record);
+
+    int updateByPrimaryKeyWithBLOBs(TzbsQmsScaleConstiYsfa record);
+
+    int updateByPrimaryKey(TzbsQmsScaleConstiYsfa record);
+}

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/persist/mapper/TzbsRmsReportResultMapper.java

@@ -0,0 +1,30 @@
+package com.ccsens.system.persist.mapper;
+
+import com.ccsens.system.domain.po.TzbsRmsReportResult;
+import com.ccsens.system.domain.po.TzbsRmsReportResultExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TzbsRmsReportResultMapper {
+    long countByExample(TzbsRmsReportResultExample example);
+
+    int deleteByExample(TzbsRmsReportResultExample example);
+
+    int deleteByPrimaryKey(Long resultId);
+
+    int insert(TzbsRmsReportResult record);
+
+    int insertSelective(TzbsRmsReportResult record);
+
+    List<TzbsRmsReportResult> selectByExample(TzbsRmsReportResultExample example);
+
+    TzbsRmsReportResult selectByPrimaryKey(Long resultId);
+
+    int updateByExampleSelective(@Param("record") TzbsRmsReportResult record, @Param("example") TzbsRmsReportResultExample example);
+
+    int updateByExample(@Param("record") TzbsRmsReportResult record, @Param("example") TzbsRmsReportResultExample example);
+
+    int updateByPrimaryKeySelective(TzbsRmsReportResult record);
+
+    int updateByPrimaryKey(TzbsRmsReportResult record);
+}

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/persist/mapper/TzbsRmsReportYsjyMapper.java

@@ -0,0 +1,36 @@
+package com.ccsens.system.persist.mapper;
+
+import com.ccsens.system.domain.po.TzbsRmsReportYsjy;
+import com.ccsens.system.domain.po.TzbsRmsReportYsjyExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TzbsRmsReportYsjyMapper {
+    long countByExample(TzbsRmsReportYsjyExample example);
+
+    int deleteByExample(TzbsRmsReportYsjyExample example);
+
+    int deleteByPrimaryKey(Long ysjyId);
+
+    int insert(TzbsRmsReportYsjy record);
+
+    int insertSelective(TzbsRmsReportYsjy record);
+
+    List<TzbsRmsReportYsjy> selectByExampleWithBLOBs(TzbsRmsReportYsjyExample example);
+
+    List<TzbsRmsReportYsjy> selectByExample(TzbsRmsReportYsjyExample example);
+
+    TzbsRmsReportYsjy selectByPrimaryKey(Long ysjyId);
+
+    int updateByExampleSelective(@Param("record") TzbsRmsReportYsjy record, @Param("example") TzbsRmsReportYsjyExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") TzbsRmsReportYsjy record, @Param("example") TzbsRmsReportYsjyExample example);
+
+    int updateByExample(@Param("record") TzbsRmsReportYsjy record, @Param("example") TzbsRmsReportYsjyExample example);
+
+    int updateByPrimaryKeySelective(TzbsRmsReportYsjy record);
+
+    int updateByPrimaryKeyWithBLOBs(TzbsRmsReportYsjy record);
+
+    int updateByPrimaryKey(TzbsRmsReportYsjy record);
+}

ruisi_java/ruisi-system/src/main/resources/mapper/system/TbScaleAssConfMapper.xml

@@ -15,7 +15,7 @@
     <result column="need_plan" jdbcType="VARCHAR" property="needPlan" />
     <result column="plan" jdbcType="VARCHAR" property="plan" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
-    <result column="del_flag" jdbcType="VARCHAR" property="delFlag" />
+    <result column="del_flag" jdbcType="TINYINT" property="delFlag" />
     <result column="create_time" jdbcType="DATE" property="createTime" />
     <result column="create_by" jdbcType="VARCHAR" property="createBy" />
     <result column="update_time" jdbcType="DATE" property="updateTime" />
@@ -127,7 +127,7 @@
       #{endScore,jdbcType=INTEGER}, #{state,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, 
       #{scoreType,jdbcType=CHAR}, #{result,jdbcType=VARCHAR}, #{ogResult,jdbcType=VARCHAR}, 
       #{ruleType,jdbcType=VARCHAR}, #{needPlan,jdbcType=VARCHAR}, #{plan,jdbcType=VARCHAR}, 
-      #{remark,jdbcType=VARCHAR}, #{delFlag,jdbcType=VARCHAR}, #{createTime,jdbcType=DATE}, 
+      #{remark,jdbcType=VARCHAR}, #{delFlag,jdbcType=TINYINT}, #{createTime,jdbcType=DATE}, 
       #{createBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=DATE}, #{updateBy,jdbcType=VARCHAR}, 
       #{sysOrgCode,jdbcType=VARCHAR})
   </insert>
@@ -233,7 +233,7 @@
         #{remark,jdbcType=VARCHAR},
       </if>
       <if test="delFlag != null">
-        #{delFlag,jdbcType=VARCHAR},
+        #{delFlag,jdbcType=TINYINT},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=DATE},
@@ -301,7 +301,7 @@
         remark = #{record.remark,jdbcType=VARCHAR},
       </if>
       <if test="record.delFlag != null">
-        del_flag = #{record.delFlag,jdbcType=VARCHAR},
+        del_flag = #{record.delFlag,jdbcType=TINYINT},
       </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=DATE},
@@ -338,7 +338,7 @@
       need_plan = #{record.needPlan,jdbcType=VARCHAR},
       plan = #{record.plan,jdbcType=VARCHAR},
       remark = #{record.remark,jdbcType=VARCHAR},
-      del_flag = #{record.delFlag,jdbcType=VARCHAR},
+      del_flag = #{record.delFlag,jdbcType=TINYINT},
       create_time = #{record.createTime,jdbcType=DATE},
       create_by = #{record.createBy,jdbcType=VARCHAR},
       update_time = #{record.updateTime,jdbcType=DATE},
@@ -388,7 +388,7 @@
         remark = #{remark,jdbcType=VARCHAR},
       </if>
       <if test="delFlag != null">
-        del_flag = #{delFlag,jdbcType=VARCHAR},
+        del_flag = #{delFlag,jdbcType=TINYINT},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=DATE},
@@ -422,7 +422,7 @@
       need_plan = #{needPlan,jdbcType=VARCHAR},
       plan = #{plan,jdbcType=VARCHAR},
       remark = #{remark,jdbcType=VARCHAR},
-      del_flag = #{delFlag,jdbcType=VARCHAR},
+      del_flag = #{delFlag,jdbcType=TINYINT},
       create_time = #{createTime,jdbcType=DATE},
       create_by = #{createBy,jdbcType=VARCHAR},
       update_time = #{updateTime,jdbcType=DATE},

ruisi_java/ruisi-system/src/main/resources/mapper/system/TzbsQmsScaleCognitiveMapper.xml

@@ -0,0 +1,276 @@
+<?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.system.persist.mapper.TzbsQmsScaleCognitiveMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.system.domain.po.TzbsQmsScaleCognitive">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="consti_code" jdbcType="VARCHAR" property="constiCode" />
+    <result column="ques_code" jdbcType="VARCHAR" property="quesCode" />
+    <result column="reverse" jdbcType="TINYINT" property="reverse" />
+    <result column="del_flag" jdbcType="CHAR" property="delFlag" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </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, consti_code, ques_code, reverse, del_flag, create_by, create_time, update_by, 
+    update_time
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.system.domain.po.TzbsQmsScaleCognitiveExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from tzbs_qms_scale_cognitive
+    <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 tzbs_qms_scale_cognitive
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from tzbs_qms_scale_cognitive
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.system.domain.po.TzbsQmsScaleCognitiveExample">
+    delete from tzbs_qms_scale_cognitive
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.system.domain.po.TzbsQmsScaleCognitive">
+    insert into tzbs_qms_scale_cognitive (id, consti_code, ques_code, 
+      reverse, del_flag, create_by, 
+      create_time, update_by, update_time
+      )
+    values (#{id,jdbcType=BIGINT}, #{constiCode,jdbcType=VARCHAR}, #{quesCode,jdbcType=VARCHAR}, 
+      #{reverse,jdbcType=TINYINT}, #{delFlag,jdbcType=CHAR}, #{createBy,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.system.domain.po.TzbsQmsScaleCognitive">
+    insert into tzbs_qms_scale_cognitive
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="constiCode != null">
+        consti_code,
+      </if>
+      <if test="quesCode != null">
+        ques_code,
+      </if>
+      <if test="reverse != null">
+        reverse,
+      </if>
+      <if test="delFlag != null">
+        del_flag,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateBy != null">
+        update_by,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="constiCode != null">
+        #{constiCode,jdbcType=VARCHAR},
+      </if>
+      <if test="quesCode != null">
+        #{quesCode,jdbcType=VARCHAR},
+      </if>
+      <if test="reverse != null">
+        #{reverse,jdbcType=TINYINT},
+      </if>
+      <if test="delFlag != null">
+        #{delFlag,jdbcType=CHAR},
+      </if>
+      <if test="createBy != null">
+        #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.system.domain.po.TzbsQmsScaleCognitiveExample" resultType="java.lang.Long">
+    select count(*) from tzbs_qms_scale_cognitive
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update tzbs_qms_scale_cognitive
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.constiCode != null">
+        consti_code = #{record.constiCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.quesCode != null">
+        ques_code = #{record.quesCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.reverse != null">
+        reverse = #{record.reverse,jdbcType=TINYINT},
+      </if>
+      <if test="record.delFlag != null">
+        del_flag = #{record.delFlag,jdbcType=CHAR},
+      </if>
+      <if test="record.createBy != null">
+        create_by = #{record.createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateBy != null">
+        update_by = #{record.updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update tzbs_qms_scale_cognitive
+    set id = #{record.id,jdbcType=BIGINT},
+      consti_code = #{record.constiCode,jdbcType=VARCHAR},
+      ques_code = #{record.quesCode,jdbcType=VARCHAR},
+      reverse = #{record.reverse,jdbcType=TINYINT},
+      del_flag = #{record.delFlag,jdbcType=CHAR},
+      create_by = #{record.createBy,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_by = #{record.updateBy,jdbcType=VARCHAR},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.system.domain.po.TzbsQmsScaleCognitive">
+    update tzbs_qms_scale_cognitive
+    <set>
+      <if test="constiCode != null">
+        consti_code = #{constiCode,jdbcType=VARCHAR},
+      </if>
+      <if test="quesCode != null">
+        ques_code = #{quesCode,jdbcType=VARCHAR},
+      </if>
+      <if test="reverse != null">
+        reverse = #{reverse,jdbcType=TINYINT},
+      </if>
+      <if test="delFlag != null">
+        del_flag = #{delFlag,jdbcType=CHAR},
+      </if>
+      <if test="createBy != null">
+        create_by = #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        update_by = #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.system.domain.po.TzbsQmsScaleCognitive">
+    update tzbs_qms_scale_cognitive
+    set consti_code = #{constiCode,jdbcType=VARCHAR},
+      ques_code = #{quesCode,jdbcType=VARCHAR},
+      reverse = #{reverse,jdbcType=TINYINT},
+      del_flag = #{delFlag,jdbcType=CHAR},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_by = #{updateBy,jdbcType=VARCHAR},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

ruisi_java/ruisi-system/src/main/resources/mapper/system/TzbsQmsScaleConstiRefScoreMapper.xml

@@ -0,0 +1,291 @@
+<?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.system.persist.mapper.TzbsQmsScaleConstiRefScoreMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.system.domain.po.TzbsQmsScaleConstiRefScore">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="consti_code" jdbcType="VARCHAR" property="constiCode" />
+    <result column="ref_score_yes" jdbcType="DECIMAL" property="refScoreYes" />
+    <result column="ref_score_Maybe" jdbcType="DECIMAL" property="refScoreMaybe" />
+    <result column="full_score" jdbcType="DECIMAL" property="fullScore" />
+    <result column="del_flag" jdbcType="CHAR" property="delFlag" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </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, consti_code, ref_score_yes, ref_score_Maybe, full_score, del_flag, create_by, 
+    create_time, update_by, update_time
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.system.domain.po.TzbsQmsScaleConstiRefScoreExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from tzbs_qms_scale_consti_ref_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 tzbs_qms_scale_consti_ref_score
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from tzbs_qms_scale_consti_ref_score
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.system.domain.po.TzbsQmsScaleConstiRefScoreExample">
+    delete from tzbs_qms_scale_consti_ref_score
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.system.domain.po.TzbsQmsScaleConstiRefScore">
+    insert into tzbs_qms_scale_consti_ref_score (id, consti_code, ref_score_yes, 
+      ref_score_Maybe, full_score, del_flag, 
+      create_by, create_time, update_by, 
+      update_time)
+    values (#{id,jdbcType=BIGINT}, #{constiCode,jdbcType=VARCHAR}, #{refScoreYes,jdbcType=DECIMAL}, 
+      #{refScoreMaybe,jdbcType=DECIMAL}, #{fullScore,jdbcType=DECIMAL}, #{delFlag,jdbcType=CHAR}, 
+      #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.system.domain.po.TzbsQmsScaleConstiRefScore">
+    insert into tzbs_qms_scale_consti_ref_score
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="constiCode != null">
+        consti_code,
+      </if>
+      <if test="refScoreYes != null">
+        ref_score_yes,
+      </if>
+      <if test="refScoreMaybe != null">
+        ref_score_Maybe,
+      </if>
+      <if test="fullScore != null">
+        full_score,
+      </if>
+      <if test="delFlag != null">
+        del_flag,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateBy != null">
+        update_by,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="constiCode != null">
+        #{constiCode,jdbcType=VARCHAR},
+      </if>
+      <if test="refScoreYes != null">
+        #{refScoreYes,jdbcType=DECIMAL},
+      </if>
+      <if test="refScoreMaybe != null">
+        #{refScoreMaybe,jdbcType=DECIMAL},
+      </if>
+      <if test="fullScore != null">
+        #{fullScore,jdbcType=DECIMAL},
+      </if>
+      <if test="delFlag != null">
+        #{delFlag,jdbcType=CHAR},
+      </if>
+      <if test="createBy != null">
+        #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.system.domain.po.TzbsQmsScaleConstiRefScoreExample" resultType="java.lang.Long">
+    select count(*) from tzbs_qms_scale_consti_ref_score
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update tzbs_qms_scale_consti_ref_score
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.constiCode != null">
+        consti_code = #{record.constiCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.refScoreYes != null">
+        ref_score_yes = #{record.refScoreYes,jdbcType=DECIMAL},
+      </if>
+      <if test="record.refScoreMaybe != null">
+        ref_score_Maybe = #{record.refScoreMaybe,jdbcType=DECIMAL},
+      </if>
+      <if test="record.fullScore != null">
+        full_score = #{record.fullScore,jdbcType=DECIMAL},
+      </if>
+      <if test="record.delFlag != null">
+        del_flag = #{record.delFlag,jdbcType=CHAR},
+      </if>
+      <if test="record.createBy != null">
+        create_by = #{record.createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateBy != null">
+        update_by = #{record.updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update tzbs_qms_scale_consti_ref_score
+    set id = #{record.id,jdbcType=BIGINT},
+      consti_code = #{record.constiCode,jdbcType=VARCHAR},
+      ref_score_yes = #{record.refScoreYes,jdbcType=DECIMAL},
+      ref_score_Maybe = #{record.refScoreMaybe,jdbcType=DECIMAL},
+      full_score = #{record.fullScore,jdbcType=DECIMAL},
+      del_flag = #{record.delFlag,jdbcType=CHAR},
+      create_by = #{record.createBy,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_by = #{record.updateBy,jdbcType=VARCHAR},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.system.domain.po.TzbsQmsScaleConstiRefScore">
+    update tzbs_qms_scale_consti_ref_score
+    <set>
+      <if test="constiCode != null">
+        consti_code = #{constiCode,jdbcType=VARCHAR},
+      </if>
+      <if test="refScoreYes != null">
+        ref_score_yes = #{refScoreYes,jdbcType=DECIMAL},
+      </if>
+      <if test="refScoreMaybe != null">
+        ref_score_Maybe = #{refScoreMaybe,jdbcType=DECIMAL},
+      </if>
+      <if test="fullScore != null">
+        full_score = #{fullScore,jdbcType=DECIMAL},
+      </if>
+      <if test="delFlag != null">
+        del_flag = #{delFlag,jdbcType=CHAR},
+      </if>
+      <if test="createBy != null">
+        create_by = #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        update_by = #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.system.domain.po.TzbsQmsScaleConstiRefScore">
+    update tzbs_qms_scale_consti_ref_score
+    set consti_code = #{constiCode,jdbcType=VARCHAR},
+      ref_score_yes = #{refScoreYes,jdbcType=DECIMAL},
+      ref_score_Maybe = #{refScoreMaybe,jdbcType=DECIMAL},
+      full_score = #{fullScore,jdbcType=DECIMAL},
+      del_flag = #{delFlag,jdbcType=CHAR},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_by = #{updateBy,jdbcType=VARCHAR},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

ruisi_java/ruisi-system/src/main/resources/mapper/system/TzbsQmsScaleConstiYsfaMapper.xml

@@ -0,0 +1,304 @@
+<?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.system.persist.mapper.TzbsQmsScaleConstiYsfaMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.system.domain.po.TzbsQmsScaleConstiYsfa">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="consti_code" jdbcType="VARCHAR" property="constiCode" />
+    <result column="del_flag" jdbcType="CHAR" property="delFlag" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.ccsens.system.domain.po.TzbsQmsScaleConstiYsfa">
+    <result column="consti_ysfa_template" jdbcType="LONGVARCHAR" property="constiYsfaTemplate" />
+  </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, consti_code, del_flag, create_by, create_time, update_by, update_time
+  </sql>
+  <sql id="Blob_Column_List">
+    consti_ysfa_template
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.ccsens.system.domain.po.TzbsQmsScaleConstiYsfaExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from tzbs_qms_scale_consti_ysfa
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="com.ccsens.system.domain.po.TzbsQmsScaleConstiYsfaExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from tzbs_qms_scale_consti_ysfa
+    <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="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from tzbs_qms_scale_consti_ysfa
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from tzbs_qms_scale_consti_ysfa
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.system.domain.po.TzbsQmsScaleConstiYsfaExample">
+    delete from tzbs_qms_scale_consti_ysfa
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.system.domain.po.TzbsQmsScaleConstiYsfa">
+    insert into tzbs_qms_scale_consti_ysfa (id, consti_code, del_flag, 
+      create_by, create_time, update_by, 
+      update_time, consti_ysfa_template)
+    values (#{id,jdbcType=BIGINT}, #{constiCode,jdbcType=VARCHAR}, #{delFlag,jdbcType=CHAR}, 
+      #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{constiYsfaTemplate,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.system.domain.po.TzbsQmsScaleConstiYsfa">
+    insert into tzbs_qms_scale_consti_ysfa
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="constiCode != null">
+        consti_code,
+      </if>
+      <if test="delFlag != null">
+        del_flag,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateBy != null">
+        update_by,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="constiYsfaTemplate != null">
+        consti_ysfa_template,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="constiCode != null">
+        #{constiCode,jdbcType=VARCHAR},
+      </if>
+      <if test="delFlag != null">
+        #{delFlag,jdbcType=CHAR},
+      </if>
+      <if test="createBy != null">
+        #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="constiYsfaTemplate != null">
+        #{constiYsfaTemplate,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.system.domain.po.TzbsQmsScaleConstiYsfaExample" resultType="java.lang.Long">
+    select count(*) from tzbs_qms_scale_consti_ysfa
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update tzbs_qms_scale_consti_ysfa
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.constiCode != null">
+        consti_code = #{record.constiCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.delFlag != null">
+        del_flag = #{record.delFlag,jdbcType=CHAR},
+      </if>
+      <if test="record.createBy != null">
+        create_by = #{record.createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateBy != null">
+        update_by = #{record.updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.constiYsfaTemplate != null">
+        consti_ysfa_template = #{record.constiYsfaTemplate,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update tzbs_qms_scale_consti_ysfa
+    set id = #{record.id,jdbcType=BIGINT},
+      consti_code = #{record.constiCode,jdbcType=VARCHAR},
+      del_flag = #{record.delFlag,jdbcType=CHAR},
+      create_by = #{record.createBy,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_by = #{record.updateBy,jdbcType=VARCHAR},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      consti_ysfa_template = #{record.constiYsfaTemplate,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update tzbs_qms_scale_consti_ysfa
+    set id = #{record.id,jdbcType=BIGINT},
+      consti_code = #{record.constiCode,jdbcType=VARCHAR},
+      del_flag = #{record.delFlag,jdbcType=CHAR},
+      create_by = #{record.createBy,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_by = #{record.updateBy,jdbcType=VARCHAR},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.system.domain.po.TzbsQmsScaleConstiYsfa">
+    update tzbs_qms_scale_consti_ysfa
+    <set>
+      <if test="constiCode != null">
+        consti_code = #{constiCode,jdbcType=VARCHAR},
+      </if>
+      <if test="delFlag != null">
+        del_flag = #{delFlag,jdbcType=CHAR},
+      </if>
+      <if test="createBy != null">
+        create_by = #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        update_by = #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="constiYsfaTemplate != null">
+        consti_ysfa_template = #{constiYsfaTemplate,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.ccsens.system.domain.po.TzbsQmsScaleConstiYsfa">
+    update tzbs_qms_scale_consti_ysfa
+    set consti_code = #{constiCode,jdbcType=VARCHAR},
+      del_flag = #{delFlag,jdbcType=CHAR},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_by = #{updateBy,jdbcType=VARCHAR},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      consti_ysfa_template = #{constiYsfaTemplate,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.system.domain.po.TzbsQmsScaleConstiYsfa">
+    update tzbs_qms_scale_consti_ysfa
+    set consti_code = #{constiCode,jdbcType=VARCHAR},
+      del_flag = #{delFlag,jdbcType=CHAR},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_by = #{updateBy,jdbcType=VARCHAR},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

ruisi_java/ruisi-system/src/main/resources/mapper/system/TzbsRmsReportResultMapper.xml

@@ -0,0 +1,323 @@
+<?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.system.persist.mapper.TzbsRmsReportResultMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.system.domain.po.TzbsRmsReportResult">
+    <id column="result_id" jdbcType="BIGINT" property="resultId" />
+    <result column="report_id" jdbcType="BIGINT" property="reportId" />
+    <result column="scale_code" jdbcType="VARCHAR" property="scaleCode" />
+    <result column="consti_code" jdbcType="VARCHAR" property="constiCode" />
+    <result column="consti_name" jdbcType="VARCHAR" property="constiName" />
+    <result column="consti_level" jdbcType="VARCHAR" property="constiLevel" />
+    <result column="consti_score" jdbcType="DECIMAL" property="constiScore" />
+    <result column="main_flag" jdbcType="INTEGER" property="mainFlag" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </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">
+    result_id, report_id, scale_code, consti_code, consti_name, consti_level, consti_score, 
+    main_flag, create_by, create_time, update_by, update_time
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.system.domain.po.TzbsRmsReportResultExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from tzbs_rms_report_result
+    <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 tzbs_rms_report_result
+    where result_id = #{resultId,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from tzbs_rms_report_result
+    where result_id = #{resultId,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.system.domain.po.TzbsRmsReportResultExample">
+    delete from tzbs_rms_report_result
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.system.domain.po.TzbsRmsReportResult">
+    insert into tzbs_rms_report_result (result_id, report_id, scale_code, 
+      consti_code, consti_name, consti_level, 
+      consti_score, main_flag, create_by, 
+      create_time, update_by, update_time
+      )
+    values (#{resultId,jdbcType=BIGINT}, #{reportId,jdbcType=BIGINT}, #{scaleCode,jdbcType=VARCHAR}, 
+      #{constiCode,jdbcType=VARCHAR}, #{constiName,jdbcType=VARCHAR}, #{constiLevel,jdbcType=VARCHAR}, 
+      #{constiScore,jdbcType=DECIMAL}, #{mainFlag,jdbcType=INTEGER}, #{createBy,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.system.domain.po.TzbsRmsReportResult">
+    insert into tzbs_rms_report_result
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="resultId != null">
+        result_id,
+      </if>
+      <if test="reportId != null">
+        report_id,
+      </if>
+      <if test="scaleCode != null">
+        scale_code,
+      </if>
+      <if test="constiCode != null">
+        consti_code,
+      </if>
+      <if test="constiName != null">
+        consti_name,
+      </if>
+      <if test="constiLevel != null">
+        consti_level,
+      </if>
+      <if test="constiScore != null">
+        consti_score,
+      </if>
+      <if test="mainFlag != null">
+        main_flag,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateBy != null">
+        update_by,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="resultId != null">
+        #{resultId,jdbcType=BIGINT},
+      </if>
+      <if test="reportId != null">
+        #{reportId,jdbcType=BIGINT},
+      </if>
+      <if test="scaleCode != null">
+        #{scaleCode,jdbcType=VARCHAR},
+      </if>
+      <if test="constiCode != null">
+        #{constiCode,jdbcType=VARCHAR},
+      </if>
+      <if test="constiName != null">
+        #{constiName,jdbcType=VARCHAR},
+      </if>
+      <if test="constiLevel != null">
+        #{constiLevel,jdbcType=VARCHAR},
+      </if>
+      <if test="constiScore != null">
+        #{constiScore,jdbcType=DECIMAL},
+      </if>
+      <if test="mainFlag != null">
+        #{mainFlag,jdbcType=INTEGER},
+      </if>
+      <if test="createBy != null">
+        #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.system.domain.po.TzbsRmsReportResultExample" resultType="java.lang.Long">
+    select count(*) from tzbs_rms_report_result
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update tzbs_rms_report_result
+    <set>
+      <if test="record.resultId != null">
+        result_id = #{record.resultId,jdbcType=BIGINT},
+      </if>
+      <if test="record.reportId != null">
+        report_id = #{record.reportId,jdbcType=BIGINT},
+      </if>
+      <if test="record.scaleCode != null">
+        scale_code = #{record.scaleCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.constiCode != null">
+        consti_code = #{record.constiCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.constiName != null">
+        consti_name = #{record.constiName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.constiLevel != null">
+        consti_level = #{record.constiLevel,jdbcType=VARCHAR},
+      </if>
+      <if test="record.constiScore != null">
+        consti_score = #{record.constiScore,jdbcType=DECIMAL},
+      </if>
+      <if test="record.mainFlag != null">
+        main_flag = #{record.mainFlag,jdbcType=INTEGER},
+      </if>
+      <if test="record.createBy != null">
+        create_by = #{record.createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateBy != null">
+        update_by = #{record.updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update tzbs_rms_report_result
+    set result_id = #{record.resultId,jdbcType=BIGINT},
+      report_id = #{record.reportId,jdbcType=BIGINT},
+      scale_code = #{record.scaleCode,jdbcType=VARCHAR},
+      consti_code = #{record.constiCode,jdbcType=VARCHAR},
+      consti_name = #{record.constiName,jdbcType=VARCHAR},
+      consti_level = #{record.constiLevel,jdbcType=VARCHAR},
+      consti_score = #{record.constiScore,jdbcType=DECIMAL},
+      main_flag = #{record.mainFlag,jdbcType=INTEGER},
+      create_by = #{record.createBy,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_by = #{record.updateBy,jdbcType=VARCHAR},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.system.domain.po.TzbsRmsReportResult">
+    update tzbs_rms_report_result
+    <set>
+      <if test="reportId != null">
+        report_id = #{reportId,jdbcType=BIGINT},
+      </if>
+      <if test="scaleCode != null">
+        scale_code = #{scaleCode,jdbcType=VARCHAR},
+      </if>
+      <if test="constiCode != null">
+        consti_code = #{constiCode,jdbcType=VARCHAR},
+      </if>
+      <if test="constiName != null">
+        consti_name = #{constiName,jdbcType=VARCHAR},
+      </if>
+      <if test="constiLevel != null">
+        consti_level = #{constiLevel,jdbcType=VARCHAR},
+      </if>
+      <if test="constiScore != null">
+        consti_score = #{constiScore,jdbcType=DECIMAL},
+      </if>
+      <if test="mainFlag != null">
+        main_flag = #{mainFlag,jdbcType=INTEGER},
+      </if>
+      <if test="createBy != null">
+        create_by = #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        update_by = #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where result_id = #{resultId,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.system.domain.po.TzbsRmsReportResult">
+    update tzbs_rms_report_result
+    set report_id = #{reportId,jdbcType=BIGINT},
+      scale_code = #{scaleCode,jdbcType=VARCHAR},
+      consti_code = #{constiCode,jdbcType=VARCHAR},
+      consti_name = #{constiName,jdbcType=VARCHAR},
+      consti_level = #{constiLevel,jdbcType=VARCHAR},
+      consti_score = #{constiScore,jdbcType=DECIMAL},
+      main_flag = #{mainFlag,jdbcType=INTEGER},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_by = #{updateBy,jdbcType=VARCHAR},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where result_id = #{resultId,jdbcType=BIGINT}
+  </update>
+</mapper>

ruisi_java/ruisi-system/src/main/resources/mapper/system/TzbsRmsReportYsjyMapper.xml

@@ -0,0 +1,341 @@
+<?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.system.persist.mapper.TzbsRmsReportYsjyMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.system.domain.po.TzbsRmsReportYsjy">
+    <id column="ysjy_id" jdbcType="BIGINT" property="ysjyId" />
+    <result column="report_id" jdbcType="BIGINT" property="reportId" />
+    <result column="scale_code" jdbcType="VARCHAR" property="scaleCode" />
+    <result column="consti_code" jdbcType="VARCHAR" property="constiCode" />
+    <result column="consti_name" jdbcType="VARCHAR" property="constiName" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.ccsens.system.domain.po.TzbsRmsReportYsjy">
+    <result column="consti_ysjy" jdbcType="LONGVARCHAR" property="constiYsjy" />
+  </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">
+    ysjy_id, report_id, scale_code, consti_code, consti_name, create_by, create_time, 
+    update_by, update_time
+  </sql>
+  <sql id="Blob_Column_List">
+    consti_ysjy
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.ccsens.system.domain.po.TzbsRmsReportYsjyExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from tzbs_rms_report_ysjy
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="com.ccsens.system.domain.po.TzbsRmsReportYsjyExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from tzbs_rms_report_ysjy
+    <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="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from tzbs_rms_report_ysjy
+    where ysjy_id = #{ysjyId,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from tzbs_rms_report_ysjy
+    where ysjy_id = #{ysjyId,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.system.domain.po.TzbsRmsReportYsjyExample">
+    delete from tzbs_rms_report_ysjy
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.system.domain.po.TzbsRmsReportYsjy">
+    insert into tzbs_rms_report_ysjy (ysjy_id, report_id, scale_code, 
+      consti_code, consti_name, create_by, 
+      create_time, update_by, update_time, 
+      consti_ysjy)
+    values (#{ysjyId,jdbcType=BIGINT}, #{reportId,jdbcType=BIGINT}, #{scaleCode,jdbcType=VARCHAR}, 
+      #{constiCode,jdbcType=VARCHAR}, #{constiName,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{constiYsjy,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.system.domain.po.TzbsRmsReportYsjy">
+    insert into tzbs_rms_report_ysjy
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="ysjyId != null">
+        ysjy_id,
+      </if>
+      <if test="reportId != null">
+        report_id,
+      </if>
+      <if test="scaleCode != null">
+        scale_code,
+      </if>
+      <if test="constiCode != null">
+        consti_code,
+      </if>
+      <if test="constiName != null">
+        consti_name,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateBy != null">
+        update_by,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="constiYsjy != null">
+        consti_ysjy,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="ysjyId != null">
+        #{ysjyId,jdbcType=BIGINT},
+      </if>
+      <if test="reportId != null">
+        #{reportId,jdbcType=BIGINT},
+      </if>
+      <if test="scaleCode != null">
+        #{scaleCode,jdbcType=VARCHAR},
+      </if>
+      <if test="constiCode != null">
+        #{constiCode,jdbcType=VARCHAR},
+      </if>
+      <if test="constiName != null">
+        #{constiName,jdbcType=VARCHAR},
+      </if>
+      <if test="createBy != null">
+        #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="constiYsjy != null">
+        #{constiYsjy,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.system.domain.po.TzbsRmsReportYsjyExample" resultType="java.lang.Long">
+    select count(*) from tzbs_rms_report_ysjy
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update tzbs_rms_report_ysjy
+    <set>
+      <if test="record.ysjyId != null">
+        ysjy_id = #{record.ysjyId,jdbcType=BIGINT},
+      </if>
+      <if test="record.reportId != null">
+        report_id = #{record.reportId,jdbcType=BIGINT},
+      </if>
+      <if test="record.scaleCode != null">
+        scale_code = #{record.scaleCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.constiCode != null">
+        consti_code = #{record.constiCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.constiName != null">
+        consti_name = #{record.constiName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createBy != null">
+        create_by = #{record.createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateBy != null">
+        update_by = #{record.updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.constiYsjy != null">
+        consti_ysjy = #{record.constiYsjy,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update tzbs_rms_report_ysjy
+    set ysjy_id = #{record.ysjyId,jdbcType=BIGINT},
+      report_id = #{record.reportId,jdbcType=BIGINT},
+      scale_code = #{record.scaleCode,jdbcType=VARCHAR},
+      consti_code = #{record.constiCode,jdbcType=VARCHAR},
+      consti_name = #{record.constiName,jdbcType=VARCHAR},
+      create_by = #{record.createBy,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_by = #{record.updateBy,jdbcType=VARCHAR},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      consti_ysjy = #{record.constiYsjy,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update tzbs_rms_report_ysjy
+    set ysjy_id = #{record.ysjyId,jdbcType=BIGINT},
+      report_id = #{record.reportId,jdbcType=BIGINT},
+      scale_code = #{record.scaleCode,jdbcType=VARCHAR},
+      consti_code = #{record.constiCode,jdbcType=VARCHAR},
+      consti_name = #{record.constiName,jdbcType=VARCHAR},
+      create_by = #{record.createBy,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_by = #{record.updateBy,jdbcType=VARCHAR},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.system.domain.po.TzbsRmsReportYsjy">
+    update tzbs_rms_report_ysjy
+    <set>
+      <if test="reportId != null">
+        report_id = #{reportId,jdbcType=BIGINT},
+      </if>
+      <if test="scaleCode != null">
+        scale_code = #{scaleCode,jdbcType=VARCHAR},
+      </if>
+      <if test="constiCode != null">
+        consti_code = #{constiCode,jdbcType=VARCHAR},
+      </if>
+      <if test="constiName != null">
+        consti_name = #{constiName,jdbcType=VARCHAR},
+      </if>
+      <if test="createBy != null">
+        create_by = #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        update_by = #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="constiYsjy != null">
+        consti_ysjy = #{constiYsjy,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where ysjy_id = #{ysjyId,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.ccsens.system.domain.po.TzbsRmsReportYsjy">
+    update tzbs_rms_report_ysjy
+    set report_id = #{reportId,jdbcType=BIGINT},
+      scale_code = #{scaleCode,jdbcType=VARCHAR},
+      consti_code = #{constiCode,jdbcType=VARCHAR},
+      consti_name = #{constiName,jdbcType=VARCHAR},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_by = #{updateBy,jdbcType=VARCHAR},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      consti_ysjy = #{constiYsjy,jdbcType=LONGVARCHAR}
+    where ysjy_id = #{ysjyId,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.system.domain.po.TzbsRmsReportYsjy">
+    update tzbs_rms_report_ysjy
+    set report_id = #{reportId,jdbcType=BIGINT},
+      scale_code = #{scaleCode,jdbcType=VARCHAR},
+      consti_code = #{constiCode,jdbcType=VARCHAR},
+      consti_name = #{constiName,jdbcType=VARCHAR},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_by = #{updateBy,jdbcType=VARCHAR},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where ysjy_id = #{ysjyId,jdbcType=BIGINT}
+  </update>
+</mapper>

ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/persist/dao/ClientEvaDao.java

@@ -0,0 +1,50 @@
+package com.ccsens.client.persist.dao;
+
+import com.ccsens.system.domain.po.TzbsRmsReportResult;
+import com.ccsens.system.domain.po.TzbsRmsReportYsjy;
+import com.ccsens.system.domain.vo.ClientEvaVo;
+import com.ccsens.system.domain.vo.ReportVo;
+import com.ccsens.system.domain.vo.RmsVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+public interface ClientEvaDao {
+
+    /**
+     * 批量插入reportResult
+     *
+     * @param reportResultList
+     */
+    void batchInsertReportResult(@Param("list") List<TzbsRmsReportResult> reportResultList);
+
+    /**
+     * 查询测评分数
+     *
+     * @param evaId
+     * @return
+     */
+    List<ReportVo.EvaResult> countReportResult(@Param("evaId") Long evaId,
+                                               @Param("code") String scaleCode);
+
+    /**
+     * 查询养生建议
+     *
+     * @param constiCode
+     * @param deptId
+     * @return
+     */
+    String queryYsjy(@Param("constiCode") String constiCode);
+
+    /**
+     * 查询报告单
+     *
+     * @param evaId
+     * @return
+     */
+    ClientEvaVo.ReportView getTzbsResult(@Param("evaId") Long evaId,
+                                         @Param("code") String code);
+
+    List<String> queryYsfaList(@Param("scaleCode") String scaleCode);
+}

ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/persist/dao/RmsDao.java

@@ -51,6 +51,14 @@ public interface RmsDao {
                                                      @Param("evaluationCode") String evaluationCode,
                                                      @Param("sex") Byte sex);
 
+    /**
+     * 查询中医体质辨识量表详情
+     * @param scaleCode
+     * @return
+     */
+    List<RmsVo.ReportDetailAnswer> queryZytzbsScaleAnswer(@Param("evaluationId") Long evaluationId,
+                                                          @Param("scaleCode") String scaleCode,
+                                                          @Param("sex") Byte sex);
 
 
     List<RmsVo.QuestionAndAnswer> queryQuestionAndScore(@Param("evaluationId") Long evaluationId, @Param("scaleCode") String scaleCode);
@@ -100,6 +108,10 @@ public interface RmsDao {
     List<ReportDetailVo.QuestionInfo> queryReportQuestionAndAnswer(@Param("evaluationId") Long evaluationId,
                                                                    @Param("scaleCode") String scaleCode);
 
+    List<ReportDetailVo.QuestionInfo> queryReportQuestionAndAnswer1(@Param("evaluationId") Long evaluationId,
+                                                                   @Param("questionCodeList") List<String> questionCodeList,
+                                                                    @Param("sex") Byte sex);
+
     List<ReportDetailVo.GroupCognitive> queryReportGroupCognitiveAndAnswer(@Param("evaluationId") Long evaluationId,
                                                                            @Param("scaleCode") String scaleCode);
 

ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/IRmsService.java

@@ -2,6 +2,7 @@ package com.ccsens.client.service;
 
 import com.ccsens.common.core.domain.model.LoginUser;
 import com.ccsens.system.domain.dto.RmsDto;
+import com.ccsens.system.domain.vo.ClientEvaVo;
 import com.ccsens.system.domain.vo.RmsVo;
 import org.apache.poi.ss.usermodel.Workbook;
 
@@ -14,6 +15,13 @@ import java.util.List;
 public interface IRmsService {
     RmsVo.ReportDetail queryReportDetail(RmsDto.QueryDetail dto);
 
+    /**
+     * 查看报告单
+     * @param param
+     * @return
+     */
+    ClientEvaVo.ReportView reportView(Long evaluationId, String code);
+
     List<RmsVo.ReportScore> getReportScores(List<RmsVo.ReportScore> reportScores, long reportId);
 
     List<RmsVo.QueryReportHistory> queryReportListByTime(RmsDto.QueryReportHistory dto, Long userId, String dataScope);

ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/AmsReportServiceImpl.java

@@ -6,7 +6,9 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HtmlUtil;
 import com.ccsens.client.persist.dao.AmsDao;
+import com.ccsens.client.persist.dao.ClientEvaDao;
 import com.ccsens.client.service.AmsReportService;
 import com.ccsens.client.service.IReportInfoService;
 import com.ccsens.client.service.IRmsService;
@@ -72,6 +74,8 @@ public class AmsReportServiceImpl implements AmsReportService {
     private HmsDoctorSignMapper hmsDoctorSignMapper;
     @Resource
     private HmsVersionMapper hmsVersionMapper;
+    @Resource
+    private ClientEvaDao clientEvaDao;
     @Value("${file.grPath}")
     private String grPath;
     @Value("${file.ysPath}")
@@ -87,7 +91,7 @@ public class AmsReportServiceImpl implements AmsReportService {
         String url = amsDao.queryTemplate(dto.getScaleCode());
         if (StrUtil.isEmpty(url)) {
             //使用通用模版
-            url = "D:/Projects/ruisi_cga/server/profile/gg_template.docx";
+            url = "/data/cgav2/server/profile/gg_template.docx";
         }
         HashMap<String, Object> params = new HashMap<>();
 
@@ -723,7 +727,7 @@ public class AmsReportServiceImpl implements AmsReportService {
                 row1 = Rows.of(
                         scores.get(i).getName(),
                         scores.get(i).getScore() == null ? "" : scores.get(i).getScore() + "",
-                        StrUtil.isEmpty(impression) ? qmsScaleAssConf == null ? null : qmsScaleAssConf.getResult() : impression
+                        StrUtil.isEmpty(impression) ? qmsScaleAssConf == null ? StrUtil.isEmpty(scores.get(i).getImpression()) ? null : scores.get(i).getImpression() : qmsScaleAssConf.getResult() : impression
                 ).create();
             }
             //查询类型
@@ -823,6 +827,22 @@ public class AmsReportServiceImpl implements AmsReportService {
                         params.put("fzjyFlag" + i, true);
                     }
                 }
+
+                //添加中医体质辨识防治建议
+                if ("TZBS_BZ".equals(scores.get(i).getCode()) || "TZBS_LN".equals(scores.get(i).getCode())) {
+                    //查询防治建议
+                    List<String> list1 = clientEvaDao.queryYsfaList(scores.get(i).getCode());
+                    if (CollUtil.isNotEmpty(list1)) {
+                        String ysfas = list1.get(0);
+                        for (String ysfa : list1) {
+                            ysfas += HtmlUtil.unescape(ysfa);
+                        }
+                        params.put("fzjy_" + i, ysfas);
+                        params.put("fzjyFlag" + i, true);
+                    }
+
+                }
+
                 params.put("table_" + i, tableData);
                 params.put("flag" + i, true);
             }
@@ -1069,8 +1089,8 @@ public class AmsReportServiceImpl implements AmsReportService {
                 TextRenderData textStr = Texts.of(str).bold().create();
                 TextRenderData textName = Texts.of(scores.get(i).getName()).bold().create();
                 TextRenderData textScore = Texts.of(scores.get(i).getScore() == null ? "" : scores.get(i).getScore() + "").bold().create();
-                TextRenderData textImpression = Texts.of(qmsScaleAssConf == null ? null : qmsScaleAssConf.getResult()).bold().create();
+                //中医体质辨识添加结论  结论为初步印象
-
+                TextRenderData textImpression = Texts.of(qmsScaleAssConf == null ? "TZBS_LN".equals(scores.get(i).getCode()) || "TZBS_BZ".equals(scores.get(i).getCode()) ? scores.get(i).getImpression() : null : qmsScaleAssConf.getResult()).bold().create();
                 //查询一二级套餐
                 RowRenderData row1 = Rows.of(
                         textStr,

ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/RmsServiceImpl.java

@@ -4,9 +4,13 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HtmlUtil;
 import com.ccsens.client.persist.dao.AmsDao;
+import com.ccsens.client.persist.dao.ClientEvaDao;
 import com.ccsens.client.persist.dao.RmsDao;
 import com.ccsens.client.service.IAmsCanvasService;
 import com.ccsens.client.service.IRmsService;
@@ -23,11 +27,14 @@ import com.ccsens.system.domain.dto.RmsDto;
 import com.ccsens.system.domain.dto.message.MessageDto;
 import com.ccsens.system.domain.po.*;
 import com.ccsens.system.domain.vo.AmsVo;
+import com.ccsens.system.domain.vo.ClientEvaVo;
+import com.ccsens.system.domain.vo.ReportVo;
 import com.ccsens.system.domain.vo.RmsVo;
 import com.ccsens.system.persist.mapper.*;
 import com.github.pagehelper.util.StringUtil;
 import com.itextpdf.text.BadElementException;
 import com.itextpdf.text.Image;
+import com.mysql.cj.xdevapi.Client;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -40,6 +47,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -92,6 +100,10 @@ public class RmsServiceImpl implements IRmsService {
     private EmsEvaluationQuestionDurationMapper emsEvaluationQuestionDurationMapper;
     @Value("${informed.prefixWord}")
     private String prefixWord;
+    @Resource
+    private ClientEvaDao clientEvaDao;
+    @Resource
+    private TzbsRmsReportYsjyMapper rmsReportYsjyMapper;
 
 
     public int getAge(PmsPatient pmsPatient) {
@@ -142,16 +154,38 @@ public class RmsServiceImpl implements IRmsService {
 
             if (CollUtil.isNotEmpty(scores)) {
                 scores.forEach(score -> {
+                    //添加体质辨识结论
+                    List<TzbsRmsReportResult> reportResultList = score.getReportResultList();
+                    if (CollUtil.isNotEmpty(reportResultList)) {
+                        reportResultList.forEach(reportResult -> {
+                            reportResult.setReportId(report.getId());
+                        });
+                        clientEvaDao.batchInsertReportResult(reportResultList);
+                    }
+
+                    //添加体质辨识养生建议
+                    List<TzbsRmsReportYsjy> reportYsjyList = score.getReportYsjyList();
+                    if (CollUtil.isNotEmpty(reportYsjyList)) {
+                        reportYsjyList.forEach(reportResult -> {
+                            reportResult.setReportId(report.getId());
+                            rmsReportYsjyMapper.insertSelective(reportResult);
+                        });
+                    }
+                    //获取初步印象
+                    ClientEvaVo.ReportView reportView = reportView(dto.getEvaluationId(), score.getCode());
+                    if (reportView != null) {
+                        score.setImpression(reportView.getResult());
+                        score.setScore(reportView.getTotalScore());
+                    }
                     //添加量表分数统计
                     RmsReportScaleScore reportScaleScore = new RmsReportScaleScore();
                     reportScaleScore.setId(IDGenerator.nextSnowflakeId());
                     reportScaleScore.setReportId(report.getId());
                     reportScaleScore.setScaleCode(score.getCode());
+                    reportScaleScore.setImpression(score.getImpression());
                     reportScaleScore.setScore(score.getScore());
                     rmsReportScaleScoreMapper.insertSelective(reportScaleScore);
-
                     reportScaleScoreMap.put(score.getCode(), reportScaleScore);
-
                 });
             }
         } else {
@@ -181,6 +215,7 @@ public class RmsServiceImpl implements IRmsService {
                 List<RmsReportScaleScore> rmsReportScaleScores = rmsReportScaleScoreMapper.selectByExample(scoreExample);
                 if (CollUtil.isNotEmpty(rmsReportScaleScores)) {
                     score.setImpression(rmsReportScaleScores.get(0).getImpression());
+                    score.setScore(rmsReportScaleScores.get(0).getScore());
                     reportScaleScoreMap.put(score.getCode(), rmsReportScaleScores.get(0));
                 }
 
@@ -198,7 +233,6 @@ public class RmsServiceImpl implements IRmsService {
                         score.setQuestionDuration(emsEvaluationQuestionDurations.stream().mapToLong(EmsEvaluationQuestionDuration::getDuration).sum());
                     }
                 }
-
             });
         }
 
@@ -308,6 +342,287 @@ public class RmsServiceImpl implements IRmsService {
         return detail;
     }
 
+    @Override
+    public ClientEvaVo.ReportView reportView(Long evaluationId, String code) {
+        ClientEvaVo.ReportView vo = clientEvaDao.getTzbsResult(evaluationId, code);
+        if (vo != null && CollectionUtil.isNotEmpty(vo.getYsfa())) {
+            for (ClientEvaVo.ReportView.Ysfa ysfa : vo.getYsfa()) {
+                //html转义
+                ysfa.setYsjy(HtmlUtil.unescape(ysfa.getYsjy()));
+            }
+        }
+        return vo;
+    }
+
+    private void zytzbs(Long evaluationId, RmsVo.ReportScore score) {
+        //3.2 生成报告单辨识结果
+        List<ReportVo.EvaResult> resultList = countReportResult(evaluationId, score.getCode());
+        List<TzbsRmsReportResult> reportResultList = CollectionUtil.newArrayList();
+        for (ReportVo.EvaResult resultVo : resultList) {
+            //转换为RmsReportResult对象
+            TzbsRmsReportResult reportResult = new TzbsRmsReportResult();
+            reportResult.setResultId(IDGenerator.nextSnowflakeId());
+            reportResult.setScaleCode(score.getCode());
+            reportResult.setConstiCode(resultVo.getConstiCode());
+            reportResult.setConstiName(resultVo.getConstiName());
+            reportResult.setConstiLevel(resultVo.getConstiLevel());
+            reportResult.setConstiScore(resultVo.getZhScore());
+            reportResult.setMainFlag(resultVo.getMainFlag());
+            reportResult.setCreateBy(SecurityUtils.getUsername());
+            reportResultList.add(reportResult);
+
+            RmsVo.ReportScore reportScore = new RmsVo.ReportScore();
+            reportScore.setCode(resultVo.getConstiCode());
+            reportScore.setName(resultVo.getConstiName());
+            reportScore.setScore(reportResult.getConstiScore());
+            score.addSub(reportScore);
+        }
+        score.setReportResultList(reportResultList);
+
+        //3.3 生成养生建议
+        List<TzbsRmsReportYsjy> reportYsjyList = CollectionUtil.newArrayList();
+        for (TzbsRmsReportResult result : reportResultList) {
+            if (StrUtil.isEmpty(result.getConstiLevel()) || result.getConstiLevel().equals("20")) {
+                continue;
+            }
+            TzbsRmsReportYsjy rmsReportYsjy = new TzbsRmsReportYsjy();
+            rmsReportYsjy.setYsjyId(IDGenerator.nextSnowflakeId());
+            rmsReportYsjy.setReportId(result.getReportId());
+            rmsReportYsjy.setConstiCode(result.getConstiCode());
+            rmsReportYsjy.setConstiName(result.getConstiName());
+            rmsReportYsjy.setScaleCode(score.getCode());
+            rmsReportYsjy.setConstiYsjy(
+                    clientEvaDao.queryYsjy(result.getConstiCode())
+            );
+            reportYsjyList.add(rmsReportYsjy);
+        }
+        score.setReportYsjyList(reportYsjyList);
+    }
+
+    private List<ReportVo.EvaResult> countReportResult(@NotNull Long evaId, String scaleCode) {
+        //1.查询体质分数（原始分）
+        List<ReportVo.EvaResult> resultList = clientEvaDao.countReportResult(evaId, scaleCode);
+        if (CollectionUtil.isEmpty(resultList)) {
+            throw new BaseException("未找到体质信息");
+        }
+
+        //2.计算level和mainflag
+        if ("TZBS_BZ".equals(resultList.get(0).getScaleCode())) {
+            //标准版体质辨识
+            countReportResult_TZBS_BZ(resultList);
+        } else if ("TZBS_LN".equals(resultList.get(0).getScaleCode())) {
+            //老年版体质辨识
+            countReportResult_TZBS_LN(resultList);
+        }
+
+        return resultList;
+    }
+
+    private void countReportResult_TZBS_BZ(List<ReportVo.EvaResult> resultList) {
+        //1.根据原始分、题目数量计算转化分
+        for (ReportVo.EvaResult evaResult : resultList) {
+            //转化分 = [(原始分 - 条目数) / (条目数 x 4)] x 100
+            evaResult.setZhScore(
+                    NumberUtil.mul(
+                            NumberUtil.div(
+                                    NumberUtil.sub(evaResult.getScore(), evaResult.getQuesNum()),
+                                    evaResult.getQuesNum() * 4
+                            ), 100
+                    )
+            );
+        }
+
+        //2.计算平和质level
+        boolean other8LessThan30Flag = true, other8LessThan40Flag = true;
+        ReportVo.EvaResult constiAResult = null;
+        for (ReportVo.EvaResult r : resultList) {
+            if ("TZBS_BZ_A".equals(r.getConstiCode())) {
+                constiAResult = r;
+            } else {
+                if (r.getZhScore().compareTo(BigDecimal.valueOf(30)) >= 0) {
+                    other8LessThan30Flag = false;
+                }
+                if (r.getZhScore().compareTo(BigDecimal.valueOf(40)) >= 0) {
+                    other8LessThan40Flag = false;
+                }
+            }
+        }
+        if (constiAResult == null) {
+            throw new BaseException("系统错误，未找到平和体质");
+        }
+
+        //转化分>=60分，其他体质均<30分，是平和质
+        //转化分>=60分，其他体质均<40分，基本是平和质
+        //其他情况，不是平和质
+        //默认为否 00是，10基本是[平和]，11倾向是[偏颇]，20否
+        constiAResult.setConstiLevel("20");
+        if (constiAResult.getZhScore().compareTo(new BigDecimal(60)) >= 0) {
+            if (other8LessThan30Flag) {
+                //是
+                constiAResult.setConstiLevel("00");
+            } else if (other8LessThan40Flag) {
+                //基本是
+                constiAResult.setConstiLevel("10");
+            } else {
+                //否
+                constiAResult.setConstiLevel("20");
+            }
+        }
+
+        //3.计算其他体质level
+        for (ReportVo.EvaResult r : resultList) {
+            if ("TZBS_BZ_A".equals(r.getConstiCode())) {
+                continue;
+            }
+            if (r.getZhScore().compareTo(new BigDecimal(40)) >= 0) {
+                //是
+                r.setConstiLevel("00");
+            } else if (r.getZhScore().compareTo(new BigDecimal(30)) >= 0) {
+                //倾向是
+                r.setConstiLevel("11");
+            } else {
+                //否
+                r.setConstiLevel("20");
+            }
+        }
+
+        //4.设置mainflag字段
+        //优先选择平和质为主体质
+        //选择偏颇体质中最高分为主体质
+        //MainFlag: 0 否，1主体质，2兼夹体质
+        for (ReportVo.EvaResult result : resultList) {
+            //先全部设置为0
+            result.setMainFlag(0);
+        }
+        ReportVo.EvaResult ppResult = null;
+        for (ReportVo.EvaResult result : resultList) {
+            if (result.getConstiLevel().equals("20")) {
+                //设置体质标志置为0
+                result.setMainFlag(0);
+                //跳过所有level为否的体质
+                continue;
+            }
+            //先判断平和质，平和质只要不是20，总是为主体质
+            if ("TZBS_BZ_A".equals(result.getConstiCode())) {
+                result.setMainFlag(1);
+                break;
+            }
+            //先把非20的所有体质都设置为兼夹体质
+            result.setMainFlag(2);
+            //找出兼夹体质中得分最高的
+            if (ppResult == null) {
+                ppResult = result;
+            } else {
+                if (result.getZhScore().compareTo(ppResult.getZhScore()) > 0) {
+                    ppResult = result;
+                }
+            }
+        }
+        if (ppResult != null) {
+            //得分最高的兼夹体质为主体质
+            ppResult.setMainFlag(1);
+        }
+    }
+
+    private void countReportResult_TZBS_LN(List<ReportVo.EvaResult> resultList) {
+        //1.根据原始分、题目数量计算转化分
+        for (ReportVo.EvaResult evaResult : resultList) {
+            //转化分 = 原始分
+            evaResult.setZhScore(
+                    evaResult.getScore()
+            );
+        }
+
+        //2.计算平和质level
+        boolean other8LessThan9Flag = true, other8LessThan11Flag = true;
+        ReportVo.EvaResult constiAResult = null;
+        for (ReportVo.EvaResult r : resultList) {
+            if ("TZBS_LN_A".equals(r.getConstiCode())) {
+                constiAResult = r;
+            } else {
+                if (r.getZhScore().compareTo(BigDecimal.valueOf(9)) >= 0) {
+                    other8LessThan9Flag = false;
+                }
+                if (r.getZhScore().compareTo(BigDecimal.valueOf(11)) >= 0) {
+                    other8LessThan11Flag = false;
+                }
+            }
+        }
+        if (constiAResult == null) {
+            throw new BaseException("系统错误，未找到平和体质");
+        }
+
+        //转化分>=17分，其他体质均<9分，是平和质
+        //转化分>=17分，其他体质均<11分，基本是平和质
+        //其他情况，不是平和质
+        //默认为否
+        constiAResult.setConstiLevel("20");
+        if (constiAResult.getZhScore().compareTo(new BigDecimal(17)) >= 0) {
+            if (other8LessThan9Flag) {
+                //是
+                constiAResult.setConstiLevel("00");
+            } else if (other8LessThan11Flag) {
+                //基本是
+                constiAResult.setConstiLevel("10");
+            } else {
+                //否
+                constiAResult.setConstiLevel("20");
+            }
+        }
+
+        //3.计算其他体质level
+        for (ReportVo.EvaResult r : resultList) {
+            if ("TZBS_LN_A".equals(r.getConstiCode())) {
+                continue;
+            }
+            if (r.getZhScore().compareTo(new BigDecimal(11)) >= 0) {
+                //是
+                r.setConstiLevel("00");
+            } else if (r.getZhScore().compareTo(new BigDecimal(9)) >= 0) {
+                //倾向是
+                r.setConstiLevel("11");
+            } else {
+                //否
+                r.setConstiLevel("20");
+            }
+        }
+
+        //4.设置mainflag字段
+        //优先选择平和质为主体质
+        //选择偏颇体质中最高分为主体质
+        for (ReportVo.EvaResult result : resultList) {
+            result.setMainFlag(0);
+        }
+        ReportVo.EvaResult ppResult = null;
+        for (ReportVo.EvaResult result : resultList) {
+            if (StrUtil.isEmpty(result.getConstiLevel()) || result.getConstiLevel().equals("20")) {
+                //默认所有体质都置为0
+                result.setMainFlag(0);
+                //跳过所有level为否的体质
+                continue;
+            }
+            //先判断平和质
+            if ("TZBS_LN_A".equals(result.getConstiCode())) {
+                result.setMainFlag(1);
+                break;
+            }
+            //先把非20的所有体质都设置为兼夹体质
+            result.setMainFlag(2);
+            //找出兼夹体质中得分最高的
+            if (ppResult == null) {
+                ppResult = result;
+            } else {
+                if (result.getZhScore().compareTo(ppResult.getZhScore()) > 0) {
+                    ppResult = result;
+                }
+            }
+        }
+        if (ppResult != null) {
+            //得分最高的兼夹体质为主体质
+            ppResult.setMainFlag(1);
+        }
+    }
+
     // @Override
     //    public RmsVo.ReportDetail queryReportDetail(RmsDto.QueryDetail dto) {
     //        //根据测评id查找报告单
@@ -724,6 +1039,13 @@ public class RmsServiceImpl implements IRmsService {
             }
         });
 
+        //生成中医体质辨识结果
+        scores.forEach(score -> {
+            if ("TZBS_LN".equals(score.getCode()) || "TZBS_BZ".equals(score.getCode())) {
+                score.setSubReport(new ArrayList<>());
+                zytzbs(evaluationId, score);
+            }
+        });
         return scores;
     }
 
@@ -1233,7 +1555,8 @@ public class RmsServiceImpl implements IRmsService {
         }
 //        List<RmsVo.ReportDetailAnswer> r = rmsDao.queryReportAnswer(report.getEvaluationId(), dto.getEvaluationCode());
         //查询患者性别
-        List<RmsVo.ReportDetailAnswer> r = rmsDao.queryReportAnswer1(report.getEvaluationId(), dto.getEvaluationCode(), rmsDao.querySexByEvaluationId(report.getEvaluationId()));
+        Byte aByte = rmsDao.querySexByEvaluationId(report.getEvaluationId());
+        List<RmsVo.ReportDetailAnswer> r = rmsDao.queryReportAnswer1(report.getEvaluationId(), dto.getEvaluationCode(), aByte);
         //特殊处理ADAS-Cog 14 第27题，数字划销
         //前端优先使用otherValueList，如果为空则使用otherValue
         for (RmsVo.ReportDetailAnswer rda : r) {
@@ -1254,6 +1577,13 @@ public class RmsServiceImpl implements IRmsService {
                     .collect(Collectors.toList()));
             r = CollectionUtil.newArrayList(zbi);
         }
+
+        //特殊处理中医体质辨识  多对多关系 tzbs_qms_scale_cognitive
+        if ("TZBS_BZ".equalsIgnoreCase(dto.getEvaluationCode()) || "TZBS_LN".equalsIgnoreCase(dto.getEvaluationCode())) {
+            //查询量表关联认知域及认知域关联题目信息
+            r = rmsDao.queryZytzbsScaleAnswer(report.getEvaluationId(), dto.getEvaluationCode(), aByte);
+        }
+
         return r;
     }
 

ruisi_java/ruisi-web-client/src/main/resources/mapper/dao/ClientEvaDao.xml

@@ -0,0 +1,128 @@
+<?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.client.persist.dao.ClientEvaDao">
+    <insert id="batchInsertReportResult">
+        replace into tzbs_rms_report_result(result_id,report_id,scale_code,consti_code,consti_name,consti_level,consti_score,main_flag,create_by)
+        values
+        <foreach collection="list" item="item" separator=",">
+            (#{item.resultId},#{item.reportId},#{item.scaleCode},#{item.constiCode},#{item.constiName},#{item.constiLevel},#{item.constiScore},#{item.mainFlag},#{item.createBy})
+        </foreach>
+    </insert>
+
+    <select id="countReportResult" resultType="com.ccsens.system.domain.vo.ReportVo$EvaResult">
+        SELECT
+            eva.id AS evaId,
+            s.CODE AS scaleCode,
+            s.NAME AS scaleName,
+            cst.consti_code AS constiCode,
+            cst.consti_name AS constiName,
+            sum(IF(rel.reverse = 0, a.score, (6-a.score))) AS score,
+            count(q.id) AS quesNum
+        FROM
+            ems_evaluation eva
+                LEFT JOIN ems_evaluation_scale_relevance r ON r.evaluation_id = eva.id and r.del_flag = 0
+                LEFT JOIN qms_scale s ON r.scale_code = s.CODE
+                AND s.del_flag = 0 and s.code in ('TZBS_BZ', 'TZBS_LN')
+                LEFT JOIN tzbs_qms_scale_consti cst ON s.CODE = cst.scale_code
+                AND cst.del_flag = 0
+                LEFT JOIN tzbs_qms_scale_cognitive rel ON cst.consti_code = rel.consti_code
+                AND rel.del_flag = 0
+                LEFT JOIN qms_question q ON rel.ques_code = q.question_code and q.del_flag = 0
+                LEFT JOIN ams_patient_answer_score a ON eva.id = a.evaluation_id
+                AND a.question_id = q.id and a.del_flag = 0
+        WHERE
+            eva.id = #{evaId} and s.code = #{code}
+        GROUP BY
+            eva.id,
+            s.CODE,
+            s.NAME,
+            cst.consti_id
+        ORDER BY
+            cst.consti_id
+    </select>
+
+    <select id="queryYsjy" resultType="java.lang.String">
+        select
+            scy.consti_ysfa_template as ysfa
+        from
+            tzbs_qms_scale_consti cst
+                left join tzbs_qms_scale_consti_ysfa scy on cst.consti_code = scy.consti_code and scy.del_flag = 0
+        where
+            cst.consti_code = #{constiCode}
+          and cst.del_flag = 0
+        order by
+            cst.consti_id
+    </select>
+
+
+    <resultMap id="map_reportView" type="com.ccsens.system.domain.vo.ClientEvaVo$ReportView">
+        <id column="reportId" property="reportId"/>
+        <result column="patientId" property="patientId"/>
+        <result column="name" property="name"/>
+        <result column="birthday" property="birthday"/>
+        <result column="age" property="age"/>
+        <result column="gender" property="gender"/>
+        <result column="height" property="height"/>
+        <result column="weight" property="weight"/>
+        <result column="waistline" property="waistline"/>
+        <result column="idcard" property="idcard"/>
+        <result column="phone" property="phone"/>
+        <result column="evaId" property="evaId"/>
+        <result column="evaTime" property="evaTime"/>
+        <result column="evaUsername" property="evaUsername"/>
+        <result column="evaNickname" property="evaNickname"/>
+        <result column="evaScaleCode" property="evaScaleCode"/>
+        <result column="evaScaleName" property="evaScaleName"/>
+        <result column="blh" property="blh"/>
+        <collection property="scores" ofType="com.ccsens.system.domain.vo.ClientEvaVo$ReportView$Score">
+            <id column="constiCode" property="constiCode"/>
+            <result column="constiName" property="constiName"/>
+            <result column="constiLevel" property="constiLevel"/>
+            <result column="constiScore" property="constiScore"/>
+            <result column="mainFlag" property="mainFlag"/>
+            <result column="refScoreYes" property="refScoreYes"/>
+            <result column="refScoreMaybe" property="refScoreMaybe"/>
+            <result column="fullScore" property="fullScore"/>
+        </collection>
+        <collection property="ysfa" ofType="com.ccsens.system.domain.vo.ClientEvaVo$ReportView$Ysfa">
+            <id column="jyConstiCode" property="constiCode"/>
+            <result column="jyConstiName" property="constiName"/>
+            <result column="ysjy" property="ysjy"/>
+        </collection>
+    </resultMap>
+
+    <select id="getTzbsResult" resultMap="map_reportView">
+        SELECT
+            r.id AS reportId,
+            r.evaluation_id AS evaId,
+            res.consti_code AS constiCode,
+            res.consti_name AS constiName,
+            res.consti_level AS constiLevel,
+            res.consti_score AS constiScore,
+            res.main_flag AS mainFlag
+        FROM
+            rms_report r
+                LEFT JOIN tzbs_rms_report_result res ON r.id = res.report_id
+        WHERE
+            r.del_flag = 0
+          AND r.evaluation_id = #{evaId} and res.scale_code = #{code}
+        ORDER BY
+            res.result_id
+    </select>
+
+    <resultMap id="ResultMap" type="com.ccsens.system.domain.vo.ClientEvaVo$CongnitiveQuestion">
+        <result column="constiCode" property="constiCode"/>
+        <collection property="questionList" ofType="java.lang.String">
+        </collection>
+    </resultMap>
+
+    <select id="queryYsfaList" resultType="java.lang.String">
+        select
+            y.consti_ysfa_template
+        from
+            tzbs_qms_scale_consti c
+                left join tzbs_qms_scale_consti_ysfa y on c.consti_code = y.consti_code and y.del_flag = 0
+        where
+            c.scale_code = #{scaleCode}
+    </select>
+</mapper>

ruisi_java/ruisi-web-client/src/main/resources/mapper/dao/RmsDao.xml

@@ -765,6 +765,35 @@ group by ee.id
         ORDER BY a.qsort,a.sort
     </select>
 
+    <select id="queryZytzbsScaleAnswer"  resultMap="queryReportAnswer">
+        SELECT
+            cst.consti_name AS parentCode,
+            q.type,
+            q.operate_type AS operateType,
+            q.question AS questionName,
+            o.display AS answer,
+            a.option_id AS optionId,
+            q.id as questionId,
+            a.score,
+            (select path from ems_patient_recording where question_id = q.id and evaluation_id = #{evaluationId}) AS recordingPath
+        FROM
+            qms_scale s
+                LEFT JOIN tzbs_qms_scale_consti cst ON s.CODE = cst.scale_code
+                LEFT JOIN tzbs_qms_scale_cognitive rel ON cst.consti_code = rel.consti_code
+                LEFT JOIN qms_question q ON rel.ques_code = q.question_code
+                LEFT JOIN (select * from ams_patient_answer_score where evaluation_id = #{evaluationId}) a  ON a.question_id = q.id
+                LEFT JOIN qms_question_option o ON a.option_id = o.id
+        WHERE
+            s.del_flag = 0
+          AND s.`code` = #{scaleCode}
+          AND (q.sex = #{sex} OR q.sex IS NULL)
+        ORDER BY
+            cst.consti_code
+
+
+
+    </select>
+
     <resultMap id="QuestionMap" type="com.ccsens.system.domain.vo.RmsVo$QuestionAndAnswer">
         <id column="id" property="id"/>
         <result column="question" property="question"/>
@@ -1489,6 +1518,31 @@ group by ee.id
     GROUP BY qq.id
     ORDER BY qq.sort
     </select>
+
+    <select id="queryReportQuestionAndAnswer1"
+            resultType="com.ccsens.system.domain.vo.ReportDetailVo$QuestionInfo">
+        SELECT
+            cst.consti_name as parentCode,
+
+            q.question as questionName,
+            a.answer,
+            a.score
+        FROM
+            qms_scale s
+                LEFT JOIN tzbs_qms_scale_consti cst ON s.CODE = cst.scale_code
+                AND cst.del_flag = 0
+                LEFT JOIN tzbs_qms_scale_cognitive rel ON cst.consti_code = rel.consti_code
+                AND rel.del_flag = 0
+                LEFT JOIN qms_question q ON rel.ques_code = q.question_code and q.del_flag = 0
+                LEFT JOIN ams_patient_answer_score a ON a.question_id = q.id and a.del_flag = 0
+        where
+            s.del_flag = 0 and
+            a.evaluation_id = 2013641875419959296 and s.`code` = "TZBS_BZ"
+--     and q.sex = #{sex} or q.sex is null
+        ORDER BY
+            cst.consti_code
+    </select>
+
     <select id="queryReportGroupCognitiveAndAnswer"
         resultType="com.ccsens.system.domain.vo.ReportDetailVo$GroupCognitive">
     WITH RECURSIVE t as (